software/ors-amarisoft: enb.jinja2.cfg: Tune PUCCH 1 and PUCCH 3 for CA

When there are multiple cells and CA configured, without those parameters enb fails to start with e.g.

    n1_pucch_an_cs_count must be > 0 for the CA Primary cell

Set them on all cell like illustrated in enb-2cc.cfg and enb-3cc.cfg Amarisoft examples.

Not sure selected values are best - I took them from above mentioned examples as is.

Reference to documentation about those parameters:

https://tech-academy.amarisoft.com/lteenb.doc#prop.pucch_dedicated.n1_pucch_an_cs_count
https://tech-academy.amarisoft.com/lteenb.doc#prop.pucch_dedicated.n3_pucch_an_n_rb
https://tech-academy.amarisoft.com/lteenb.doc#prop.pucch_dedicated.ack_nack_feedback_mode_ca

/cc @lu.xu, @tomo, @xavier_thompson, @Daetalus
/helped-by @jhuge
/reviewed-on !1519

software/ors-amarisoft/buildout.hash.cfg

@@ -104,7 +104,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = dc19f5362fe0e23ba814da39f7520c15
+md5sum = 93a235dbab99cf7c4f3f2759278ecaed
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

@@ -326,6 +326,15 @@
     pucch_dedicated: {
       n1_pucch_sr_count: 11,
       cqi_pucch_n_rb: 1,
+{#- for CA with 2 cells it is possible to use PUCCH 1b CS ack/nack #}
+{%- if len(cell_list) == 2  %}
+      ack_nack_feedback_mode_ca: "cs",
+      n1_pucch_an_cs_count: 8,
+{#- starting from 3 cells it is always PUCCH 3 for ack/nack in CA #}
+{%- elif len(cell_list) >= 3  %}
+      ack_nack_feedback_mode_ca: "pucch3",
+      n3_pucch_an_n_rb: 3,
+{%- endif %}
 {%- if tdd  %}
       tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
 {%- endif %}