Clean up fix-bits feature. New experimental demodulator.

Author: wb2osz

CHANGES.md

@@ -1,6 +1,15 @@
 
 # Revision History #
 
+----------
+
+## Version 1.3  -- Development snapshot H  --  November 2015 ##
+
+### New Feature: ###
+
+- New experimental demodulator.  More details later.
+
+
 ----------
 
 ## Version 1.3  -- Development snapshot G  --  November 2015 ##

Makefile.win

@@ -238,6 +238,7 @@ strlcat.o : misc/strlcat.c
 check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest check-modem1200 check-modem300 check-modem9600 
 
 # Can we encode and decode at popular data rates?
+# Verify that single bit fixup increases the count.
 
 check-modem1200 : gen_packets atest
 	gen_packets -n 100 -o test1.wav
@@ -361,14 +362,13 @@ demod_9600.o : tune.h
 demod_afsk.o : tune.h
 
 
-testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c fsk_demod_agc.h \
+testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.o fsk_demod_agc.h \
 		hdlc_rec.o hdlc_rec2.o multi_modem.o \
 		rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o latlong.o symbols.o textcolor.o telemetry.o \
-		regex.a misc.a \
-		
+		dwgpsnmea.o dwgps.o serial_port.o tt_text.o regex.a misc.a
 	rm -f atest.exe
 	$(CC) $(CFLAGS) -o atest $^
-	./atest -P E ../02_Track_2.wav | grep "packets decoded in" >atest.out
+	./atest -P GGG- -F 0 ../02_Track_2.wav | grep "packets decoded in" >atest.out
 	echo " " > tune.h
 
 

aprs_tt.c

@@ -1561,7 +1561,7 @@ static void raw_tt_data_to_app (int chan, char *msg)
 	  alevel.mark = -2;
 	  alevel.space = -2;
 
-	  dlq_append (DLQ_REC_FRAME, chan, -1, pp, alevel, RETRY_NONE, "tt");
+	  dlq_append (DLQ_REC_FRAME, chan, -1, 0, pp, alevel, RETRY_NONE, "tt");
 	}
 	else {
 	  text_color_set(DW_COLOR_ERROR);

atest.c

@@ -167,6 +167,10 @@ static void usage (void);
 
 static int decode_only = 0;		/* Set to 0 or 1 to decode only one channel.  2 for both.  */
 
+static int sample_number = -1;		/* Sample number from the file. */
+					/* Incremented only for channel 0. */
+					/* Use to print timestamp, relative to beginning */
+					/* of file, when frame was decoded. */
 
 int main (int argc, char *argv[])
 {
@@ -495,6 +499,8 @@ int main (int argc, char *argv[])
             if (audio_sample >= 256 * 256)
                e_o_f = 1;
 
+	    if (c == 0) sample_number++;
+
             if (decode_only == 0 && c != 0) continue;
             if (decode_only == 1 && c != 1) continue;
 
@@ -572,16 +578,16 @@ int audio_get (int a)
 
 void rdq_append (rrbb_t rrbb)
 {
-	int chan;
+	int chan, subchan, slice;
 	alevel_t alevel;
-	int subchan;
 
 
 	chan = rrbb_get_chan(rrbb);
 	subchan = rrbb_get_subchan(rrbb);
+	slice = rrbb_get_slice(rrbb);
 	alevel = rrbb_get_audio_level(rrbb);
 
-	hdlc_rec2_try_to_fix_later (rrbb, chan, subchan, alevel);
+	hdlc_rec2_try_to_fix_later (rrbb, chan, subchan, slice, alevel);
 	rrbb_delete (rrbb);
 }
 
@@ -590,7 +596,7 @@ void rdq_append (rrbb_t rrbb)
  * This is called when we have a good frame.
  */
 
-void dlq_append (dlq_type_t type, int chan, int subchan, packet_t pp, alevel_t alevel, retry_t retries, char *spectrum)  
+void dlq_append (dlq_type_t type, int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, char *spectrum)
 {	
 
 	char stemp[500];
@@ -627,6 +633,15 @@ void dlq_append (dlq_type_t type, int chan, int subchan, packet_t pp, alevel_t a
 	text_color_set(DW_COLOR_DEBUG);
 	dw_printf ("\n");
 	dw_printf("DECODED[%d] ", packets_decoded );
+
+	/* Insert time stamp relative to start of file. */
+
+	double sec = (double)sample_number / my_audio_config.adev[0].samples_per_sec;
+	int min = (int)(sec / 60.);
+	sec -= min * 60;
+
+	dw_printf ("%d:%07.4f ", min, sec);
+
 	if (h != AX25_SOURCE) {
 	  dw_printf ("Digipeater ");
 	}
@@ -641,27 +656,38 @@ void dlq_append (dlq_type_t type, int chan, int subchan, packet_t pp, alevel_t a
 
 #endif
 
-#if defined(EXPERIMENT_G) || defined(EXPERIMENT_H)
-	int j;
-
-	for (j=0; j<MAX_SUBCHANS; j++) {
-	  if (spectrum[j] == '|') {
-	    count[j]++;
-	  }
-	}
-#endif
+//#if defined(EXPERIMENT_G) || defined(EXPERIMENT_H)
+//	int j;
+//
+//	for (j=0; j<MAX_SUBCHANS; j++) {
+//	  if (spectrum[j] == '|') {
+//	    count[j]++;
+//	  }
+//	}
+//#endif
 
 
 // Display non-APRS packets in a different color.
 
-// TODO: display subchannel if appropriate.
+// Display channel with subchannel/slice if applicable.
 
 	if (ax25_is_aprs(pp)) {
 	  text_color_set(DW_COLOR_REC);
-	  dw_printf ("[%d] ", chan);
 	}
 	else {
 	  text_color_set(DW_COLOR_DEBUG);
+	}
+
+	if (my_audio_config.achan[chan].num_subchan > 1 && my_audio_config.achan[chan].num_slicers == 1) {
+	  dw_printf ("[%d.%d] ", chan, subchan);
+	}
+	else if (my_audio_config.achan[chan].num_subchan == 1 && my_audio_config.achan[chan].num_slicers > 1) {
+	  dw_printf ("[%d.%d] ", chan, slice);
+	}
+	else if (my_audio_config.achan[chan].num_subchan > 1 && my_audio_config.achan[chan].num_slicers > 1) {
+	  dw_printf ("[%d.%d.%d] ", chan, subchan, slice);
+	}
+	else {
 	  dw_printf ("[%d] ", chan);
 	}
 
@@ -671,7 +697,7 @@ void dlq_append (dlq_type_t type, int chan, int subchan, packet_t pp, alevel_t a
 
 	ax25_delete (pp);
 
-} /* end app_process_rec_packet */
+} /* end fake dlq_append */
 
 
 void ptt_set (int ot, int chan, int ptt_signal)

audio.h

@@ -41,19 +41,12 @@ enum audio_in_type_e {
 
 typedef enum retry_e {
 		RETRY_NONE=0,
-		RETRY_SWAP_SINGLE=1,
-		RETRY_SWAP_DOUBLE=2,
-		RETRY_SWAP_TRIPLE=3,
-		RETRY_REMOVE_SINGLE=4,
-		RETRY_REMOVE_DOUBLE=5,
-		RETRY_REMOVE_TRIPLE=6,
-		RETRY_INSERT_SINGLE=7,
-		RETRY_INSERT_DOUBLE=8,
-		RETRY_SWAP_TWO_SEP=9,
-		RETRY_SWAP_MANY=10,
-		RETRY_REMOVE_MANY=11,
-		RETRY_REMOVE_TWO_SEP=12,
-		RETRY_MAX = 13}  retry_t;
+		RETRY_INVERT_SINGLE=1,
+		RETRY_INVERT_DOUBLE=2,
+		RETRY_INVERT_TRIPLE=3,
+		RETRY_INVERT_TWO_SEP=4,
+		RETRY_MAX = 5}  retry_t;
+
 
 typedef enum sanity_e { SANITY_APRS, SANITY_AX25, SANITY_NONE } sanity_t;
 
@@ -126,6 +119,9 @@ struct audio_s {
 	    int decimate;		/* Reduce AFSK sample rate by this factor to */
 					/* decrease computational requirements. */
 
+	    int interleave;		/* If > 1, interleave samples among multiple decoders. */
+					/* Quick hack for experiment. */
+
             int mark_freq;		/* Two tones for AFSK modulation, in Hz. */
 	    int space_freq;		/* Standard tones are 1200 and 2200 for 1200 baud. */
 
@@ -140,19 +136,13 @@ struct audio_s {
 
 	    int offset;			/* Spacing between filter frequencies. */
 
-	/* Next two are derived from 3 above by demod_init. */
+	    int num_slicers;		/* Number of different threshold points to decide */
+					/* between mark or space. */
 
-	    int num_demod;		/* Number of different demodulators (filters). */
-					/* Previously this was same as num_subchan but we add */
-					/* a new variation in version 1.2 where a single modem */
-					/* can feed multiple slicers and HDLC decoders. */
+	/* This is derived from above by demod_init. */
 
-					/* num_slicers could be added to be more general but */
-					/* for the intial experiment, we can just examine profiles. */
+	    int num_subchan;		/* Total number of modems for each channel. */
 
-	    int num_subchan;		/* Total number of modems / hdlc decoders for each channel. */
-					/* Potentially it could be product of strlen(profiles) * num_freq. */
-					/* Currently can't use both at once. */
 
 	/* These are for dealing with imperfect frames. */
 
@@ -267,7 +257,7 @@ struct audio_s {
 
 #define DEFAULT_BITS_PER_SAMPLE	16
 
-#define DEFAULT_FIX_BITS RETRY_SWAP_SINGLE
+#define DEFAULT_FIX_BITS RETRY_INVERT_SINGLE
 
 /* 
  * Standard for AFSK on VHF FM. 

beacon.c

@@ -914,7 +914,7 @@ static void beacon_send (int j, dwgps_info_t *gpsinfo)
 	            /* Simulated reception. */
 
 		    memset (&alevel, 0xff, sizeof(alevel));
-	            dlq_append (DLQ_REC_FRAME, g_misc_config_p->beacon[j].sendto_chan, 0, pp, alevel, 0, "");
+	            dlq_append (DLQ_REC_FRAME, g_misc_config_p->beacon[j].sendto_chan, 0, 0, pp, alevel, 0, "");
 	            break; 
 		}
 	      }

config.c

@@ -1390,15 +1390,27 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	      continue;
 	    }
 	    n = atoi(t);
-            if (n >= RETRY_NONE && n <= RETRY_REMOVE_TWO_SEP) {
+            if (n >= RETRY_NONE && n < RETRY_MAX) {		// MAX is actually last valid +1
 	      p_audio_config->achan[channel].fix_bits = (retry_t)n;
 	    }
 	    else {
 	      p_audio_config->achan[channel].fix_bits = DEFAULT_FIX_BITS;
 	      text_color_set(DW_COLOR_ERROR);
-              dw_printf ("Line %d: Invalid value for FIX_BITS. Using %d.\n", 
-			line, p_audio_config->achan[channel].fix_bits);
-   	    }
+              dw_printf ("Line %d: Invalid value %d for FIX_BITS. Using default of %d.\n",
+			line, n, p_audio_config->achan[channel].fix_bits);
+	    }
+
+	    if (p_audio_config->achan[channel].fix_bits > RETRY_INVERT_SINGLE) {
+	      text_color_set(DW_COLOR_INFO);
+              dw_printf ("Line %d: Using a FIX_BITS value greater than %d is not recommended for normal operation.\n",
+			line, RETRY_INVERT_SINGLE);
+	    }
+
+	    if (p_audio_config->achan[channel].fix_bits >= RETRY_INVERT_TWO_SEP) {
+	      text_color_set(DW_COLOR_INFO);
+              dw_printf ("Line %d: Using a FIX_BITS value of %d will waste a lot of CPU power and produce wrong results.\n",
+			line, RETRY_INVERT_TWO_SEP);
+	    }
 
 	    t = split(NULL,0);
 	    while (t != NULL) {