mod/multi: Makefiles

demod/mod/Makefile

@@ -0,0 +1,40 @@
+
+CC = gcc
+COPTS = -O3
+
+.PHONY: all
+all: rs41mod rs92mod lms6Xmod meisei100mod dfm09mod m10mod mXXmod
+
+rs41mod: demod_mod.o bch_ecc_mod.o
+	$(CC) $(COPTS) -o rs41mod rs41mod.c demod_mod.o bch_ecc_mod.o -lm
+
+dfm09mod: demod_mod.o
+	$(CC) $(COPTS) -o dfm09mod dfm09mod.c demod_mod.o -lm
+
+m10mod: demod_mod.o
+	$(CC) $(COPTS) -o m10mod m10mod.c demod_mod.o -lm
+
+mXXmod: demod_mod.o
+	$(CC) $(COPTS) -o mXXmod mXXmod.c demod_mod.o -lm
+
+lms6Xmod: demod_mod.o bch_ecc_mod.o
+	$(CC) $(COPTS) -o lms6Xmod lms6Xmod.c demod_mod.o bch_ecc_mod.o -lm
+
+meisei100mod: demod_mod.o bch_ecc_mod.o
+	$(CC) $(COPTS) -o meisei100mod meisei100mod.c demod_mod.o bch_ecc_mod.o -lm
+
+rs92mod: demod_mod.o bch_ecc_mod.o nav_gps_vel.c
+	$(CC) $(COPTS) -o rs92mod rs92mod.c demod_mod.o bch_ecc_mod.o -lm
+
+demod_mod.o: demod_mod.c demod_mod.h
+	$(CC) -Ofast -c demod_mod.c
+
+bch_ecc_mod.o: bch_ecc_mod.c bch_ecc_mod.h
+	$(CC) $(COPTS) -c bch_ecc_mod.c
+
+.PHONY: clean
+clean:
+	rm -f rs41mod rs92mod lms6Xmod meisei100mod dfm09mod m10mod mXXmod
+	rm -f demod_mod.o
+	rm -f bch_ecc_mod.o
+

demod/mod/bch_ecc_mod.h

@@ -13,8 +13,17 @@
 #ifdef INCLUDESTATIC
     #define INCSTAT static
 #else
+    #ifndef INTTYPES
+    #define INTTYPES
     typedef unsigned char  ui8_t;
-    typedef unsigned int  ui32_t;
+    typedef unsigned short ui16_t;
+    typedef unsigned int   ui32_t;
+    typedef char  i8_t;
+    typedef short i16_t;
+    typedef int   i32_t;
+    #endif
+    //typedef unsigned char  ui8_t;
+    //typedef unsigned int  ui32_t;
     #define INCSTAT
 #endif
 

demod/mod/demod_mod.h

@@ -8,12 +8,15 @@
 #endif
 
 
+#ifndef INTTYPES
+#define INTTYPES
 typedef unsigned char  ui8_t;
 typedef unsigned short ui16_t;
 typedef unsigned int   ui32_t;
 typedef char  i8_t;
 typedef short i16_t;
 typedef int   i32_t;
+#endif
 
 
 typedef struct {

demod/mod/meisei100mod.c

@@ -96,17 +96,16 @@ e.g. -b --br 2398
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+
 #ifdef CYGWIN
   #include <fcntl.h>  // cygwin: _setmode()
   #include <io.h>
 #endif
 
-/*
-typedef unsigned char  ui8_t;
-typedef unsigned short ui16_t;
-typedef unsigned int   ui32_t;
-typedef short i16_t;
-*/
+//typedef unsigned char  ui8_t;
+//typedef unsigned short ui16_t;
+//typedef unsigned int   ui32_t;
+//typedef short i16_t;
 
 #include "demod_mod.h"
 

demod/multi/Makefile

@@ -0,0 +1,31 @@
+
+CC = gcc
+COPTS = -O3
+
+rs_multi: rs41base.o lms6Xbase.o dfm09base.o m10base.o demod_base.o bch_ecc_mod.o
+	$(CC) $(COPTS) -o rs_multi rs_multi.c demod_base.o bch_ecc_mod.o rs41base.o dfm09base.o m10base.o lms6Xbase.o -lm -pthread
+
+rs41base.o: rs41base.c
+	$(CC) $(COPTS) -c rs41base.c
+
+dfm09base.o: dfm09base.c
+	$(CC) $(COPTS) -c dfm09base.c
+
+m10base.o: m10base.c
+	$(CC) $(COPTS) -c m10base.c
+
+lms6Xbase.o: lms6Xbase.c
+	$(CC) $(COPTS) -c lms6Xbase.c
+
+demod_base.o: demod_base.c demod_base.h
+	$(CC) -Ofast -c demod_base.c
+
+bch_ecc_mod.o: bch_ecc_mod.c bch_ecc_mod.h
+	$(CC) $(COPTS) -c bch_ecc_mod.c
+
+.PHONY: clean
+clean:
+	rm -f rs_multi
+	rm -f rs41base.o dfm09base.o m10base.o lms6Xbase.o
+	rm -f demod_base.o bch_ecc_mod.o
+

demod/multi/bch_ecc_mod.h

@@ -13,8 +13,17 @@
 #ifdef INCLUDESTATIC
     #define INCSTAT static
 #else
+    #ifndef INTTYPES
+    #define INTTYPES
     typedef unsigned char  ui8_t;
-    typedef unsigned int  ui32_t;
+    typedef unsigned short ui16_t;
+    typedef unsigned int   ui32_t;
+    typedef char  i8_t;
+    typedef short i16_t;
+    typedef int   i32_t;
+    #endif
+    //typedef unsigned char  ui8_t;
+    //typedef unsigned int  ui32_t;
     #define INCSTAT
 #endif
 

demod/multi/demod_base.h

@@ -11,12 +11,15 @@
 #endif
 
 
+#ifndef INTTYPES
+#define INTTYPES
 typedef unsigned char  ui8_t;
 typedef unsigned short ui16_t;
 typedef unsigned int   ui32_t;
 typedef char  i8_t;
 typedef short i16_t;
 typedef int   i32_t;
+#endif
 
 
 #define MAX_FQ 5

demod/multi/m10base.c

@@ -985,7 +985,7 @@ static int print_pos(gpx_t *gpx, int csOK) {
                 for (j = 0; sn_id[j]; j++) { if (sn_id[j] == ' ') sn_id[j] = '-'; }
 
                 fprintf(stdout, "{ \"type\": \"%s\"", "M10");
-                fprintf(stdout, ", \"frame\": %lu ,", (unsigned long)(sec_gps0+0.5));
+                fprintf(stdout, ", \"frame\": %lu, ", (unsigned long)(sec_gps0+0.5));
                 fprintf(stdout, "\"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",
                                sn_id, utc_jahr, utc_monat, utc_tag, utc_std, utc_min, utc_sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vV, gpx->numSV);
                 // APRS id, 9 characters