Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
ae18dea9
Commit
ae18dea9
authored
Jun 02, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: add tdd_tx_mod: 1 to support newer amarisoft version
parent
b79d9e32
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
12 deletions
+16
-12
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/config/enb-fdd.jinja2.cfg
software/ors-amarisoft/config/enb-fdd.jinja2.cfg
+1
-0
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+2
-1
software/ors-amarisoft/config/gnb-fdd.jinja2.cfg
software/ors-amarisoft/config/gnb-fdd.jinja2.cfg
+6
-5
software/ors-amarisoft/config/gnb.jinja2.cfg
software/ors-amarisoft/config/gnb.jinja2.cfg
+5
-4
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
ae18dea9
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
filename = config/enb.jinja2.cfg
md5sum =
90e0d38ff42dc0f65245496d3809f3b
3
md5sum =
e4b31e8ced0e2ffa08a877e59b8a979
3
[sib23.asn]
[sib23.asn]
filename = config/sib23.asn
filename = config/sib23.asn
...
@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
...
@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg]
[gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg
filename = config/gnb.jinja2.cfg
md5sum = 9
6236b6e55be2fd3dcc128a19a5fc344
md5sum = 9
1648b9f70a10eb8a89465a88d3975aa
[ltelogs.jinja2.sh]
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
filename = ltelogs.jinja2.sh
...
...
software/ors-amarisoft/config/enb-fdd.jinja2.cfg
View file @
ae18dea9
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
sync: "gps",
sync: "gps",
{% endif %}
{% endif %}
rx_antenna: "tx_rx",
rx_antenna: "tx_rx",
tdd_tx_mod: 1,
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
ae18dea9
...
@@ -28,9 +28,10 @@
...
@@ -28,9 +28,10 @@
name: "sdr",
name: "sdr",
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
{% endif %}
{% endif %}
rx_antenna:"tx_rx",
rx_antenna:"tx_rx",
tdd_tx_mod: 1,
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_lte_rx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_lte_rx_gain']) }},
...
...
software/ors-amarisoft/config/gnb-fdd.jinja2.cfg
View file @
ae18dea9
...
@@ -9,16 +9,17 @@
...
@@ -9,16 +9,17 @@
log_filename: "{{ directory['log'] }}/gnb.log",
log_filename: "{{ directory['log'] }}/gnb.log",
com_addr: "0.0.0.0:9001",
com_addr: "0.0.0.0:9001",
rf_driver: {
rf_driver: {
name: "sdr",
name: "sdr",
#if N_ANTENNA_DL >= 4
#if N_ANTENNA_DL >= 4
args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
#else
#else
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
#endif
#endif
{% if slapparameter_dict.get('gps_sync', False) %}
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
{% endif %}
{% endif %}
rx_antenna: "tx_rx",
rx_antenna: "tx_rx",
tdd_tx_mod: 1,
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
...
...
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @
ae18dea9
...
@@ -26,12 +26,13 @@
...
@@ -26,12 +26,13 @@
rx_gain: 0,
rx_gain: 0,
{% else %}
{% else %}
rf_driver: {
rf_driver: {
name: "sdr",
name: "sdr",
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
{% endif %}
{% endif %}
rx_antenna: "tx_rx",
rx_antenna: "tx_rx",
tdd_tx_mod: 1,
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment