From 1a785b68ca58090d19088ed6d37b38226969f9f2 Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sun, 30 Jul 2017 19:37:01 +0300 Subject: [PATCH] Add frame file sink blocks --- apps/CMakeLists.txt | 1 + apps/flowgraphs/fsk9600_ax25.grc | 124 +++++++++++++++++++++--- apps/flowgraphs/satnogs_fsk9600_ax25.py | 14 ++- 3 files changed, 121 insertions(+), 18 deletions(-) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 88ce171..5c424d6 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -29,5 +29,6 @@ GR_PYTHON_INSTALL( flowgraphs/satnogs_generic_iq_receiver.py flowgraphs/satnogs_bpsk_demod.py flowgraphs/satnogs_apt_demod.py + flowgraphs/satnogs_fsk9600_ax25.py DESTINATION bin ) diff --git a/apps/flowgraphs/fsk9600_ax25.grc b/apps/flowgraphs/fsk9600_ax25.grc index 4a2c597..66f429f 100644 --- a/apps/flowgraphs/fsk9600_ax25.grc +++ b/apps/flowgraphs/fsk9600_ax25.grc @@ -2607,7 +2607,7 @@ we shift the LO a little further - satnogs_multi_format_msg_sink + satnogs_frame_file_sink alias @@ -2626,7 +2626,7 @@ we shift the LO a little further _coordinate - (1030, 579) + (1126, 555) _rotation @@ -2634,15 +2634,19 @@ we shift the LO a little further id - satnogs_multi_format_msg_sink_0 + satnogs_frame_file_sink_0 - format - 1 + output_type + 0 + + + prefix_name + /tmp/fsk9600_crc_failed - satnogs_multi_format_msg_sink + satnogs_frame_file_sink alias @@ -2661,7 +2665,7 @@ we shift the LO a little further _coordinate - (1030, 631) + (1126, 619) _rotation @@ -2669,12 +2673,94 @@ we shift the LO a little further id - satnogs_multi_format_msg_sink_0_0 + satnogs_frame_file_sink_0_0 - format + 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) + + + _rotation + 180 + + + id + satnogs_frame_file_sink_0_1_0 + + + output_type + 1 + + + prefix_name + /tmp/fsk9600_crc_ok + satnogs_ogg_encoder @@ -2944,15 +3030,27 @@ we shift the LO a little further satnogs_ax25_decoder_bm_0 - satnogs_multi_format_msg_sink_0 + satnogs_frame_file_sink_0 failed_pdu - in + frame satnogs_ax25_decoder_bm_0 - satnogs_multi_format_msg_sink_0_0 + satnogs_frame_file_sink_0_1 + failed_pdu + frame + + + satnogs_ax25_decoder_bm_0 + satnogs_frame_file_sink_0_0 pdu - in + frame + + + satnogs_ax25_decoder_bm_0 + satnogs_frame_file_sink_0_1_0 + pdu + frame satnogs_coarse_doppler_correction_cc_0 diff --git a/apps/flowgraphs/satnogs_fsk9600_ax25.py b/apps/flowgraphs/satnogs_fsk9600_ax25.py index eb740e9..da2195e 100755 --- a/apps/flowgraphs/satnogs_fsk9600_ax25.py +++ b/apps/flowgraphs/satnogs_fsk9600_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: Sun Jul 30 00:21:32 2017 +# Generated: Sun Jul 30 19:43:50 2017 ################################################## from gnuradio import analog @@ -61,8 +61,10 @@ class satnogs_fsk9600_ax25(gr.top_block): self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 8, 1024, waterfall_file_path, 1) 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_multi_format_msg_sink_0_0 = satnogs.multi_format_msg_sink(1) - self.satnogs_multi_format_msg_sink_0 = satnogs.multi_format_msg_sink(1) + 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_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.hw_rx_settings[rx_sdr_device]['dev_arg'] ) @@ -97,8 +99,10 @@ class satnogs_fsk9600_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_multi_format_msg_sink_0, 'in')) - self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_multi_format_msg_sink_0_0, 'in')) + 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)) self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.analog_quadrature_demod_cf_0_0, 0))