Commit 3d1c9fd3 authored by Manolis Surligas's avatar Manolis Surligas

Set all decoders output to binary format

* Set all decoders output to binary format
* Introduce the quadrature demodulation filter in all affected
flowgraphs, in order to reduce false alarms and increase performance
parent b2105b12
...@@ -892,7 +892,7 @@ RX sampling rate</value> ...@@ -892,7 +892,7 @@ RX sampling rate</value>
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1771, 582)</value> <value>(2034, 606)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
...@@ -3307,7 +3307,7 @@ max_modulation_freq = 3000</value> ...@@ -3307,7 +3307,7 @@ max_modulation_freq = 3000</value>
</param> </param>
<param> <param>
<key>output_type</key> <key>output_type</key>
<value>1</value> <value>0</value>
</param> </param>
<param> <param>
<key>prefix_name</key> <key>prefix_name</key>
...@@ -3404,6 +3404,53 @@ max_modulation_freq = 3000</value> ...@@ -3404,6 +3404,53 @@ max_modulation_freq = 3000</value>
<value>audio_samp_rate</value> <value>audio_samp_rate</value>
</param> </param>
</block> </block>
<block>
<key>satnogs_quad_demod_filter_ff</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1795, 578)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>gain</key>
<value>((audio_samp_rate/10) / baud_rate)/(math.pi*1)</value>
</param>
<param>
<key>id</key>
<value>satnogs_quad_demod_filter_ff_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>win</key>
<value>80</value>
</param>
</block>
<block> <block>
<key>satnogs_tcp_rigctl_msg_source</key> <key>satnogs_tcp_rigctl_msg_source</key>
<param> <param>
...@@ -3807,7 +3854,7 @@ max_modulation_freq = 3000</value> ...@@ -3807,7 +3854,7 @@ max_modulation_freq = 3000</value>
</connection> </connection>
<connection> <connection>
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id> <source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id> <sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
...@@ -3865,6 +3912,12 @@ max_modulation_freq = 3000</value> ...@@ -3865,6 +3912,12 @@ max_modulation_freq = 3000</value>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id> <source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id> <sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>
......
...@@ -2963,6 +2963,10 @@ we shift the LO a little further</value> ...@@ -2963,6 +2963,10 @@ we shift the LO a little further</value>
<key>minoutbuf</key> <key>minoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>min_frame_len</key>
<value>3</value>
</param>
<param> <param>
<key>unrecognized_char</key> <key>unrecognized_char</key>
<value>ord('#')</value> <value>ord('#')</value>
......
...@@ -692,7 +692,7 @@ TX sampling rate</value> ...@@ -692,7 +692,7 @@ TX sampling rate</value>
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1526, 439)</value> <value>(1675, 446)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
...@@ -2842,10 +2842,6 @@ we shift the LO a little further</value> ...@@ -2842,10 +2842,6 @@ we shift the LO a little further</value>
</block> </block>
<block> <block>
<key>satnogs_ax25_decoder_bm</key> <key>satnogs_ax25_decoder_bm</key>
<param>
<key>n_sync_flags</key>
<value>3</value>
</param>
<param> <param>
<key>alias</key> <key>alias</key>
<value></value> <value></value>
...@@ -2982,7 +2978,7 @@ we shift the LO a little further</value> ...@@ -2982,7 +2978,7 @@ we shift the LO a little further</value>
</param> </param>
<param> <param>
<key>output_type</key> <key>output_type</key>
<value>1</value> <value>0</value>
</param> </param>
<param> <param>
<key>prefix_name</key> <key>prefix_name</key>
...@@ -3079,6 +3075,53 @@ we shift the LO a little further</value> ...@@ -3079,6 +3075,53 @@ we shift the LO a little further</value>
<value>audio_samp_rate</value> <value>audio_samp_rate</value>
</param> </param>
</block> </block>
<block>
<key>satnogs_quad_demod_filter_ff</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1460, 434)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>gain</key>
<value>((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)</value>
</param>
<param>
<key>id</key>
<value>satnogs_quad_demod_filter_ff_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>win</key>
<value>80</value>
</param>
</block>
<block> <block>
<key>satnogs_tcp_rigctl_msg_source</key> <key>satnogs_tcp_rigctl_msg_source</key>
<param> <param>
...@@ -3403,7 +3446,7 @@ we shift the LO a little further</value> ...@@ -3403,7 +3446,7 @@ we shift the LO a little further</value>
</connection> </connection>
<connection> <connection>
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id> <source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id> <sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
...@@ -3455,6 +3498,12 @@ we shift the LO a little further</value> ...@@ -3455,6 +3498,12 @@ we shift the LO a little further</value>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id> <source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id> <sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>
......
...@@ -692,7 +692,7 @@ TX sampling rate</value> ...@@ -692,7 +692,7 @@ TX sampling rate</value>
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1568, 464)</value> <value>(1723, 446)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
...@@ -2842,10 +2842,6 @@ we shift the LO a little further</value> ...@@ -2842,10 +2842,6 @@ we shift the LO a little further</value>
</block> </block>
<block> <block>
<key>satnogs_ax25_decoder_bm</key> <key>satnogs_ax25_decoder_bm</key>
<param>
<key>n_sync_flags</key>
<value>3</value>
</param>
<param> <param>
<key>alias</key> <key>alias</key>
<value></value> <value></value>
...@@ -2982,7 +2978,7 @@ we shift the LO a little further</value> ...@@ -2982,7 +2978,7 @@ we shift the LO a little further</value>
</param> </param>
<param> <param>
<key>output_type</key> <key>output_type</key>
<value>1</value> <value>0</value>
</param> </param>
<param> <param>
<key>prefix_name</key> <key>prefix_name</key>
...@@ -3079,6 +3075,53 @@ we shift the LO a little further</value> ...@@ -3079,6 +3075,53 @@ we shift the LO a little further</value>
<value>audio_samp_rate</value> <value>audio_samp_rate</value>
</param> </param>
</block> </block>
<block>
<key>satnogs_quad_demod_filter_ff</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1476, 434)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>gain</key>
<value>((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)</value>
</param>
<param>
<key>id</key>
<value>satnogs_quad_demod_filter_ff_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>win</key>
<value>80</value>
</param>
</block>
<block> <block>
<key>satnogs_tcp_rigctl_msg_source</key> <key>satnogs_tcp_rigctl_msg_source</key>
<param> <param>
...@@ -3403,7 +3446,7 @@ we shift the LO a little further</value> ...@@ -3403,7 +3446,7 @@ we shift the LO a little further</value>
</connection> </connection>
<connection> <connection>
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id> <source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id> <sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
...@@ -3455,6 +3498,12 @@ we shift the LO a little further</value> ...@@ -3455,6 +3498,12 @@ we shift the LO a little further</value>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id> <source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id> <sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>
......
...@@ -3086,7 +3086,7 @@ max_modulation_freq = 3000</value> ...@@ -3086,7 +3086,7 @@ max_modulation_freq = 3000</value>
</param> </param>
<param> <param>
<key>output_type</key> <key>output_type</key>
<value>1</value> <value>0</value>
</param> </param>
<param> <param>
<key>prefix_name</key> <key>prefix_name</key>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Title: AMSAT FOX DUV Decoder # Title: AMSAT FOX DUV Decoder
# Author: Thanos Giolias (agiolias@csd.uoc.gr), Nikos Karamolegos (karamolegkos.n@gmail.com), Manolis Surligas (surligas@gmail.com) # 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 # Description: A DUV Decoder for the AMSAT FOX satellites
# Generated: Fri Feb 2 11:24:35 2018 # Generated: Sun Mar 25 17:42:58 2018
################################################## ##################################################
from gnuradio import analog from gnuradio import analog
...@@ -68,7 +68,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): ...@@ -68,7 +68,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block):
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(1.2) self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(1.2)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump) self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, 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_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_fox_telem_mm_0 = satnogs.fox_telem_mm() self.satnogs_fox_telem_mm_0 = satnogs.fox_telem_mm()
self.satnogs_decoder_8b10b_0 = satnogs.decoder_8b10b('0011111010', 960) self.satnogs_decoder_8b10b_0 = satnogs.decoder_8b10b('0011111010', 960)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Title: AFSK1200 AX.25 decoder # Title: AFSK1200 AX.25 decoder
# Author: Manolis Surligas (surligas@gmail.com), Vardakis Giorgos (vardakis.grg@gmail.com) # Author: Manolis Surligas (surligas@gmail.com), Vardakis Giorgos (vardakis.grg@gmail.com)
# Description: AFSK1200 AX.25 decoder # Description: AFSK1200 AX.25 decoder
# Generated: Sun Mar 25 16:42:48 2018 # Generated: Sun Mar 25 17:48:06 2018
################################################## ##################################################
from gnuradio import analog from gnuradio import analog
...@@ -73,9 +73,10 @@ class satnogs_afsk1200_ax25(gr.top_block): ...@@ -73,9 +73,10 @@ class satnogs_afsk1200_ax25(gr.top_block):
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1) self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(((audio_samp_rate/10) / baud_rate)/(math.pi*1))
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) 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_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(decoded_data_file_path, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx)
self.satnogs_ax25_decoder_bm_0_0 = satnogs.ax25_decoder_bm('GND', 0, True, True, 1024) self.satnogs_ax25_decoder_bm_0_0 = satnogs.ax25_decoder_bm('GND', 0, True, True, 1024)
self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024) self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024)
...@@ -132,12 +133,13 @@ class satnogs_afsk1200_ax25(gr.top_block): ...@@ -132,12 +133,13 @@ class satnogs_afsk1200_ax25(gr.top_block):
self.connect((self.dc_blocker_xx_0, 0), (self.blocks_float_to_complex_0, 0)) self.connect((self.dc_blocker_xx_0, 0), (self.blocks_float_to_complex_0, 0))
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0)) self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0))
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0_0, 0)) self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0_0, 0))
self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.satnogs_quad_demod_filter_ff_0, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0)) self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
self.connect((self.low_pass_filter_0, 0), (self.analog_quadrature_demod_cf_0_0, 0)) self.connect((self.low_pass_filter_0, 0), (self.analog_quadrature_demod_cf_0_0, 0))
self.connect((self.low_pass_filter_1, 0), (self.analog_quadrature_demod_cf_0, 0)) self.connect((self.low_pass_filter_1, 0), (self.analog_quadrature_demod_cf_0, 0))
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0)) 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)) self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
self.connect((self.satnogs_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self): def get_antenna(self):
return self.antenna return self.antenna
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Title: CW Decoder # Title: CW Decoder
# Author: Manolis Surligas (surligas@gmail.com) # Author: Manolis Surligas (surligas@gmail.com)
# Description: A CW (Morse) Decoder # Description: A CW (Morse) Decoder
# Generated: Fri Feb 23 21:35:24 2018 # Generated: Sun Mar 25 17:48:02 2018
################################################## ##################################################
from gnuradio import analog from gnuradio import analog
...@@ -66,7 +66,7 @@ class satnogs_cw_decoder(gr.top_block): ...@@ -66,7 +66,7 @@ class satnogs_cw_decoder(gr.top_block):
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) 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_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_morse_decoder_0 = satnogs.morse_decoder(ord('#')) self.satnogs_morse_decoder_0 = satnogs.morse_decoder(ord('#'), 3)
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump) self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_cw_to_symbol_0 = satnogs.cw_to_symbol(samp_rate_rx/xlating_decimation/lpf_decimation/4, 0.25, 0.75, wpm) self.satnogs_cw_to_symbol_0 = satnogs.cw_to_symbol(samp_rate_rx/xlating_decimation/lpf_decimation/4, 0.25, 0.75, wpm)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Title: FSK9600 AX.25 decoder # Title: FSK9600 AX.25 decoder
# Author: Manolis Surligas (surligas@gmail.com) # Author: Manolis Surligas (surligas@gmail.com)
# Description: FSK9600 AX.25 decoder # Description: FSK9600 AX.25 decoder
# Generated: Fri Feb 23 21:35:41 2018 # Generated: Sun Mar 25 17:48:11 2018
################################################## ##################################################
from gnuradio import analog from gnuradio import analog
...@@ -70,11 +70,12 @@ class satnogs_fsk9600_ax25(gr.top_block): ...@@ -70,11 +70,12 @@ class satnogs_fsk9600_ax25(gr.top_block):
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1) self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(((audio_samp_rate) / baud_rate)/(math.pi*modulation_index))
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) 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_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(decoded_data_file_path, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) 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.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024)
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) ) self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) )
self.osmosdr_source_0.set_sample_rate(samp_rate_rx) self.osmosdr_source_0.set_sample_rate(samp_rate_rx)
self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0) self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0)
...@@ -115,13 +116,14 @@ class satnogs_fsk9600_ax25(gr.top_block): ...@@ -115,13 +116,14 @@ class satnogs_fsk9600_ax25(gr.top_block):
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0)) self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.dc_blocker_xx_0, 0), (self.low_pass_filter_0, 0)) self.connect((self.dc_blocker_xx_0, 0), (self.low_pass_filter_0, 0))
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0)) self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0))
self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.satnogs_quad_demod_filter_ff_0, 0))
self.connect((self.digital_costas_loop_cc_0, 0), (self.blks2_rational_resampler_xxx_1, 0)) self.connect((self.digital_costas_loop_cc_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.digital_costas_loop_cc_0, 0)) self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.digital_costas_loop_cc_0, 0))
self.connect((self.low_pass_filter_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) self.connect((self.low_pass_filter_0, 0), (self.digital_clock_recovery_mm_xx_0, 0))
self.connect((self.low_pass_filter_0, 0), (self.satnogs_ogg_encoder_0, 0)) self.connect((self.low_pass_filter_0, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0)) 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)) self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
self.connect((self.satnogs_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self): def get_antenna(self):
return self.antenna return self.antenna
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Title: FSK9600 AX.25 decoder with G3RUH support # Title: FSK9600 AX.25 decoder with G3RUH support
# Author: Manolis Surligas (surligas@gmail.com) # Author: Manolis Surligas (surligas@gmail.com)
# Description: FSK9600 AX.25 decoder with G3RUH support # Description: FSK9600 AX.25 decoder with G3RUH support
# Generated: Fri Feb 23 21:35:47 2018 # Generated: Sun Mar 25 17:48:09 2018
################################################## ##################################################
from gnuradio import analog from gnuradio import analog
...@@ -70,11 +70,12 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block): ...@@ -70,11 +70,12 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1) self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(((audio_samp_rate) / baud_rate)/(math.pi*modulation_index))
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) 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_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_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx) 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.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, True, 1024)
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) ) self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) )
self.osmosdr_source_0.set_sample_rate(samp_rate_rx) self.osmosdr_source_0.set_sample_rate(samp_rate_rx)
self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0) self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0)
...@@ -115,13 +116,14 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block): ...@@ -115,13 +116,14 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0)) self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.dc_blocker_xx_0, 0), (self.low_pass_filter_0, 0)) self.connect((self.dc_blocker_xx_0, 0), (self.low_pass_filter_0, 0))
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0)) self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0))
self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.satnogs_quad_demod_filter_ff_0, 0))
self.connect((self.digital_costas_loop_cc_0, 0), (self.blks2_rational_resampler_xxx_1, 0)) self.connect((self.digital_costas_loop_cc_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.digital_costas_loop_cc_0, 0)) self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.digital_costas_loop_cc_0, 0))
self.connect((self.low_pass_filter_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) self.connect((self.low_pass_filter_0, 0), (self.digital_clock_recovery_mm_xx_0, 0))
self.connect((self.low_pass_filter_0, 0), (self.satnogs_ogg_encoder_0, 0)) self.connect((self.low_pass_filter_0, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0)) 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)) self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
self.connect((self.satnogs_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self): def get_antenna(self):
return self.antenna return self.antenna
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment