Re-add burst timer support to RS41 JSON output.

projecthorus · May 18, 2019 · 97d9bb4 · 97d9bb4
1 parent e0a753e
commit 97d9bb4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/demod/mod/rs41mod.c b/demod/mod/rs41mod.c
@@ -100,7 +100,7 @@ typedef struct {
     ui16_t conf_kt; // kill timer (sec)
     ui16_t conf_bt; // burst timer (sec)
     ui8_t  conf_bk; // burst kill
-    ui8_t  conf_cd; // kill countdown (sec) (kt or bt)
+    ui16_t  conf_cd; // kill countdown (sec) (kt or bt)
     char rstyp[9];  // RS41-SG, RS41-SGP
     int  aux;
     char xdata[XDATA_LEN+16]; // xdata: aux_str1#aux_str2 ...
@@ -1213,8 +1213,8 @@ static int print_position(gpx_t *gpx, int ec) {
             // Print out telemetry data as JSON
             if ((!err && !err1 && !err3) || (!err && encrypted)) { // frame-nb/id && gps-time && gps-position  (crc-)ok; 3 CRCs, RS not needed
                 // eigentlich GPS, d.h. UTC = GPS - 18sec (ab 1.1.2017)
-                fprintf(stdout, "{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d",
-                               gpx->frnr, gpx->id, gpx->jahr, gpx->monat, gpx->tag, gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV, gpx->numSV );
+                fprintf(stdout, "{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d, \"bt\": %d",
+                               gpx->frnr, gpx->id, gpx->jahr, gpx->monat, gpx->tag, gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV, gpx->numSV, gpx->conf_cd );
                 if (gpx->option.ptu && !err0 && gpx->T > -273.0) {
                     fprintf(stdout, ", \"temp\": %.1f",  gpx->T );
                 }