Updated RS code for the demod

auto_rx/build.sh

@@ -21,10 +21,11 @@ gcc rs_main41.o rs_rs41.o rs_bch_ecc.o rs_demod.o rs_datum.o -lm -o rs41mod
 gcc -c rs_main92.c
 gcc rs_main92.o rs_rs92.o rs_bch_ecc.o rs_demod.o rs_datum.o -lm -o rs92mod
 
-cd ../rs92/
-gcc rs92ecc.c -lm -o rs92ecc  -I../ecc/
-cd ../rs41/
-gcc rs41ecc.c -lm -o rs41ecc  -I../ecc/
+cd ../demod/
+gcc -c demod.c
+gcc -c demod_dft.c
+gcc rs92dm.c demod.o -lm -o rs92ecc -I../ecc/ -I../rs92
+gcc rs41dm_dft.c demod_dft.o -lm -o rs41ecc -I../ecc/ -I../rs41
 
 # Copy all necessary files into this directory.
 cd ../auto_rx/
@@ -32,7 +33,7 @@ cp ../scan/rs_detect .
 cp ../scan/reset_usb .
 cp ../rs_module/rs41mod .
 cp ../rs_module/rs92mod .
-cp ../rs92/rs92ecc .
-cp ../rs41/rs41ecc .
+cp ../demod/rs92ecc .
+cp ../demod/rs41ecc .
 
 echo "Done!"

demod/rs41dm.c

@@ -988,6 +988,8 @@ int print_position() {
             {
                 //fprintf(stdout, "  (%.1f %.1f %.1f) ", gpx.vN, gpx.vE, gpx.vU);
                 fprintf(stdout,"  vH: %4.1f  D: %5.1f°  vV: %3.1f ", gpx.vH, gpx.vD, gpx.vU);
+                printf("\n{ \"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 }\n",  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.vU );
+
             }
         }
         if (option_ptu && !err0) {

demod/rs41dm_dft.c

@@ -988,6 +988,8 @@ int print_position() {
             {
                 //fprintf(stdout, "  (%.1f %.1f %.1f) ", gpx.vN, gpx.vE, gpx.vU);
                 fprintf(stdout,"  vH: %4.1f  D: %5.1f°  vV: %3.1f ", gpx.vH, gpx.vD, gpx.vU);
+                printf("\n{ \"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 }\n",  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.vU );
+
             }
         }
         if (option_ptu && !err0) {

demod/rs92dm.c

@@ -1111,6 +1111,7 @@ int print_position() {  // GPS-Hoehe ueber Ellipsoid
             Gps2Date(gpx.week, gpx.gpssec, &gpx.jahr, &gpx.monat, &gpx.tag);
             //fprintf(stdout, "(W %d) ", gpx.week);
             fprintf(stdout, "(%04d-%02d-%02d) ", gpx.jahr, gpx.monat, gpx.tag);
+            printf("\n{ \"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 }\n",  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.vU );
         }
         fprintf(stdout, "%s ", weekday[gpx.wday]);  // %04.1f: wenn sek >= 59.950, wird auf 60.0 gerundet
         fprintf(stdout, "%02d:%02d:%06.3f", gpx.std, gpx.min, gpx.sek);