Clean out old obsolete demodulators.

Author: wb2osz

src/audio.h

@@ -173,9 +173,6 @@ struct audio_s {
 
 	    int upsample;		/* Upsample by this factor for G3RUH. */
 
-	    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. */
 

src/demod.c

@@ -120,7 +120,6 @@ int demod_init (struct audio_s *pa)
 	   * This can be increased by:
 	   *	Multiple frequencies.
 	   *	Multiple letters (not sure if I will continue this).
-	   *	New interleaved decoders.
 	   *
 	   * num_slicers is set to max by the "+" option.
 	   */
@@ -313,48 +312,6 @@ int demod_init (struct audio_s *pa)
 
 	        save_audio_config_p->achan[chan].num_subchan = num_letters;
 
-/*
- * Quick hack with special case for another experiment.
- * Do this in a more general way if it turns out to be useful.
- */
-	        save_audio_config_p->achan[chan].interleave = 1;
-	        if (strcasecmp(save_audio_config_p->achan[chan].profiles, "EE") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 2;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "EEE") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 3;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "EEEE") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 4;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "EEEEE") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 5;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "GG") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 2;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "GGG") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 3;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "GGG+") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 3;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "GGGG") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 4;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-	        else if (strcasecmp(save_audio_config_p->achan[chan].profiles, "GGGGG") == 0) {
-	          save_audio_config_p->achan[chan].interleave = 5;
-	          save_audio_config_p->achan[chan].decimate = 1;
-	        }
-
 		if (save_audio_config_p->achan[chan].num_subchan != num_letters) {
 		  text_color_set(DW_COLOR_ERROR);
 		  dw_printf ("INTERNAL ERROR, %s:%d, chan=%d, num_subchan(%d) != strlen(\"%s\")\n",
@@ -383,7 +340,7 @@ int demod_init (struct audio_s *pa)
 	            dw_printf ("        %d.%d: %c %d & %d\n", chan, d, profile, mark, space);
 	          }
 
-	          demod_afsk_init (save_audio_config_p->adev[ACHAN2ADEV(chan)].samples_per_sec / (save_audio_config_p->achan[chan].decimate * save_audio_config_p->achan[chan].interleave), 
+	          demod_afsk_init (save_audio_config_p->adev[ACHAN2ADEV(chan)].samples_per_sec / save_audio_config_p->achan[chan].decimate, 
 			    save_audio_config_p->achan[chan].baud,
 		            mark, 
 	                    space,

src/demod_9600.c

@@ -159,12 +159,6 @@ void demod_9600_init (int samples_per_sec, int baud, struct demodulator_state_s
 	    D->pll_locked_inertia = 0.89;
 	    D->pll_searching_inertia = 0.67;
 
-	    D->play_it_again_sample = 0;		// TODO: 1.6 experiment.
-							// assuming lp_filter_size > lp2_filter_size
-
-	    D->lp2_filter_size =  samples_per_sec / baud;	// samples for 1 bit
-
-
 //	    break;
 //	}
 
@@ -216,12 +210,6 @@ void demod_9600_init (int samples_per_sec, int baud, struct demodulator_state_s
 
 	(void)gen_lowpass (fc, D->lp_filter, D->lp_filter_size, D->lp_window, 0);
 
-// Go back and resample where bit is expected.
-
-	fc = (float)baud * 1 / (float)samples_per_sec;
-
-	(void)gen_lowpass (fc, D->lp2_filter, D->lp2_filter_size, D->lp_window, 0);
-
 	/* Version 1.2: Experiment with different slicing levels. */
 
 	for (j = 0; j < MAX_SUBCHANS; j++) {
@@ -524,31 +512,7 @@ inline static void nudge_pll (int chan, int subchan, int slice, float demod_out_
 
 	  /* Overflow.  Was large positive, wrapped around, now large negative. */
 
-
-	  if (D->play_it_again_sample) {	// New experiment in 1.6.
-
-// FIXME: double check position and draw picture.
-
-	    int offset = ( D->lp_filter_size - D->lp2_filter_size ) / 2;
-
-	    float amp = convolve (D->raw_cb + offset, D->lp2_filter, D->lp2_filter_size);
-
-	    int resampled;
-
-	    if (D->num_slicers > 1) {
-	      resampled = amp - slice_point[slice] > 0;;
-	    }
-	    else {
-	      resampled = amp > 0;
-	    }
-
-	    hdlc_rec_bit (chan, subchan, slice, resampled, 1, D->slicer[slice].lfsr);
-	  }
-	  else {
-
-// traditional
-	    hdlc_rec_bit (chan, subchan, slice, demod_out_f > 0, 1, D->slicer[slice].lfsr);
-	  }
+	  hdlc_rec_bit (chan, subchan, slice, demod_out_f > 0, 1, D->slicer[slice].lfsr);
 	}
 
 /*