diff --git a/apps/flowgraphs/satellites/noaa_apt_decoder.grc b/apps/flowgraphs/satellites/noaa_apt_decoder.grc
index 0dded8c..f89f833 100644
--- a/apps/flowgraphs/satellites/noaa_apt_decoder.grc
+++ b/apps/flowgraphs/satellites/noaa_apt_decoder.grc
@@ -94,7 +94,7 @@ the quadrature demodulation
_coordinate
- (927, 459)
+ (904, 492)
_rotation
@@ -124,7 +124,7 @@ in acceptable levels especially for embedded devices.
_coordinate
- (1306, 460)
+ (1272, 492)
_rotation
@@ -159,7 +159,7 @@ in acceptable levels especially for embedded devices.
_coordinate
- (16, 689)
+ (168, 564)
_rotation
@@ -199,7 +199,7 @@ the quadrature demodulation
_coordinate
- (1118, 459)
+ (1088, 492)
_rotation
@@ -234,7 +234,7 @@ the quadrature demodulation
_coordinate
- (15, 551)
+ (8, 564)
_rotation
@@ -274,7 +274,7 @@ TX sampling rate
_coordinate
- (791, 459)
+ (784, 492)
_rotation
@@ -313,7 +313,7 @@ TX sampling rate
_coordinate
- (935, 123)
+ (696, 164)
_rotation
@@ -352,7 +352,7 @@ TX sampling rate
_coordinate
- (494, 634)
+ (1200, 628)
_rotation
@@ -411,7 +411,7 @@ TX sampling rate
_coordinate
- (1174, 83)
+ (912, 116)
_rotation
@@ -474,7 +474,7 @@ TX sampling rate
_coordinate
- (414, 634)
+ (1120, 628)
_rotation
@@ -521,7 +521,7 @@ TX sampling rate
_coordinate
- (1040, 360)
+ (880, 392)
_rotation
@@ -560,7 +560,7 @@ TX sampling rate
_coordinate
- (183, 547)
+ (576, 628)
_rotation
@@ -603,7 +603,7 @@ TX sampling rate
_coordinate
- (183, 634)
+ (880, 628)
_rotation
@@ -646,7 +646,7 @@ TX sampling rate
_coordinate
- (15, 459)
+ (8, 476)
_rotation
@@ -689,7 +689,7 @@ TX sampling rate
_coordinate
- (184, 796)
+ (464, 628)
_rotation
@@ -740,7 +740,7 @@ TX sampling rate
_coordinate
- (710, 171)
+ (496, 164)
_rotation
@@ -791,7 +791,7 @@ TX sampling rate
_coordinate
- (183, 714)
+ (344, 628)
_rotation
@@ -842,7 +842,7 @@ TX sampling rate
_coordinate
- (1422, 123)
+ (1096, 164)
_rotation
@@ -889,7 +889,7 @@ TX sampling rate
_coordinate
- (312, 716)
+ (1360, 628)
_rotation
@@ -944,7 +944,7 @@ TX sampling rate
_coordinate
- (295, 295)
+ (248, 324)
_rotation
@@ -999,7 +999,7 @@ TX sampling rate
_coordinate
- (1264, 356)
+ (1040, 388)
_rotation
@@ -1042,7 +1042,7 @@ TX sampling rate
_coordinate
- (343, 634)
+ (1040, 628)
_rotation
@@ -1085,7 +1085,7 @@ TX sampling rate
_coordinate
- (296, 796)
+ (1448, 628)
_rotation
@@ -1129,7 +1129,7 @@ we shift the LO a little further
_coordinate
- (575, 459)
+ (568, 476)
_rotation
@@ -2460,7 +2460,7 @@ we shift the LO a little further
_coordinate
- (31, 223)
+ (8, 244)
_rotation
@@ -2579,7 +2579,7 @@ we shift the LO a little further
_coordinate
- (487, 459)
+ (480, 476)
_rotation
@@ -2634,7 +2634,7 @@ we shift the LO a little further
_coordinate
- (1438, 239)
+ (1184, 364)
_rotation
@@ -2693,7 +2693,7 @@ we shift the LO a little further
_coordinate
- (824, 336)
+ (696, 364)
_rotation
@@ -2752,7 +2752,7 @@ we shift the LO a little further
_coordinate
- (1172, 0)
+ (912, 20)
_rotation
@@ -2811,7 +2811,7 @@ we shift the LO a little further
_coordinate
- (936, 232)
+ (696, 268)
_rotation
@@ -2858,7 +2858,7 @@ we shift the LO a little further
_coordinate
- (271, 634)
+ (960, 628)
_rotation
@@ -2901,7 +2901,7 @@ we shift the LO a little further
_coordinate
- (295, 459)
+ (288, 476)
_rotation
@@ -2944,7 +2944,7 @@ we shift the LO a little further
_coordinate
- (391, 459)
+ (384, 476)
_rotation
@@ -2987,7 +2987,7 @@ we shift the LO a little further
_coordinate
- (175, 459)
+ (168, 476)
_rotation
@@ -3034,7 +3034,7 @@ we shift the LO a little further
_coordinate
- (464, 176)
+ (272, 168)
_rotation
@@ -3089,7 +3089,7 @@ we shift the LO a little further
_coordinate
- (1176, 236)
+ (880, 276)
_rotation
@@ -3132,7 +3132,7 @@ we shift the LO a little further
_coordinate
- (520, 320)
+ (472, 356)
_rotation
@@ -3154,10 +3154,6 @@ we shift the LO a little further
width
2080
-
- split
- False
-
sync
bool(sync)
@@ -3187,7 +3183,7 @@ we shift the LO a little further
_coordinate
- (1420, 3)
+ (1096, 28)
_rotation
@@ -3226,7 +3222,7 @@ we shift the LO a little further
_coordinate
- (223, 47)
+ (8, 132)
_rotation
@@ -3297,7 +3293,7 @@ we shift the LO a little further
_coordinate
- (712, 0)
+ (696, 20)
_rotation
@@ -3317,7 +3313,7 @@ we shift the LO a little further
samp_rate
- samp_rate_rx /first_stage_decimation
+ samp_rate_rx/ ( first_stage_decimation * int(samp_rate_rx/ first_stage_decimation / initial_bandwidth))
@@ -3336,7 +3332,7 @@ we shift the LO a little further
_coordinate
- (400, 716)
+ (1280, 628)
_rotation
@@ -3379,7 +3375,7 @@ we shift the LO a little further
_coordinate
- (335, 546)
+ (736, 628)
_rotation
@@ -3442,6 +3438,12 @@ we shift the LO a little further
0
0
+
+ fft_filter_xxx_0
+ satnogs_waterfall_sink_0
+ 0
+ 0
+
fir_filter_xxx_1
rational_resampler_xxx_0
@@ -3496,12 +3498,6 @@ we shift the LO a little further
0
0
-
- satnogs_coarse_doppler_correction_cc_0
- satnogs_waterfall_sink_0
- 0
- 0
-
satnogs_tcp_rigctl_msg_source_0
satnogs_coarse_doppler_correction_cc_0
diff --git a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
index 5b8a81b..71dd2c4 100755
--- a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
+++ b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
@@ -5,9 +5,10 @@
# Title: NOAA APT Decoder
# Author: Manolis Surligas, George Vardakis
# Description: A NOAA APT Decoder with automatic image synchronization
-# Generated: Sat Feb 24 00:15:33 2018
+# Generated: Wed Jul 4 10:18:17 2018
##################################################
+
from gnuradio import analog
from gnuradio import blocks
from gnuradio import eng_notation
@@ -65,7 +66,7 @@ class satnogs_noaa_apt_decoder(gr.top_block):
##################################################
# Blocks
##################################################
- self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(samp_rate_rx /first_stage_decimation, 0.0, 8, 1024, waterfall_file_path, 0)
+ self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(samp_rate_rx/ ( first_stage_decimation * int(samp_rate_rx/ first_stage_decimation / initial_bandwidth)), 0.0, 8, 1024, waterfall_file_path, 0)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, 48000, 0.8)
self.satnogs_noaa_apt_sink_0 = satnogs.noaa_apt_sink(decoded_data_file_path, 2080, 1800, bool(sync), bool(flip_images))
@@ -132,6 +133,7 @@ class satnogs_noaa_apt_decoder(gr.top_block):
self.connect((self.blocks_complex_to_mag_0, 0), (self.rational_resampler_xxx_0_0, 0))
self.connect((self.fft_filter_xxx_0, 0), (self.analog_wfm_rcv_0, 0))
self.connect((self.fft_filter_xxx_0, 0), (self.rational_resampler_xxx_2, 0))
+ self.connect((self.fft_filter_xxx_0, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.fir_filter_xxx_1, 0), (self.rational_resampler_xxx_0, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0))
self.connect((self.hilbert_fc_0, 0), (self.blocks_complex_to_mag_0, 0))
@@ -141,7 +143,6 @@ class satnogs_noaa_apt_decoder(gr.top_block):
self.connect((self.rational_resampler_xxx_1, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.rational_resampler_xxx_2, 0), (self.satnogs_iq_sink_0, 0))
self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.fft_filter_xxx_0, 0))
- self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.satnogs_waterfall_sink_0, 0))
def get_antenna(self):
return self.antenna