diff --git a/apps/flowgraphs/afsk1200_ax25.grc b/apps/flowgraphs/afsk1200_ax25.grc
index 8c73232..614fffb 100644
--- a/apps/flowgraphs/afsk1200_ax25.grc
+++ b/apps/flowgraphs/afsk1200_ax25.grc
@@ -892,7 +892,7 @@ RX sampling rate
_coordinate
- (1771, 582)
+ (2034, 606)
_rotation
@@ -3307,7 +3307,7 @@ max_modulation_freq = 3000
output_type
- 1
+ 0
prefix_name
@@ -3404,6 +3404,53 @@ max_modulation_freq = 3000
audio_samp_rate
+
+ satnogs_quad_demod_filter_ff
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (1795, 578)
+
+
+ _rotation
+ 0
+
+
+ gain
+ ((audio_samp_rate/10) / baud_rate)/(math.pi*1)
+
+
+ id
+ satnogs_quad_demod_filter_ff_0
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
+ win
+ 80
+
+
satnogs_tcp_rigctl_msg_source
@@ -3807,7 +3854,7 @@ max_modulation_freq = 3000
digital_clock_recovery_mm_xx_0
- digital_binary_slicer_fb_0
+ satnogs_quad_demod_filter_ff_0
0
0
@@ -3865,6 +3912,12 @@ max_modulation_freq = 3000
0
0
+
+ satnogs_quad_demod_filter_ff_0
+ digital_binary_slicer_fb_0
+ 0
+ 0
+
satnogs_tcp_rigctl_msg_source_0
satnogs_coarse_doppler_correction_cc_0
diff --git a/apps/flowgraphs/cw_decoder.grc b/apps/flowgraphs/cw_decoder.grc
index b7845b7..c1cb1b4 100644
--- a/apps/flowgraphs/cw_decoder.grc
+++ b/apps/flowgraphs/cw_decoder.grc
@@ -2963,6 +2963,10 @@ we shift the LO a little further
minoutbuf
0
+
+ min_frame_len
+ 3
+
unrecognized_char
ord('#')
diff --git a/apps/flowgraphs/fsk9600_ax25.grc b/apps/flowgraphs/fsk9600_ax25.grc
index 098cb79..df20380 100644
--- a/apps/flowgraphs/fsk9600_ax25.grc
+++ b/apps/flowgraphs/fsk9600_ax25.grc
@@ -692,7 +692,7 @@ TX sampling rate
_coordinate
- (1526, 439)
+ (1675, 446)
_rotation
@@ -2842,10 +2842,6 @@ we shift the LO a little further
satnogs_ax25_decoder_bm
-
- n_sync_flags
- 3
-
alias
@@ -2982,7 +2978,7 @@ we shift the LO a little further
output_type
- 1
+ 0
prefix_name
@@ -3079,6 +3075,53 @@ we shift the LO a little further
audio_samp_rate
+
+ satnogs_quad_demod_filter_ff
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (1460, 434)
+
+
+ _rotation
+ 0
+
+
+ gain
+ ((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)
+
+
+ id
+ satnogs_quad_demod_filter_ff_0
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
+ win
+ 80
+
+
satnogs_tcp_rigctl_msg_source
@@ -3403,7 +3446,7 @@ we shift the LO a little further
digital_clock_recovery_mm_xx_0
- digital_binary_slicer_fb_0
+ satnogs_quad_demod_filter_ff_0
0
0
@@ -3455,6 +3498,12 @@ we shift the LO a little further
0
0
+
+ satnogs_quad_demod_filter_ff_0
+ digital_binary_slicer_fb_0
+ 0
+ 0
+
satnogs_tcp_rigctl_msg_source_0
satnogs_coarse_doppler_correction_cc_0
diff --git a/apps/flowgraphs/fsk9600_g3ruh_ax25.grc b/apps/flowgraphs/fsk9600_g3ruh_ax25.grc
index 99bfadd..9c78d80 100644
--- a/apps/flowgraphs/fsk9600_g3ruh_ax25.grc
+++ b/apps/flowgraphs/fsk9600_g3ruh_ax25.grc
@@ -692,7 +692,7 @@ TX sampling rate
_coordinate
- (1568, 464)
+ (1723, 446)
_rotation
@@ -2842,10 +2842,6 @@ we shift the LO a little further
satnogs_ax25_decoder_bm
-
- n_sync_flags
- 3
-
alias
@@ -2982,7 +2978,7 @@ we shift the LO a little further
output_type
- 1
+ 0
prefix_name
@@ -3079,6 +3075,53 @@ we shift the LO a little further
audio_samp_rate
+
+ satnogs_quad_demod_filter_ff
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (1476, 434)
+
+
+ _rotation
+ 0
+
+
+ gain
+ ((audio_samp_rate) / baud_rate)/(math.pi*modulation_index)
+
+
+ id
+ satnogs_quad_demod_filter_ff_0
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
+ win
+ 80
+
+
satnogs_tcp_rigctl_msg_source
@@ -3403,7 +3446,7 @@ we shift the LO a little further
digital_clock_recovery_mm_xx_0
- digital_binary_slicer_fb_0
+ satnogs_quad_demod_filter_ff_0
0
0
@@ -3455,6 +3498,12 @@ we shift the LO a little further
0
0
+
+ satnogs_quad_demod_filter_ff_0
+ digital_binary_slicer_fb_0
+ 0
+ 0
+
satnogs_tcp_rigctl_msg_source_0
satnogs_coarse_doppler_correction_cc_0
diff --git a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc
index 7f847eb..efe43a3 100644
--- a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc
+++ b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc
@@ -3086,7 +3086,7 @@ max_modulation_freq = 3000
output_type
- 1
+ 0
prefix_name
diff --git a/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py b/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py
index bff4f5f..e4c12e4 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: Fri Feb 2 11:24:35 2018
+# Generated: Sun Mar 25 17:42:58 2018
##################################################
from gnuradio import analog
@@ -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_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_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_decoder_8b10b_0 = satnogs.decoder_8b10b('0011111010', 960)
diff --git a/apps/flowgraphs/satnogs_afsk1200_ax25.py b/apps/flowgraphs/satnogs_afsk1200_ax25.py
index d5e4de1..6115c30 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 Mar 25 16:42:48 2018
+# Generated: Sun Mar 25 17:48:06 2018
##################################################
from gnuradio import analog
@@ -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_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_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_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_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)
@@ -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.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_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.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.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_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self):
return self.antenna
diff --git a/apps/flowgraphs/satnogs_cw_decoder.py b/apps/flowgraphs/satnogs_cw_decoder.py
index 3d11a05..eaf3346 100755
--- a/apps/flowgraphs/satnogs_cw_decoder.py
+++ b/apps/flowgraphs/satnogs_cw_decoder.py
@@ -5,7 +5,7 @@
# Title: CW Decoder
# Author: Manolis Surligas (surligas@gmail.com)
# 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
@@ -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_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_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_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)
diff --git a/apps/flowgraphs/satnogs_fsk9600_ax25.py b/apps/flowgraphs/satnogs_fsk9600_ax25.py
index 4c214ed..c9d952d 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: Fri Feb 23 21:35:41 2018
+# Generated: Sun Mar 25 17:48:11 2018
##################################################
from gnuradio import analog
@@ -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_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_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_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_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.set_sample_rate(samp_rate_rx)
self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0)
@@ -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.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_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.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.satnogs_ogg_encoder_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_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self):
return self.antenna
diff --git a/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py b/apps/flowgraphs/satnogs_fsk9600_g3ruh_ax25.py
index bd70d13..794a67f 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: Fri Feb 23 21:35:47 2018
+# Generated: Sun Mar 25 17:48:09 2018
##################################################
from gnuradio import analog
@@ -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_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_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_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_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.set_sample_rate(samp_rate_rx)
self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0)
@@ -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.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_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.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.satnogs_ogg_encoder_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_quad_demod_filter_ff_0, 0), (self.digital_binary_slicer_fb_0, 0))
def get_antenna(self):
return self.antenna