diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/example.ini | 42 | ||||
| -rw-r--r-- | doc/zmq-ctrl/cpp/OdrModCtrl.cpp | 1 |
2 files changed, 29 insertions, 14 deletions
diff --git a/doc/example.ini b/doc/example.ini index ee9d567..417cbf3 100644 --- a/doc/example.ini +++ b/doc/example.ini @@ -28,7 +28,7 @@ telnetport=2121 ; ; REQ: ["set"][module name][parameter][value] ; REP: ["ok"] _OR_ ["fail"][error description] -zmqctrl=1 +zmqctrl=0 zmqctrlendpoint=tcp://127.0.0.1:9400 [log] @@ -182,17 +182,27 @@ txgain=2.0 channel=13C ; The reference clock to use. -; possible values : internal, external, MIMO +; possible values : internal, external, MIMO, gpsdo refclk_source=internal ; The reference one pulse-per second to use -; possible values : none, external, MIMO +; possible values : none, external, MIMO, gpsdo pps_source=none ; Behaviour when external clock reference lock lost ; possible values: ignore, crash behaviour_refclk_lock_lost=ignore +; The maximum accepted holdover time for the gpsdo. +; Valid only if the refclk and pps_source are set to gpsdo. +; This value is also used for the initial lock check, and must +; be at least a minute so that the GPSOD has enough time to lock +; and to start disciplining its oscillator. +; Units: seconds +; Set to 0 to disable holdover check +; default value: 0 +max_gps_holdover_time=600 + ; section defining ZeroMQ output properties [zmqoutput] @@ -214,16 +224,20 @@ synchronous=0 ; Whether to mute the TX when incoming frames have no timestamp mutenotimestamps=0 -; Choose between fixed and dynamic offset definition -; fixed defines an offset in this file that cannot be changed while -; the modulator runs. -; -; dynamic reads the offset from a file, and if the value changes, -; the chain does a re-sync. -management=dynamic +; This offset is added to the TIST, and the sum defines the +; TX time of the transmission frame. It can by changed at runtime +; through the remote control. +offset=0.002 + +; The previous static vs dynamic offset distinction, and reading the +; modulatoroffset from a file has been removed. -fixedoffset=0.002 +[tii] +; (experimental) +; If these options are set, TII transmission is enabled. +; DAB modes I and II are supported, and must be set explicitly in +; this file. Reading DAB mode from ETI is not supported. +enable=0 +comb=16 +pattern=3 -; The file should contain a single floating point value, written -; in ASCII (it's human-readable, not binary) -dynamicoffsetfile=modulator_offset diff --git a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp index 731a9af..416ffcd 100644 --- a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp +++ b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp @@ -51,6 +51,7 @@ COdrModCtrl::COdrModCtrl(zmq::context_t *pContext, std::string odrEndpoint, m_pContext = pContext; m_odrEndpoint = odrEndpoint; m_timeoutMs = (uint32_t) timeoutMs; + m_pReqSocket = NULL; } COdrModCtrl::~COdrModCtrl() |