.

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -96,6 +96,9 @@
 {%- else %}
       name: "sdr",
 {%- endif %}
+{% if slapparameter_dict.get('gps_sync', False) %}
+      sync: "gps",
+{% endif %}
 
 {%- set dev_argv = []                                                   %}
 {%- ru_cpri_dict = {}  %}  {# dev -> ru  for ru with link_kind = cpri   #}
@@ -111,21 +114,21 @@
 {%-   elif ru['ru_link_type'] == 'cpri'                                                           %}
 {%-     do ru_cpri_dict[len(dev_argv)] = ru                             %}
 {%-     do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), ru['sdr_dev'], ru['sfp_port']))   %}
-{#      set cpri parameters to default
-{%-     ru.setdefault('cpri_mapping', 'hw')     %}    XXX   <- should be preset set by ru?  (specific to ru?)
-{%-     ru.setdefault('cpri_mult',     16)      %}
-{%-     ru.setdefault('cpri_rx_delay',  0)      %}
-{%-     ru.setdefault('cpri_tx_delay',  0)      %}
-{%-     ru.setdefault('cpri_tx_dbm',    0)      %}
+{#      set cpri parameters to default              #}
+{%-     do ru.setdefault('cpri_mapping', 'hw')      %}    XXX   <- should be preset set by ru?  (specific to ru?)
+{%-     do ru.setdefault('cpri_mult',     16)       %}
+{%-     do ru.setdefault('cpri_rx_delay',  0)       %}
+{%-     do ru.setdefault('cpri_tx_delay',  0)       %}
+{%-     do ru.setdefault('cpri_tx_dbm',    0)       %}
 {%-   else        %}
-{{      bug('unreachable')                                    %}
+{%-     do bug('unreachable')                                 %}
 {%-   endif                                                   %}
 {%- endfor %}
 
       args: "{{dev_argv | join(',')}}",
 
 {# emit cpri_* optins if a cpri ru is present #}
-{# NOTE values for non-cpri links come as empty XXX recheck this is ok #}
+{# NOTE values for non-cpri links come as empty   XXX recheck this is ok #}
 {%- if ru_cpri_dict|length > 0              %}
 {%-   set vcpri = [None]*(dev_argv|length)  %}
 {%-   for dev, ru in ru_cpri_dict|dictsort  %}
@@ -147,9 +150,10 @@
 {%-   endfor                                                  %}
       ifname:        "{{ vtap | join(',') }}",
 {%- endif                                                     %}
+  },
 
-
-  }
+  XXX tx_gain
+  XXX rx_gain
 
 
 # XXX <- trx_X

software/ors-amarisoft/ru/common-schema.json

@@ -9,10 +9,8 @@ if ru_link_type = "cpri":
   sfp_port  number
   //cpri_link: string  # e.g. sdrX@Y
 
-  cpri_mult:        int			per port
-  cpri_mapping:     standard|hw|spread|bf1)  per port	<- selected by ru model
-  fast_cm_pointer:  int			per port
-  vss_data          ...
-  cpri_rx_delay:    int					<- selected by ru model
-  cpri_tx_delay:    int					<- ? selected by ru or not ?
+  cpri_mult:        int
+  cpri_mapping:     standard|hw|spread|bf1    <- selected by ru model ?
+  cpri_rx_delay:    int			      <- selected by ru model
+  cpri_tx_delay:    int			      <- ? selected by ru or not ?
   cpri_tx_dbm:      float