Skip to content

Commit 3d1c9fd

Browse files
surligassurligas
committed
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
1 parent b2105b1 commit 3d1c9fd

10 files changed

+194
-33
lines changed

‎apps/flowgraphs/afsk1200_ax25.grc

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ RX sampling rate</value>
892892
</param>
893893
<param>
894894
<key>_coordinate</key>
895-
<value>(1771, 582)</value>
895+
<value>(2034, 606)</value>
896896
</param>
897897
<param>
898898
<key>_rotation</key>
@@ -3307,7 +3307,7 @@ max_modulation_freq = 3000</value>
33073307
</param>
33083308
<param>
33093309
<key>output_type</key>
3310-
<value>1</value>
3310+
<value>0</value>
33113311
</param>
33123312
<param>
33133313
<key>prefix_name</key>
@@ -3404,6 +3404,53 @@ max_modulation_freq = 3000</value>
34043404
<value>audio_samp_rate</value>
34053405
</param>
34063406
</block>
3407+
<block>
3408+
<key>satnogs_quad_demod_filter_ff</key>
3409+
<param>
3410+
<key>alias</key>
3411+
<value></value>
3412+
</param>
3413+
<param>
3414+
<key>comment</key>
3415+
<value></value>
3416+
</param>
3417+
<param>
3418+
<key>affinity</key>
3419+
<value></value>
3420+
</param>
3421+
<param>
3422+
<key>_enabled</key>
3423+
<value>True</value>
3424+
</param>
3425+
<param>
3426+
<key>_coordinate</key>
3427+
<value>(1795, 578)</value>
3428+
</param>
3429+
<param>
3430+
<key>_rotation</key>
3431+
<value>0</value>
3432+
</param>
3433+
<param>
3434+
<key>gain</key>
3435+
<value>((audio_samp_rate/10) / baud_rate)/(math.pi*1)</value>
3436+
</param>
3437+
<param>
3438+
<key>id</key>
3439+
<value>satnogs_quad_demod_filter_ff_0</value>
3440+
</param>
3441+
<param>
3442+
<key>maxoutbuf</key>
3443+
<value>0</value>
3444+
</param>
3445+
<param>
3446+
<key>minoutbuf</key>
3447+
<value>0</value>
3448+
</param>
3449+
<param>
3450+
<key>win</key>
3451+
<value>80</value>
3452+
</param>
3453+
</block>
34073454
<block>
34083455
<key>satnogs_tcp_rigctl_msg_source</key>
34093456
<param>
@@ -3807,7 +3854,7 @@ max_modulation_freq = 3000</value>
38073854
</connection>
38083855
<connection>
38093856
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
3810-
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3857+
<sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
38113858
<source_key>0</source_key>
38123859
<sink_key>0</sink_key>
38133860
</connection>
@@ -3865,6 +3912,12 @@ max_modulation_freq = 3000</value>
38653912
<source_key>0</source_key>
38663913
<sink_key>0</sink_key>
38673914
</connection>
3915+
<connection>
3916+
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
3917+
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3918+
<source_key>0</source_key>
3919+
<sink_key>0</sink_key>
3920+
</connection>
38683921
<connection>
38693922
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
38703923
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>

‎apps/flowgraphs/cw_decoder.grc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2963,6 +2963,10 @@ we shift the LO a little further</value>
29632963
<key>minoutbuf</key>
29642964
<value>0</value>
29652965
</param>
2966+
<param>
2967+
<key>min_frame_len</key>
2968+
<value>3</value>
2969+
</param>
29662970
<param>
29672971
<key>unrecognized_char</key>
29682972
<value>ord('#')</value>

‎apps/flowgraphs/fsk9600_ax25.grc

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ TX sampling rate</value>
692692
</param>
693693
<param>
694694
<key>_coordinate</key>
695-
<value>(1526, 439)</value>
695+
<value>(1675, 446)</value>
696696
</param>
697697
<param>
698698
<key>_rotation</key>
@@ -2842,10 +2842,6 @@ we shift the LO a little further</value>
28422842
</block>
28432843
<block>
28442844
<key>satnogs_ax25_decoder_bm</key>
2845-
<param>
2846-
<key>n_sync_flags</key>
2847-
<value>3</value>
2848-
</param>
28492845
<param>
28502846
<key>alias</key>
28512847
<value></value>
@@ -2982,7 +2978,7 @@ we shift the LO a little further</value>
29822978
</param>
29832979
<param>
29842980
<key>output_type</key>
2985-
<value>1</value>
2981+
<value>0</value>
29862982
</param>
29872983
<param>
29882984
<key>prefix_name</key>
@@ -3079,6 +3075,53 @@ we shift the LO a little further</value>
30793075
<value>audio_samp_rate</value>
30803076
</param>
30813077
</block>
3078+
<block>
3079+
<key>satnogs_quad_demod_filter_ff</key>
3080+
<param>
3081+
<key>alias</key>
3082+
<value></value>
3083+
</param>
3084+
<param>
3085+
<key>comment</key>
3086+
<value></value>
3087+
</param>
3088+
<param>
3089+
<key>affinity</key>
3090+
<value></value>
3091+
</param>
3092+
<param>
3093+
<key>_enabled</key>
3094+
<value>True</value>
3095+
</param>
3096+
<param>
3097+
<key>_coordinate</key>
3098+
<value>(1460, 434)</value>
3099+
</param>
3100+
<param>
3101+
<key>_rotation</key>
3102+
<value>0</value>
3103+
</param>
3104+
<param>
3105+
<key>gain</key>
3106+
<value>((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)</value>
3107+
</param>
3108+
<param>
3109+
<key>id</key>
3110+
<value>satnogs_quad_demod_filter_ff_0</value>
3111+
</param>
3112+
<param>
3113+
<key>maxoutbuf</key>
3114+
<value>0</value>
3115+
</param>
3116+
<param>
3117+
<key>minoutbuf</key>
3118+
<value>0</value>
3119+
</param>
3120+
<param>
3121+
<key>win</key>
3122+
<value>80</value>
3123+
</param>
3124+
</block>
30823125
<block>
30833126
<key>satnogs_tcp_rigctl_msg_source</key>
30843127
<param>
@@ -3403,7 +3446,7 @@ we shift the LO a little further</value>
34033446
</connection>
34043447
<connection>
34053448
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
3406-
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3449+
<sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
34073450
<source_key>0</source_key>
34083451
<sink_key>0</sink_key>
34093452
</connection>
@@ -3455,6 +3498,12 @@ we shift the LO a little further</value>
34553498
<source_key>0</source_key>
34563499
<sink_key>0</sink_key>
34573500
</connection>
3501+
<connection>
3502+
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
3503+
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3504+
<source_key>0</source_key>
3505+
<sink_key>0</sink_key>
3506+
</connection>
34583507
<connection>
34593508
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
34603509
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>

‎apps/flowgraphs/fsk9600_g3ruh_ax25.grc

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ TX sampling rate</value>
692692
</param>
693693
<param>
694694
<key>_coordinate</key>
695-
<value>(1568, 464)</value>
695+
<value>(1723, 446)</value>
696696
</param>
697697
<param>
698698
<key>_rotation</key>
@@ -2842,10 +2842,6 @@ we shift the LO a little further</value>
28422842
</block>
28432843
<block>
28442844
<key>satnogs_ax25_decoder_bm</key>
2845-
<param>
2846-
<key>n_sync_flags</key>
2847-
<value>3</value>
2848-
</param>
28492845
<param>
28502846
<key>alias</key>
28512847
<value></value>
@@ -2982,7 +2978,7 @@ we shift the LO a little further</value>
29822978
</param>
29832979
<param>
29842980
<key>output_type</key>
2985-
<value>1</value>
2981+
<value>0</value>
29862982
</param>
29872983
<param>
29882984
<key>prefix_name</key>
@@ -3079,6 +3075,53 @@ we shift the LO a little further</value>
30793075
<value>audio_samp_rate</value>
30803076
</param>
30813077
</block>
3078+
<block>
3079+
<key>satnogs_quad_demod_filter_ff</key>
3080+
<param>
3081+
<key>alias</key>
3082+
<value></value>
3083+
</param>
3084+
<param>
3085+
<key>comment</key>
3086+
<value></value>
3087+
</param>
3088+
<param>
3089+
<key>affinity</key>
3090+
<value></value>
3091+
</param>
3092+
<param>
3093+
<key>_enabled</key>
3094+
<value>True</value>
3095+
</param>
3096+
<param>
3097+
<key>_coordinate</key>
3098+
<value>(1476, 434)</value>
3099+
</param>
3100+
<param>
3101+
<key>_rotation</key>
3102+
<value>0</value>
3103+
</param>
3104+
<param>
3105+
<key>gain</key>
3106+
<value>((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)</value>
3107+
</param>
3108+
<param>
3109+
<key>id</key>
3110+
<value>satnogs_quad_demod_filter_ff_0</value>
3111+
</param>
3112+
<param>
3113+
<key>maxoutbuf</key>
3114+
<value>0</value>
3115+
</param>
3116+
<param>
3117+
<key>minoutbuf</key>
3118+
<value>0</value>
3119+
</param>
3120+
<param>
3121+
<key>win</key>
3122+
<value>80</value>
3123+
</param>
3124+
</block>
30823125
<block>
30833126
<key>satnogs_tcp_rigctl_msg_source</key>
30843127
<param>
@@ -3403,7 +3446,7 @@ we shift the LO a little further</value>
34033446
</connection>
34043447
<connection>
34053448
<source_block_id>digital_clock_recovery_mm_xx_0</source_block_id>
3406-
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3449+
<sink_block_id>satnogs_quad_demod_filter_ff_0</sink_block_id>
34073450
<source_key>0</source_key>
34083451
<sink_key>0</sink_key>
34093452
</connection>
@@ -3455,6 +3498,12 @@ we shift the LO a little further</value>
34553498
<source_key>0</source_key>
34563499
<sink_key>0</sink_key>
34573500
</connection>
3501+
<connection>
3502+
<source_block_id>satnogs_quad_demod_filter_ff_0</source_block_id>
3503+
<sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
3504+
<source_key>0</source_key>
3505+
<sink_key>0</sink_key>
3506+
</connection>
34583507
<connection>
34593508
<source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
34603509
<sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>

‎apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3086,7 +3086,7 @@ max_modulation_freq = 3000</value>
30863086
</param>
30873087
<param>
30883088
<key>output_type</key>
3089-
<value>1</value>
3089+
<value>0</value>
30903090
</param>
30913091
<param>
30923092
<key>prefix_name</key>

‎apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Title: AMSAT FOX DUV Decoder
66
# Author: Thanos Giolias ([email protected]), Nikos Karamolegos ([email protected]), Manolis Surligas ([email protected])
77
# Description: A DUV Decoder for the AMSAT FOX satellites
8-
# Generated: Fri Feb 2 11:24:35 2018
8+
# Generated: Sun Mar 25 17:42:58 2018
99
##################################################
1010

1111
from gnuradio import analog
@@ -68,7 +68,7 @@ def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_b
6868
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(1.2)
6969
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
7070
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
71-
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1)
71+
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
7272
self.satnogs_fox_telem_mm_0 = satnogs.fox_telem_mm()
7373
self.satnogs_decoder_8b10b_0 = satnogs.decoder_8b10b('0011111010', 960)
7474

‎apps/flowgraphs/satnogs_afsk1200_ax25.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Title: AFSK1200 AX.25 decoder
66
# Author: Manolis Surligas ([email protected]), Vardakis Giorgos ([email protected])
77
# Description: AFSK1200 AX.25 decoder
8-
# Generated: Sun Mar 25 16:42:48 2018
8+
# Generated: Sun Mar 25 17:48:06 2018
99
##################################################
1010

1111
from gnuradio import analog
@@ -73,9 +73,10 @@ def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_b
7373
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
7474
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
7575
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
76+
self.satnogs_quad_demod_filter_ff_0 = satnogs.quad_demod_filter_ff(((audio_samp_rate/10) / baud_rate)/(math.pi*1))
7677
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
7778
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, '/tmp/iq.bin', False, enable_iq_dump)
78-
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1)
79+
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
7980
self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx)
8081
self.satnogs_ax25_decoder_bm_0_0 = satnogs.ax25_decoder_bm('GND', 0, True, True, 1024)
8182
self.satnogs_ax25_decoder_bm_0 = satnogs.ax25_decoder_bm('GND', 0, True, False, 1024)
@@ -132,12 +133,13 @@ def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_b
132133
self.connect((self.dc_blocker_xx_0, 0), (self.blocks_float_to_complex_0, 0))
133134
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0, 0))
134135
self.connect((self.digital_binary_slicer_fb_0, 0), (self.satnogs_ax25_decoder_bm_0_0, 0))
135-
self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0))
136+
self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.satnogs_quad_demod_filter_ff_0, 0))
136137
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
137138
self.connect((self.low_pass_filter_0, 0), (self.analog_quadrature_demod_cf_0_0, 0))
138139
self.connect((self.low_pass_filter_1, 0), (self.analog_quadrature_demod_cf_0, 0))
139140
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0))
140141
self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
142+
self.connect((self.satnogs_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
141143

142144
def get_antenna(self):
143145
return self.antenna

‎apps/flowgraphs/satnogs_cw_decoder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Title: CW Decoder
66
# Author: Manolis Surligas ([email protected])
77
# Description: A CW (Morse) Decoder
8-
# Generated: Fri Feb 23 21:35:24 2018
8+
# Generated: Sun Mar 25 17:48:02 2018
99
##################################################
1010

1111
from gnuradio import analog
@@ -66,7 +66,7 @@ def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_b
6666
self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500)
6767
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
6868
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
69-
self.satnogs_morse_decoder_0 = satnogs.morse_decoder(ord('#'))
69+
self.satnogs_morse_decoder_0 = satnogs.morse_decoder(ord('#'), 3)
7070
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
7171
self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
7272
self.satnogs_cw_to_symbol_0 = satnogs.cw_to_symbol(samp_rate_rx/xlating_decimation/lpf_decimation/4, 0.25, 0.75, wpm)

0 commit comments

Comments
 (0)