diff --git a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc index efe43a3..dadccbb 100644 --- a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc +++ b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc @@ -1,5 +1,5 @@ - + Thu May 5 00:22:45 2016 @@ -72,6 +72,10 @@ run True + + sizing_mode + fixed + thread_safe_setters @@ -80,6 +84,10 @@ title AMSAT FOX DUV Decoder + + placement + (0,0) + variable @@ -319,7 +327,7 @@ TX sampling rate gain - 1.0 + 1.2 id @@ -368,6 +376,10 @@ TX sampling rate short_id + + hide + none + type string @@ -411,6 +423,10 @@ TX sampling rate short_id + + hide + none + type eng_float @@ -564,6 +580,10 @@ TX sampling rate short_id + + hide + none + type string @@ -607,6 +627,10 @@ TX sampling rate short_id + + hide + none + type string @@ -752,6 +776,10 @@ TX sampling rate short_id + + hide + none + type intx @@ -795,6 +823,10 @@ TX sampling rate short_id + + hide + none + type intx @@ -838,6 +870,10 @@ TX sampling rate short_id + + hide + none + type string @@ -940,6 +976,10 @@ TX sampling rate short_id + + hide + none + type eng_float @@ -983,6 +1023,10 @@ TX sampling rate short_id + + hide + none + type string @@ -1027,6 +1071,10 @@ we shift the LO a little further short_id + + hide + none + type eng_float @@ -1158,7 +1206,7 @@ max_modulation_freq = 3000 gain - 100 + 1.0 id @@ -2630,6 +2678,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type intx @@ -2673,6 +2725,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type eng_float @@ -2716,6 +2772,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type intx @@ -2830,6 +2890,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type eng_float @@ -2873,6 +2937,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type string @@ -3378,6 +3446,10 @@ max_modulation_freq = 3000 short_id + + hide + none + type string diff --git a/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py b/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py index e4c12e4..ded4bfe 100755 --- a/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py +++ b/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py @@ -5,7 +5,7 @@ # Title: AMSAT FOX DUV Decoder # Author: Thanos Giolias (agiolias@csd.uoc.gr), Nikos Karamolegos (karamolegkos.n@gmail.com), Manolis Surligas (surligas@gmail.com) # Description: A DUV Decoder for the AMSAT FOX satellites -# Generated: Sun Mar 25 17:42:58 2018 +# Generated: Mon Jul 30 13:36:42 2018 ################################################## from gnuradio import analog @@ -90,7 +90,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): self.osmosdr_source_0.set_bandwidth(samp_rate_rx, 0) self.low_pass_filter_1 = filter.fir_filter_fff(100, firdes.low_pass( - 100, audio_samp_rate, 195, 10, firdes.WIN_HAMMING, 6.76)) + 1.0, audio_samp_rate, 195, 10, firdes.WIN_HAMMING, 6.76)) self.low_pass_filter_0 = filter.fir_filter_ccf(1, firdes.low_pass( 1, audio_samp_rate, deviation+max_modulation_freq, 3000, firdes.WIN_HAMMING, 6.76)) self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(int(samp_rate_rx/filter_rate), (xlate_filter_taps), lo_offset, samp_rate_rx) @@ -103,7 +103,9 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): taps=None, fractional_bw=None, ) - self.analog_quadrature_demod_cf_0 = analog.quadrature_demod_cf(1.0) + self.analog_quadrature_demod_cf_0 = analog.quadrature_demod_cf(1.2) + + ################################################## # Connections @@ -285,7 +287,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): def set_audio_samp_rate(self, audio_samp_rate): self.audio_samp_rate = audio_samp_rate - self.low_pass_filter_1.set_taps(firdes.low_pass(100, self.audio_samp_rate, 195, 10, firdes.WIN_HAMMING, 6.76)) + self.low_pass_filter_1.set_taps(firdes.low_pass(1.0, self.audio_samp_rate, 195, 10, firdes.WIN_HAMMING, 6.76)) self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.audio_samp_rate, self.deviation+self.max_modulation_freq, 3000, firdes.WIN_HAMMING, 6.76)) self.digital_clock_recovery_mm_xx_0_0_0.set_omega((self.audio_samp_rate/100.0) / 200) diff --git a/lib/decoder_8b10b_impl.cc b/lib/decoder_8b10b_impl.cc index cd3fec3..4b60492 100644 --- a/lib/decoder_8b10b_impl.cc +++ b/lib/decoder_8b10b_impl.cc @@ -100,7 +100,7 @@ namespace gr return true; } - uint8_t + void decoder_8b10b_impl::process_10b (uint16_t word, int write_pos) { uint16_t diff_bits = 0; diff --git a/lib/decoder_8b10b_impl.h b/lib/decoder_8b10b_impl.h index e717876..dbfe322 100644 --- a/lib/decoder_8b10b_impl.h +++ b/lib/decoder_8b10b_impl.h @@ -578,7 +578,7 @@ namespace gr bool set_access_code (const std::string &access_code); - uint8_t + void process_10b (uint16_t word, int write_pos); // Where all the action really happens diff --git a/lib/iq_sink_impl.cc b/lib/iq_sink_impl.cc index d5ac027..2e4ef76 100644 --- a/lib/iq_sink_impl.cc +++ b/lib/iq_sink_impl.cc @@ -79,9 +79,7 @@ namespace gr case IQ_SINK_STATUS_NULL: { return noutput_items; - break; } - case IQ_SINK_STATUS_ACTIVE: { /* update d_fp is required */ @@ -112,11 +110,11 @@ namespace gr } nwritten += count; } - return nwritten; - break; } } + /* Should never reach here */ + return noutput_items; } } /* namespace satnogs */ diff --git a/lib/iq_sink_impl.h b/lib/iq_sink_impl.h index 843105f..b89ff11 100644 --- a/lib/iq_sink_impl.h +++ b/lib/iq_sink_impl.h @@ -46,7 +46,6 @@ namespace gr size_t d_num_points; float d_scale; int16_t *d_out; - const char *d_filename; public: iq_sink_impl (const float scale, const char *filename, bool append,