Rework timestamping

 * Ensure MNSC and EDI carry the same timestamp
 * Rename `edi_tistoffset` to `tist_offset`
 * Remove conditional compilation of EDI output
 * Reset PPS so as to align ETI frames across mux restarts

2 files changed, 4 insertions, 4 deletions

diff --git a/doc/advanced.mux b/doc/advanced.mux
index ab145fa..c2a4411 100644
--- a/doc/advanced.mux
+++ b/doc/advanced.mux
@@ -28,13 +28,13 @@ general {
     writescca false
 
     ; Enable timestamp definition necessary for SFN
-    ; This also enables time encoding using the MNSC.
+    ; This also enables time encoding using the MNSC and in EDI.
     tist false
 
-    ; On startup, EDI time is initialised to system time. If you want
+    ; On startup, the timestamp is initialised to system time. If you want
     ; to add an offset, uncomment the following line and give a number
     ; in seconds.
-    ; tist_edioffset 0
+    ; tist_offset 0
 
     ; The management server is a simple TCP server that can present
     ; statistics data (buffers, overruns, underruns, etc)
diff --git a/doc/example.mux b/doc/example.mux
index 76d6828..6c2bc18 100644
--- a/doc/example.mux
+++ b/doc/example.mux
@@ -236,7 +236,7 @@ outputs {
         ; If TIST is enabled, requires leap-second information (see example.mux)
         ;
         ; WARNING! requires ODR-DabMux to be compiled with
-        ; EDI output, and this will enable leap second download
+        ; cURL support, and this will enable leap second download
         ; as for the EDI output!
         allowmetadata true
     }