From 3cc611c6c9627c0eb0b1c8a5755c7ad687c4408b Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sat, 9 Dec 2017 19:45:23 +0200 Subject: [PATCH] Remove .txt decoded frames files * Decoded frames are stored only in hex files * Output only the CRC valid frames. For now, in order to get the CRC failed manual edit of the flowgraph is needed. In the near future, a command line arguemnt will enable/disable --- apps/flowgraphs/afsk1200_ax25.grc | 2 +- apps/flowgraphs/fsk9600_ax25.grc | 141 +--------- apps/flowgraphs/fsk9600_g3ruh_ax25.grc | 139 +--------- apps/flowgraphs/satnogs_afsk1200_ax25.py | 4 +- apps/flowgraphs/satnogs_fsk9600_ax25.py | 258 +++++++++--------- apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py | 8 +- 6 files changed, 135 insertions(+), 417 deletions(-) diff --git a/apps/flowgraphs/afsk1200_ax25.grc b/apps/flowgraphs/afsk1200_ax25.grc index 0006626..3691c63 100644 --- a/apps/flowgraphs/afsk1200_ax25.grc +++ b/apps/flowgraphs/afsk1200_ax25.grc @@ -3256,7 +3256,7 @@ max_modulation_freq = 3000 prefix_name - /tmp/afsk1200_crc_ok + decoded_data_file_path diff --git a/apps/flowgraphs/fsk9600_ax25.grc b/apps/flowgraphs/fsk9600_ax25.grc index 51e4c77..db15ece 100644 --- a/apps/flowgraphs/fsk9600_ax25.grc +++ b/apps/flowgraphs/fsk9600_ax25.grc @@ -2970,124 +2970,7 @@ we shift the LO a little further _coordinate - (1126, 555) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0 - - - output_type - 0 - - - prefix_name - /tmp/fsk9600_crc_failed - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (1126, 619) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0_0 - - - output_type - 0 - - - prefix_name - /tmp/fsk9600_crc_ok - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (1126, 683) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0_1 - - - output_type - 1 - - - prefix_name - /tmp/fsk9600_crc_failed - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (1142, 747) + (1136, 588) _rotation @@ -3103,7 +2986,7 @@ we shift the LO a little further prefix_name - /tmp/fsk9600_crc_ok + decoded_data_file_path @@ -3302,7 +3185,7 @@ we shift the LO a little further 1 - rps + pps 10 @@ -3425,24 +3308,6 @@ we shift the LO a little further 0 0 - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0 - failed_pdu - frame - - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0_1 - failed_pdu - frame - - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0_0 - pdu - frame - satnogs_ax25_decoder_bm_0 satnogs_frame_file_sink_0_1_0 diff --git a/apps/flowgraphs/fsk9600_g3ruh_ax25.grc b/apps/flowgraphs/fsk9600_g3ruh_ax25.grc index b240004..429c8a0 100644 --- a/apps/flowgraphs/fsk9600_g3ruh_ax25.grc +++ b/apps/flowgraphs/fsk9600_g3ruh_ax25.grc @@ -2970,124 +2970,7 @@ we shift the LO a little further _coordinate - (1126, 555) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0 - - - output_type - 0 - - - prefix_name - /tmp/fsk9600_crc_failed - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (960, 620) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0_0 - - - output_type - 0 - - - prefix_name - decoded_data_file_path - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (1126, 683) - - - _rotation - 180 - - - id - satnogs_frame_file_sink_0_1 - - - output_type - 1 - - - prefix_name - /tmp/fsk9600_crc_failed - - - - satnogs_frame_file_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (1248, 764) + (1176, 604) _rotation @@ -3302,7 +3185,7 @@ we shift the LO a little further 1 - rps + pps 10 @@ -3425,24 +3308,6 @@ we shift the LO a little further 0 0 - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0 - failed_pdu - frame - - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0_1 - failed_pdu - frame - - - satnogs_ax25_decoder_bm_0 - satnogs_frame_file_sink_0_0 - pdu - frame - satnogs_ax25_decoder_bm_0 satnogs_frame_file_sink_0_1_0 diff --git a/apps/flowgraphs/satnogs_afsk1200_ax25.py b/apps/flowgraphs/satnogs_afsk1200_ax25.py index dc1c71b..3f49666 100755 --- a/apps/flowgraphs/satnogs_afsk1200_ax25.py +++ b/apps/flowgraphs/satnogs_afsk1200_ax25.py @@ -5,7 +5,7 @@ # Title: AFSK1200 AX.25 decoder # Author: Manolis Surligas (surligas@gmail.com), Vardakis Giorgos (vardakis.grg@gmail.com) # Description: AFSK1200 AX.25 decoder -# Generated: Sun Nov 26 22:43:03 2017 +# Generated: Sat Dec 9 19:39:06 2017 ################################################## from gnuradio import analog @@ -72,7 +72,7 @@ class satnogs_afsk1200_ax25(gr.top_block): self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, '/tmp/iq.bin', False, enable_iq_dump) - self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink('/tmp/afsk1200_crc_ok', 1) + self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1) self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024, 1) self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) ) diff --git a/apps/flowgraphs/satnogs_fsk9600_ax25.py b/apps/flowgraphs/satnogs_fsk9600_ax25.py index 37d4556..41d299f 100755 --- a/apps/flowgraphs/satnogs_fsk9600_ax25.py +++ b/apps/flowgraphs/satnogs_fsk9600_ax25.py @@ -5,7 +5,7 @@ # Title: FSK9600 AX.25 decoder # Author: Manolis Surligas (surligas@gmail.com) # Description: FSK9600 AX.25 decoder -# Generated: Wed Nov 1 14:52:56 2017 +# Generated: Sat Dec 9 19:38:11 2017 ################################################## from gnuradio import analog @@ -24,28 +24,28 @@ import time class satnogs_fsk9600_ax25(gr.top_block): - def __init__(self, rigctl_port=4532, waterfall_file_path='/tmp/waterfall.dat', dev_args=satnogs.not_set_dev_args, ppm=0, file_path='test.wav', antenna=satnogs.not_set_antenna, doppler_correction_per_sec=1000, rf_gain=satnogs.not_set_rx_rf_gain, lo_offset=100e3, decoded_data_file_path='/tmp/.satnogs/data/data', iq_file_path='/tmp/iq.dat', rx_sdr_device='usrpb200', if_gain=satnogs.not_set_rx_if_gain, rx_freq=100e6, bb_gain=satnogs.not_set_rx_bb_gain, enable_iq_dump=0): + def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=1000, enable_iq_dump=0, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'): gr.top_block.__init__(self, "FSK9600 AX.25 decoder ") ################################################## # Parameters ################################################## - self.rigctl_port = rigctl_port - self.waterfall_file_path = waterfall_file_path - self.dev_args = dev_args - self.ppm = ppm - self.file_path = file_path self.antenna = antenna - self.doppler_correction_per_sec = doppler_correction_per_sec - self.rf_gain = rf_gain - self.lo_offset = lo_offset - self.decoded_data_file_path = decoded_data_file_path - self.iq_file_path = iq_file_path - self.rx_sdr_device = rx_sdr_device - self.if_gain = if_gain - self.rx_freq = rx_freq self.bb_gain = bb_gain + self.decoded_data_file_path = decoded_data_file_path + self.dev_args = dev_args + self.doppler_correction_per_sec = doppler_correction_per_sec self.enable_iq_dump = enable_iq_dump + self.file_path = file_path + self.if_gain = if_gain + self.iq_file_path = iq_file_path + self.lo_offset = lo_offset + self.ppm = ppm + self.rf_gain = rf_gain + self.rigctl_port = rigctl_port + self.rx_freq = rx_freq + self.rx_sdr_device = rx_sdr_device + self.waterfall_file_path = waterfall_file_path ################################################## # Variables @@ -69,10 +69,7 @@ class satnogs_fsk9600_ax25(gr.top_block): self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, '/tmp/iq.bin', False, enable_iq_dump) - self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_ok', 1) - self.satnogs_frame_file_sink_0_1 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 1) - self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_ok', 0) - self.satnogs_frame_file_sink_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 0) + self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1) self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024, 3) self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) ) @@ -106,9 +103,6 @@ class satnogs_fsk9600_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0, 'frame')) - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_0, 'frame')) - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0_1, 'frame')) self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq')) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.dc_blocker_xx_0, 0)) @@ -125,37 +119,6 @@ class satnogs_fsk9600_ax25(gr.top_block): self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0)) self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0)) - def get_rigctl_port(self): - return self.rigctl_port - - def set_rigctl_port(self, rigctl_port): - self.rigctl_port = rigctl_port - - def get_waterfall_file_path(self): - return self.waterfall_file_path - - def set_waterfall_file_path(self, waterfall_file_path): - self.waterfall_file_path = waterfall_file_path - - def get_dev_args(self): - return self.dev_args - - def set_dev_args(self, dev_args): - self.dev_args = dev_args - - def get_ppm(self): - return self.ppm - - def set_ppm(self, ppm): - self.ppm = ppm - self.osmosdr_source_0.set_freq_corr(self.ppm, 0) - - def get_file_path(self): - return self.file_path - - def set_file_path(self, file_path): - self.file_path = file_path - def get_antenna(self): return self.antenna @@ -163,18 +126,55 @@ class satnogs_fsk9600_ax25(gr.top_block): self.antenna = antenna self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) + def get_bb_gain(self): + return self.bb_gain + + def set_bb_gain(self, bb_gain): + self.bb_gain = bb_gain + self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) + + def get_decoded_data_file_path(self): + return self.decoded_data_file_path + + def set_decoded_data_file_path(self, decoded_data_file_path): + self.decoded_data_file_path = decoded_data_file_path + + def get_dev_args(self): + return self.dev_args + + def set_dev_args(self, dev_args): + self.dev_args = dev_args + def get_doppler_correction_per_sec(self): return self.doppler_correction_per_sec def set_doppler_correction_per_sec(self, doppler_correction_per_sec): self.doppler_correction_per_sec = doppler_correction_per_sec - def get_rf_gain(self): - return self.rf_gain + def get_enable_iq_dump(self): + return self.enable_iq_dump - def set_rf_gain(self, rf_gain): - self.rf_gain = rf_gain - self.osmosdr_source_0.set_gain(satnogs.handle_rx_rf_gain(self.rx_sdr_device, self.rf_gain), 0) + def set_enable_iq_dump(self, enable_iq_dump): + self.enable_iq_dump = enable_iq_dump + + def get_file_path(self): + return self.file_path + + def set_file_path(self, file_path): + self.file_path = file_path + + def get_if_gain(self): + return self.if_gain + + def set_if_gain(self, if_gain): + self.if_gain = if_gain + self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) + + def get_iq_file_path(self): + return self.iq_file_path + + def set_iq_file_path(self, iq_file_path): + self.iq_file_path = iq_file_path def get_lo_offset(self): return self.lo_offset @@ -184,17 +184,33 @@ class satnogs_fsk9600_ax25(gr.top_block): self.osmosdr_source_0.set_center_freq(self.rx_freq - self.lo_offset, 0) self.freq_xlating_fir_filter_xxx_0.set_center_freq(self.lo_offset) - def get_decoded_data_file_path(self): - return self.decoded_data_file_path + def get_ppm(self): + return self.ppm - def set_decoded_data_file_path(self, decoded_data_file_path): - self.decoded_data_file_path = decoded_data_file_path + def set_ppm(self, ppm): + self.ppm = ppm + self.osmosdr_source_0.set_freq_corr(self.ppm, 0) - def get_iq_file_path(self): - return self.iq_file_path + def get_rf_gain(self): + return self.rf_gain - def set_iq_file_path(self, iq_file_path): - self.iq_file_path = iq_file_path + def set_rf_gain(self, rf_gain): + self.rf_gain = rf_gain + self.osmosdr_source_0.set_gain(satnogs.handle_rx_rf_gain(self.rx_sdr_device, self.rf_gain), 0) + + def get_rigctl_port(self): + return self.rigctl_port + + def set_rigctl_port(self, rigctl_port): + self.rigctl_port = rigctl_port + + def get_rx_freq(self): + return self.rx_freq + + def set_rx_freq(self, rx_freq): + self.rx_freq = rx_freq + self.satnogs_coarse_doppler_correction_cc_0.set_new_freq_locked(self.rx_freq) + self.osmosdr_source_0.set_center_freq(self.rx_freq - self.lo_offset, 0) def get_rx_sdr_device(self): return self.rx_sdr_device @@ -208,33 +224,11 @@ class satnogs_fsk9600_ax25(gr.top_block): self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) - def get_if_gain(self): - return self.if_gain + def get_waterfall_file_path(self): + return self.waterfall_file_path - def set_if_gain(self, if_gain): - self.if_gain = if_gain - self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) - - def get_rx_freq(self): - return self.rx_freq - - def set_rx_freq(self, rx_freq): - self.rx_freq = rx_freq - self.satnogs_coarse_doppler_correction_cc_0.set_new_freq_locked(self.rx_freq) - self.osmosdr_source_0.set_center_freq(self.rx_freq - self.lo_offset, 0) - - def get_bb_gain(self): - return self.bb_gain - - def set_bb_gain(self, bb_gain): - self.bb_gain = bb_gain - self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) - - def get_enable_iq_dump(self): - return self.enable_iq_dump - - def set_enable_iq_dump(self, enable_iq_dump): - self.enable_iq_dump = enable_iq_dump + def set_waterfall_file_path(self, waterfall_file_path): + self.waterfall_file_path = waterfall_file_path def get_samp_rate_rx(self): return self.samp_rate_rx @@ -304,54 +298,54 @@ class satnogs_fsk9600_ax25(gr.top_block): def argument_parser(): description = 'FSK9600 AX.25 decoder' parser = OptionParser(usage="%prog: [options]", option_class=eng_option, description=description) - parser.add_option( - "", "--rigctl-port", dest="rigctl_port", type="intx", default=4532, - help="Set rigctl_port [default=%default]") - parser.add_option( - "", "--waterfall-file-path", dest="waterfall_file_path", type="string", default='/tmp/waterfall.dat', - help="Set waterfall_file_path [default=%default]") - parser.add_option( - "", "--dev-args", dest="dev_args", type="string", default=satnogs.not_set_dev_args, - help="Set dev_args [default=%default]") - parser.add_option( - "", "--ppm", dest="ppm", type="intx", default=0, - help="Set ppm [default=%default]") - parser.add_option( - "", "--file-path", dest="file_path", type="string", default='test.wav', - help="Set file_path [default=%default]") parser.add_option( "", "--antenna", dest="antenna", type="string", default=satnogs.not_set_antenna, help="Set antenna [default=%default]") - parser.add_option( - "", "--doppler-correction-per-sec", dest="doppler_correction_per_sec", type="intx", default=1000, - help="Set doppler_correction_per_sec [default=%default]") - parser.add_option( - "", "--rf-gain", dest="rf_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_rf_gain), - help="Set rf_gain [default=%default]") - parser.add_option( - "", "--lo-offset", dest="lo_offset", type="eng_float", default=eng_notation.num_to_str(100e3), - help="Set lo_offset [default=%default]") - parser.add_option( - "", "--decoded-data-file-path", dest="decoded_data_file_path", type="string", default='/tmp/.satnogs/data/data', - help="Set decoded_data_file_path [default=%default]") - parser.add_option( - "", "--iq-file-path", dest="iq_file_path", type="string", default='/tmp/iq.dat', - help="Set iq_file_path [default=%default]") - parser.add_option( - "", "--rx-sdr-device", dest="rx_sdr_device", type="string", default='usrpb200', - help="Set rx_sdr_device [default=%default]") - parser.add_option( - "", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain), - help="Set if_gain [default=%default]") - parser.add_option( - "", "--rx-freq", dest="rx_freq", type="eng_float", default=eng_notation.num_to_str(100e6), - help="Set rx_freq [default=%default]") parser.add_option( "", "--bb-gain", dest="bb_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_bb_gain), help="Set bb_gain [default=%default]") + parser.add_option( + "", "--decoded-data-file-path", dest="decoded_data_file_path", type="string", default='/tmp/.satnogs/data/data', + help="Set decoded_data_file_path [default=%default]") + parser.add_option( + "", "--dev-args", dest="dev_args", type="string", default=satnogs.not_set_dev_args, + help="Set dev_args [default=%default]") + parser.add_option( + "", "--doppler-correction-per-sec", dest="doppler_correction_per_sec", type="intx", default=1000, + help="Set doppler_correction_per_sec [default=%default]") parser.add_option( "", "--enable-iq-dump", dest="enable_iq_dump", type="intx", default=0, help="Set enable_iq_dump [default=%default]") + parser.add_option( + "", "--file-path", dest="file_path", type="string", default='test.wav', + help="Set file_path [default=%default]") + parser.add_option( + "", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain), + help="Set if_gain [default=%default]") + parser.add_option( + "", "--iq-file-path", dest="iq_file_path", type="string", default='/tmp/iq.dat', + help="Set iq_file_path [default=%default]") + parser.add_option( + "", "--lo-offset", dest="lo_offset", type="eng_float", default=eng_notation.num_to_str(100e3), + help="Set lo_offset [default=%default]") + parser.add_option( + "", "--ppm", dest="ppm", type="intx", default=0, + help="Set ppm [default=%default]") + parser.add_option( + "", "--rf-gain", dest="rf_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_rf_gain), + help="Set rf_gain [default=%default]") + parser.add_option( + "", "--rigctl-port", dest="rigctl_port", type="intx", default=4532, + help="Set rigctl_port [default=%default]") + parser.add_option( + "", "--rx-freq", dest="rx_freq", type="eng_float", default=eng_notation.num_to_str(100e6), + help="Set rx_freq [default=%default]") + parser.add_option( + "", "--rx-sdr-device", dest="rx_sdr_device", type="string", default='usrpb200', + help="Set rx_sdr_device [default=%default]") + parser.add_option( + "", "--waterfall-file-path", dest="waterfall_file_path", type="string", default='/tmp/waterfall.dat', + help="Set waterfall_file_path [default=%default]") return parser @@ -359,7 +353,7 @@ def main(top_block_cls=satnogs_fsk9600_ax25, options=None): if options is None: options, _ = argument_parser().parse_args() - tb = top_block_cls(rigctl_port=options.rigctl_port, waterfall_file_path=options.waterfall_file_path, dev_args=options.dev_args, ppm=options.ppm, file_path=options.file_path, antenna=options.antenna, doppler_correction_per_sec=options.doppler_correction_per_sec, rf_gain=options.rf_gain, lo_offset=options.lo_offset, decoded_data_file_path=options.decoded_data_file_path, iq_file_path=options.iq_file_path, rx_sdr_device=options.rx_sdr_device, if_gain=options.if_gain, rx_freq=options.rx_freq, bb_gain=options.bb_gain, enable_iq_dump=options.enable_iq_dump) + tb = top_block_cls(antenna=options.antenna, bb_gain=options.bb_gain, decoded_data_file_path=options.decoded_data_file_path, dev_args=options.dev_args, doppler_correction_per_sec=options.doppler_correction_per_sec, enable_iq_dump=options.enable_iq_dump, file_path=options.file_path, if_gain=options.if_gain, iq_file_path=options.iq_file_path, lo_offset=options.lo_offset, ppm=options.ppm, rf_gain=options.rf_gain, rigctl_port=options.rigctl_port, rx_freq=options.rx_freq, rx_sdr_device=options.rx_sdr_device, waterfall_file_path=options.waterfall_file_path) tb.start() tb.wait() diff --git a/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py b/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py index a69c7bc..a94d2b0 100755 --- a/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py +++ b/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py @@ -5,7 +5,7 @@ # Title: FSK9600 AX.25 decoder with G3RUH support # Author: Manolis Surligas (surligas@gmail.com) # Description: FSK9600 AX.25 decoder with G3RUH support -# Generated: Wed Nov 1 13:04:00 2017 +# Generated: Sat Dec 9 19:37:01 2017 ################################################## from gnuradio import analog @@ -70,9 +70,6 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block): self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1) - self.satnogs_frame_file_sink_0_1 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 1) - self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) - self.satnogs_frame_file_sink_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 0) self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, True, 1024, 3) self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) ) @@ -106,9 +103,6 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0, 'frame')) - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_0, 'frame')) - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0_1, 'frame')) self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq')) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.dc_blocker_xx_0, 0))