From dc5956dabefcb4545f1732c1a0c76a9b8a0cf7da Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 22 Mar 2014 18:13:45 +0100
Subject: minor config updates

---
 b200-2048.ini  | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 examplemod.ini | 70 ------------------------------------------------------
 test.ini       | 13 ++++++-----
 zmq-simul.mux  |  6 +++--
 4 files changed, 85 insertions(+), 78 deletions(-)
 create mode 100644 b200-2048.ini
 delete mode 100644 examplemod.ini

diff --git a/b200-2048.ini b/b200-2048.ini
new file mode 100644
index 0000000..276ef24
--- /dev/null
+++ b/b200-2048.ini
@@ -0,0 +1,74 @@
+; Sample configuration file for CRC-DABMOD
+
+[remotecontrol]
+telnet=1
+telnetport=2121
+
+[log]
+syslog=0
+filelog=1
+filename=/dev/stderr
+
+[input]
+transport=file
+source=/dev/stdin
+;transport=zeromq
+;source=tcp://mpb.li:9100
+loop=0
+
+[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
+rate=2048000
+
+[firfilter]
+enabled=0
+filtertapsfile=filter/simplefiltertaps.txt
+
+[output]
+; choose output: possible values: uhd, file
+output=uhd
+
+[fileoutput]
+filename=/dev/null
+
+[uhdoutput]
+;device=master_clock_rate=32768000,type=b100
+;txgain=2
+device=
+master_clock_rate=20480000
+type=b200
+txgain=45
+;frequency=234208000
+channel=13C
+
+; possible values : internal, external, MIMO
+refclk_source=internal
+
+; possible values : none, external, MIMO
+pps_source=none
+
+; behaviour when external clock reference lock lost
+; possible values: ignore, crash
+behaviour_refclk_lock_lost=crash
+
+; Used for SFN with the UHD output
+[delaymanagement]
+synchronous=0
+
+; choose between fixed and dynamic offset definition
+management=dynamic
+
+fixedoffset=0.002
+dynamicoffsetfile=modulatoroffset
diff --git a/examplemod.ini b/examplemod.ini
deleted file mode 100644
index f51b883..0000000
--- a/examplemod.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-; Sample configuration file for CRC-DABMOD
-
-[remotecontrol]
-telnet=1
-telnetport=2121
-
-[log]
-syslog=0
-filelog=1
-filename=/dev/stderr
-
-[input]
-transport=file
-source=/dev/stdin
-;transport=zeromq
-;source=tcp://mpb.li:9100
-loop=0
-
-[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
-rate=2048000
-
-[firfilter]
-enabled=0
-filtertapsfile=filter/simplefiltertaps.txt
-
-[output]
-; choose output: possible values: uhd, file
-output=uhd
-
-[fileoutput]
-filename=/dev/null
-
-[uhdoutput]
-device=master_clock_rate=32768000,type=b100
-;frequency=234208000
-channel=13C
-txgain=2
-
-; possible values : internal, external, MIMO
-refclk_source=internal
-
-; possible values : none, external, MIMO
-pps_source=none
-
-; behaviour when external clock reference lock lost
-; possible values: ignore, crash
-behaviour_refclk_lock_lost=crash
-
-; Used for SFN with the UHD output
-[delaymanagement]
-synchronous=0
-
-; choose between fixed and dynamic offset definition
-management=dynamic
-
-fixedoffset=0.002
-dynamicoffsetfile=modulatoroffset
diff --git a/test.ini b/test.ini
index dcb0fc1..3001ba9 100644
--- a/test.ini
+++ b/test.ini
@@ -6,7 +6,7 @@ telnetport=2121
 
 [log]
 syslog=0
-filelog=1
+filelog=0
 filename=/dev/stderr
 
 [input]
@@ -32,7 +32,7 @@ dac_clk_rate=0
 digital_gain=1.0
 
 ; Output sample rate
-rate=2048000
+rate=3200000
 
 [firfilter]
 enabled=0
@@ -50,12 +50,13 @@ filename=/dev/null
 channel=13C
 
 ; For the B200
-;device=master_clock_rate=20480000,type=b200
-;txgain=40
+master_clock_rate=32000000
+type=b200
+txgain=35
 
 ; For the B100
-device=master_clock_rate=32768000,type=b100
-txgain=2
+;device=master_clock_rate=32768000,type=b100
+;txgain=2
 
 ; possible values : internal, external, MIMO
 refclk_source=internal
diff --git a/zmq-simul.mux b/zmq-simul.mux
index 784f481..64346fc 100644
--- a/zmq-simul.mux
+++ b/zmq-simul.mux
@@ -22,6 +22,8 @@ remotecontrol {
 ensemble {
     id 0x4fff
     ecc 225 ; Extended Country Code (decimal)
+    local-time-offset -1
+    international-table 1
     label "TuxMux"
     shortlabel "Tux"
 }
@@ -32,12 +34,12 @@ services {
         shortlabel "FB"
         pty 0
         language 0
-        id 60
+        id 0x4060
         ; also supports id
     }
     srv-label {
         label "label"
-        id 40
+        id 0x4040
         ; also supports id
     }
 }
-- 
cgit v1.2.3