Some config changes

9 files changed, 130 insertions, 123 deletions

diff --git a/.gitignore b/.gitignore
index ec33b70..e65ce3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-zmqtest
 eti
 *.sub
 *.pub
diff --git a/b200-2048-zmq.ini b/b200-2048-zmq.ini
index e22f4d7..91d48c0 100644
--- a/b200-2048-zmq.ini
+++ b/b200-2048-zmq.ini
@@ -4,6 +4,8 @@
 [remotecontrol]
 telnet=1
 telnetport=2121
+zmqctrl=1
+zmqctrlendpoint=tcp://127.0.0.1:9400
 
 [log]
 syslog=0
@@ -15,7 +17,7 @@ filename=/dev/stderr
 ;source=/dev/stdin
 ;loop=0
 transport=zeromq
-source=tcp://mpb.li:9100
+source=tcp://localhost:9100
 max_frames_queued=400
 
 [modulator]
@@ -26,17 +28,13 @@ gainmode=var
 ; If not defined, take the mode from ETI
 mode=1
 
-; Set to 0 to disable CicEqualiser
-dac_clk_rate=0
-
-digital_gain=0.8
+digital_gain=0.08
 
 ; Output sample rate
 rate=2048000
 
 [firfilter]
 enabled=1
-;filtertapsfile=filter/simplefiltertaps.txt
 
 [output]
 ; choose output: possible values: uhd, file
@@ -51,9 +49,10 @@ filename=/dev/null
 device=
 master_clock_rate=32768000
 type=b200
-txgain=50
+txgain=0
 ;frequency=234208000
 channel=13C
+lo_offset=2048000
 
 ; possible values : internal, external, MIMO
 refclk_source=internal
@@ -72,3 +71,9 @@ max_gps_holdover_time=300
 synchronous=0
 
 offset=2.0
+
+[tii]
+enable=0
+comb=16
+pattern=6
+old_variant=0
diff --git a/b200-2048.ini b/b200-2048.ini
index 65d2a3a..775d2b7 100644
--- a/b200-2048.ini
+++ b/b200-2048.ini
@@ -3,6 +3,8 @@
 [remotecontrol]
 telnet=1
 telnetport=2121
+zmqctrl=1
+zmqctrlendpoint=tcp://127.0.0.1:9400
 
 [log]
 syslog=0
@@ -25,9 +27,6 @@ gainmode=var
 ; If not defined, take the mode from ETI
 mode=1
 
-; Set to 0 to disable CicEqualiser
-dac_clk_rate=0
-
 digital_gain=0.8
 
 ; Output sample rate
@@ -35,7 +34,6 @@ rate=2048000
 
 [firfilter]
 enabled=1
-;filtertapsfile=filter/simplefiltertaps.txt
 
 [output]
 ; choose output: possible values: uhd, file
@@ -48,9 +46,10 @@ filename=/dev/null
 device=
 master_clock_rate=32768000
 type=b200
-txgain=50
+txgain=60
 ;frequency=234208000
 channel=13C
+;lo_offset=2048000
 
 ; possible values : internal, external, MIMO
 refclk_source=internal
@@ -66,6 +65,12 @@ max_gps_holdover_time=300
 
 ; Used for SFN with the UHD output
 [delaymanagement]
-synchronous=0
+synchronous=1
 
 offset=2.0
+
+[tii]
+enable=0
+comb=16
+pattern=6
+old_variant=0
diff --git a/b200-30.72.ini b/b200-30.72.ini
index 8442888..83182ef 100644
--- a/b200-30.72.ini
+++ b/b200-30.72.ini
@@ -17,29 +17,32 @@ filename=/dev/stderr
 ;loop=1
 
 transport=zeromq
-;source=tcp://localhost:9100
-source=tcp://core.mpb.li:9100
+source=tcp://localhost:9100
+;source=tcp://core.mpb.li:9100
 max_frames_queued=800
 
 [modulator]
 ; Gain mode: 0=FIX, 1=MAX, 2=VAR
-gainmode=2
+gainmode=var
 
 ; Transmission mode
 ; If not defined, take the mode from ETI
 mode=1
 
-; Set to 0 to disable CicEqualiser
-dac_clk_rate=0
-
 digital_gain=0.8
 
+ofdmwindowing=10
+
 ; Output sample rate
 rate=2048000
 
+[cfr]
+enable=0
+clip=50.0
+error_clip=0.1
+
 [firfilter]
-enabled=0
-filtertapsfile=filter/simplefiltertaps.txt
+enabled=1
 
 [output]
 ; choose output: possible values: uhd, file
@@ -54,9 +57,10 @@ filename=/dev/null
 device=
 master_clock_rate=32768000
 type=b200
-txgain=60
+txgain=70
 ;frequency=234208000
 channel=13C
+lo_offset=2048000
 
 ; possible values : internal, external, MIMO
 refclk_source=gpsdo
@@ -72,11 +76,11 @@ max_gps_holdover_time=600
 
 ; Used for SFN with the UHD output
 [delaymanagement]
-synchronous=0
-
-offset=0.8
+synchronous=1
+offset=2.0
 
 [tii]
-enable = 0
-comb = 16
-pattern = 5
+enable=1
+comb=11
+pattern=4
+old_variant=0
diff --git a/b200-sync-zmq.ini b/b200-sync-zmq.ini
index 2ffaabd..49d692a 100644
--- a/b200-sync-zmq.ini
+++ b/b200-sync-zmq.ini
@@ -3,6 +3,8 @@
 [remotecontrol]
 telnet=1
 telnetport=2121
+zmqctrl=1
+zmqctrlendpoint=tcp://127.0.0.1:9400
 
 [log]
 syslog=0
@@ -20,15 +22,12 @@ max_frames_queued=8000
 
 [modulator]
 ; Gain mode: 0=FIX, 1=MAX, 2=VAR
-gainmode=2
+gainmode=var
 
 ; Transmission mode
 ; If not defined, take the mode from ETI
 mode=1
 
-; Set to 0 to disable CicEqualiser
-dac_clk_rate=0
-
 digital_gain=0.8
 
 ; Output sample rate
@@ -36,7 +35,6 @@ rate=2048000
 
 [firfilter]
 enabled=1
-filtertapsfile=filter/simplefiltertaps.txt
 
 [output]
 ; choose output: possible values: uhd, file
@@ -51,7 +49,7 @@ filename=/dev/null
 device=
 master_clock_rate=32768000
 type=b200
-txgain=45
+txgain=50
 ;frequency=234208000
 channel=13C
 
@@ -61,13 +59,12 @@ refclk_source=gpsdo
 ; possible values : none, external, MIMO
 pps_source=none
 
-# TRY with 0, to disable the check
-max_gps_holdover_time=600
-
 ; behaviour when external clock reference lock lost
 ; possible values: ignore, crash
 behaviour_refclk_lock_lost=crash
 
+max_gps_holdover_time=300
+
 ; Used for SFN with the UHD output
 [delaymanagement]
 synchronous=1
diff --git a/b200-sync.ini b/b200-sync.ini
index b232f36..00285e3 100644
--- a/b200-sync.ini
+++ b/b200-sync.ini
@@ -3,6 +3,8 @@
 [remotecontrol]
 telnet=1
 telnetport=2121
+zmqctrl=1
+zmqctrlendpoint=tcp://127.0.0.1:9400
 
 [log]
 syslog=0
@@ -10,61 +12,52 @@ filelog=0
 filename=/dev/stderr
 
 [input]
-transport=file
-source=/dev/stdin
-;transport=zeromq
-;source=tcp://localhost:9100
-loop=0
+;transport=file
+;source=/dev/stdin
+;loop=0
+transport=zeromq
+source=tcp://localhost:9100
 
 [modulator]
-; Gain mode: 0=FIX, 1=MAX, 2=VAR
-gainmode=2
-
-; Transmission mode
-; If not defined, take the mode from ETI
-;mode=2
-
-; Set to 0 to disable CicEqualiser
-dac_clk_rate=0
-
-digital_gain=1.0
-
-; Output sample rate
+digital_gain=0.8
 rate=2048000
 
 [firfilter]
-enabled=0
-filtertapsfile=filter/simplefiltertaps.txt
+enabled=1
 
 [output]
-; choose output: possible values: uhd, file
 output=uhd
 
 [fileoutput]
 filename=/dev/null
+format=complexf_normalised
 
 [uhdoutput]
-;device=master_clock_rate=32768000,type=b100
-;txgain=2
 device=
 master_clock_rate=20480000
 type=b200
-txgain=50
+txgain=10
 ;frequency=234208000
 channel=13C
 
 ; possible values : internal, external, MIMO
-refclk_source=external
+refclk_source=internal
 
 ; possible values : none, external, MIMO
-pps_source=external
+pps_source=none
 
 ; behaviour when external clock reference lock lost
 ; possible values: ignore, crash
-behaviour_refclk_lock_lost=crash
+behaviour_refclk_lock_lost=ignore
 
 ; Used for SFN with the UHD output
 [delaymanagement]
 synchronous=1
+mutenotimestamps=1
 
 offset=2.0
+[tii]
+enable=0
+comb=1
+pattern=11
+old_variant=0
diff --git a/soapy.ini b/soapy.ini
index 96f1b1e..6c0f6f2 100644
--- a/soapy.ini
+++ b/soapy.ini
@@ -5,7 +5,7 @@
 telnet=1
 telnetport=2121
 zmqctrl=1
-zmqctrlendpoint=tcp://127.0.0.1:2122
+zmqctrlendpoint=tcp://127.0.0.1:9400
 
 [log]
 syslog=0
diff --git a/test.ini b/test.ini
index d0d3155..937faab 100644
--- a/test.ini
+++ b/test.ini
@@ -8,14 +8,13 @@ filelog=0
 filename=/dev/stderr
 
 [input]
-transport=file
-source=/home/bram/dab/mmbtools-aux/eti/funk2.100.eti
-;source=/dev/stdin
-loop=0
-
-;transport=zeromq
-;source=tcp://localhost:9100
-;max_frames_queued=400
+;transport=file
+;source=/home/bram/dab/mmbtools-aux/eti/funk2.100.eti
+;loop=0
+
+transport=zeromq
+source=tcp://localhost:9100
+max_frames_queued=400
 
 [modulator]
 gainmode=var
diff --git a/zmq-simul.mux b/zmq-simul.mux
index d5a1c4c..0cec917 100644
--- a/zmq-simul.mux
+++ b/zmq-simul.mux
@@ -8,9 +8,13 @@ general {
     ; The statsserver for extracting statistics
     statsserverport 12720
 
-    syslog true
+    syslog false
     writescca false
     tist true
+    tist_offset 2
+
+    ;tai_clock_bulletins "file:///home/bram/dab/dabmux/leap-seconds.list.2017|file:///home/bram/dab/dabmux/leap-seconds.list"
+    startupcheck "chronyc waitsync 10 0.01"
 }
 
 remotecontrol {
@@ -20,6 +24,27 @@ remotecontrol {
     zmqendpoint tcp://*:12722
 }
 
+not_linking {
+    set-fu {
+        lsn 0xabc
+        hard true
+        active true
+        international false
+        keyservice srv-fu
+        list {
+            fu-on-my-friends-mux {
+                type dab
+                id 0x8daf
+            }
+
+            fu-on-fm {
+                type fm
+                id 0x1A2B
+            }
+        }
+    }
+}
+
 ; Some ensemble parameters
 ensemble {
     id 0x4fff
@@ -29,8 +54,8 @@ ensemble {
 
     local-time-offset auto
     international-table 1
-    label "TuxMux"
-    shortlabel "Tux"
+    label "OPENDIGITALRADIO"
+    shortlabel "ODR"
 
     ; Announcement settings for FIG0/19
     announcements {
@@ -55,9 +80,10 @@ ensemble {
 
 services {
     srv-fb {
-        label "FB"
+        label "Fréquence BANANE"
         shortlabel "FB"
         pty 0
+        pty-sd static
         language 0
         id 0x4060
         ; also supports id
@@ -69,9 +95,9 @@ services {
         }
     }
     srv-label {
-        label "label"
+        label "BYE BYE PARTY"
+        shortlabel "BYE BYE"
         id 0x4040
-        ; also supports id
 
         announcements {
             Traffic true
@@ -85,17 +111,15 @@ services {
     }
 }
 
-; The subchannels are defined in the corresponding section.
-; supported types are : audio, bridge, data, enhancedpacket,
-;                       dabplus, dmb, packet, test
 subchannels {
     sub-fb {
         type dabplus
         ; use ZeroMQ:
-        inputfile "tcp://*:9001"
+        inputproto zmq
+        inputuri "tcp://*:9001"
         zmq-buffer 40
         zmq-prebuffering 20
-        bitrate 64
+        bitrate 128
         id 24
         protection 3
 
@@ -108,9 +132,11 @@ subchannels {
         type audio
         ;inputfile "sti-rtp://:32010"
         ;inputfile "/home/bram/dab/mmbtools-aux/fip-j-ok.mp2"
-        inputfile "tcp://*:9002"
-        zmq-buffer 40
-        zmq-prebuffering 20
+        inputproto edi
+        inputuri "tcp://0.0.0.0:9002"
+        buffer 40
+        prebuffering 20
+        buffer-management prebuffering
         bitrate 128
         id 4
         protection 3
@@ -124,22 +150,17 @@ subchannels {
    }
 }
 
-; For now, each component links one service to one subchannel
 components {
-    ; the component unique identifiers are not used anywhere, but
-    ; are useful to disambiguate different components.
     comp-fb {
-        label "FBcomp"
-        shortlabel "FBcomp"
         service srv-fb
         subchannel sub-fb
-
         figtype 0x2
     }
 
     comp-label {
         service srv-label
         subchannel sub-label
+        figtype 0x2
     }
 
     comp-prbs {
@@ -148,51 +169,35 @@ components {
     }
 }
 
-; A list of outputs, in the format
-; unique-id "uri"
 outputs {
     ;stdout "fifo:///dev/stdout?type=raw"
-    nullfile "file:///dev/null?type=raw"
+    ;nullfile "file:///dev/null?type=raw"
     ;thefile "file://./zmq-simul.eti?type=raw"
-    zmq  "zmq+tcp://*:9100"
+    ;zmq  "zmq+tcp://*:9100"
+    zeromq {
+        endpoint "tcp://*:9100"
+        allowmetadata true
+    }
 
-    ; This throttles muxing down to nominal rate
     throttle "simul://"
 
     ;net_udp "udp://237.10.0.230:7000?src=10.0.1.125,ttl=10"
     net_tcp "tcp://0.0.0.0:9200"
 
     edi {
-        fec         2
-        chunk_len   207
-
         destinations {
-            multicast {
-                destination "239.20.64.1"
-                ;source      "192.168.2.10"
-                ;source      "192.168.0.100"
-                sourceport  52321
-                ttl 1
+            tcp {
+                protocol tcp
+                listenport 9201
             }
-            ;unicast {
-                ;destination "192.168.2.2"
-            ;}
         }
 
-        port        12000
-
-        ; EDI uses the UDP protocol
-
-        ; Enable the PFT subsystem. If false, AFPackets are sent.
-        enable_pft  true
-
-        ; Save the packets sent over ethernet to the file ./edi.debug
+        port        5002
+        enable_pft  false
+        fec         1
+        chunk_len   207
         dump        false
-
-        ; show more debugging info
         verbose     false
-
-        ; optional: what kind of alignment to do in the tagpacket
         tagpacket_alignment 16
     }
 }