Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
dee5d9d1
Commit
dee5d9d1
authored
Aug 24, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
8b644147
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
software/ors-amarisoft/config/enb.cfg
software/ors-amarisoft/config/enb.cfg
+1
-3
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+3
-3
No files found.
software/ors-amarisoft/config/enb.cfg
View file @
dee5d9d1
...
@@ -6,8 +6,6 @@
...
@@ -6,8 +6,6 @@
rf_driver: {
rf_driver: {
name: "sdr",
name: "sdr",
XXX move to ru/sdr ?
args: "dev0=/dev/sdr3,dev1=/dev/sdr4,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
args: "dev0=/dev/sdr3,dev1=/dev/sdr4,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
rx_antenna:"tx_rx", XXX -> ru/sdr ?
rx_antenna:"tx_rx", XXX -> ru/sdr ?
tdd_tx_mod: 1,
tdd_tx_mod: 1,
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
dee5d9d1
...
@@ -157,9 +157,9 @@
...
@@ -157,9 +157,9 @@
{%- else %}
{%- else %}
name: "sdr",
name: "sdr",
{%- endif %}
{%- endif %}
{% if slapparameter_dict.get('gps_sync', False) %}
{%
-
if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
{% endif %}
{%
-
endif %}
{%- set dev_argv = [] %}
{%- set dev_argv = [] %}
{%- set ru_sdr_dict = {} %} {# dev -> ru for ru with ru_type = sdr #}
{%- set ru_sdr_dict = {} %} {# dev -> ru for ru with ru_type = sdr #}
...
@@ -169,7 +169,7 @@
...
@@ -169,7 +169,7 @@
{%- do ru.update({'.rf_port': rf_port}) %}
{%- do ru.update({'.rf_port': rf_port}) %}
{%- if ru['ru_type'] == 'sdr' %}
{%- if ru['ru_type'] == 'sdr' %}
{%- do ru_sdr_dict.update({len(dev_argv): ru}) %}
{%- do ru_sdr_dict.update({len(dev_argv): ru}) %}
XXX move to ru/sdr ?
{#- XXX move to ru/sdr ? #}
{%- for n in ru['sdr_dev_list'] %}
{%- for n in ru['sdr_dev_list'] %}
{%- do dev_argv.append("dev%d=/dev/sdr%d" % (len(dev_argv), n)) %}
{%- do dev_argv.append("dev%d=/dev/sdr%d" % (len(dev_argv), n)) %}
{%- endfor %}
{%- endfor %}
...
...
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