From 14ad8ad879f231f463117166770828e2b00fde8c Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sat, 24 Feb 2018 00:19:40 +0200 Subject: [PATCH] Fix NOAA issue caused by bad GRC regeneration --- .../satellites/satnogs_noaa_apt_decoder.py | 4 +- grc/satnogs_block_tree.xml | 14 ++- grc/satnogs_noaa_apt_sink.xml | 93 +++++++++---------- include/satnogs/noaa_apt_sink.h | 2 - 4 files changed, 57 insertions(+), 56 deletions(-) diff --git a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py index d39eca0..5b8a81b 100755 --- a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py +++ b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py @@ -5,7 +5,7 @@ # Title: NOAA APT Decoder # Author: Manolis Surligas, George Vardakis # Description: A NOAA APT Decoder with automatic image synchronization -# Generated: Thu Feb 8 14:09:41 2018 +# Generated: Sat Feb 24 00:15:33 2018 ################################################## from gnuradio import analog @@ -68,7 +68,7 @@ class satnogs_noaa_apt_decoder(gr.top_block): self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(samp_rate_rx /first_stage_decimation, 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, False, bool(sync), bool(flip_images)) + self.satnogs_noaa_apt_sink_0 = satnogs.noaa_apt_sink(decoded_data_file_path, 2080, 1800, bool(sync), bool(flip_images)) self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump) self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx /first_stage_decimation) self.rational_resampler_xxx_2 = filter.rational_resampler_ccc( diff --git a/grc/satnogs_block_tree.xml b/grc/satnogs_block_tree.xml index bda94dd..c052cee 100644 --- a/grc/satnogs_block_tree.xml +++ b/grc/satnogs_block_tree.xml @@ -3,11 +3,15 @@ Satellites - UPSat - satnogs_upsat_fsk_frame_acquisition - satnogs_upsat_fsk_frame_encoder - satnogs_upsat_transmitter - satnogs_qb50_deframer + NOAA + satnogs_noaa_apt_sink + + + UPSat + satnogs_upsat_fsk_frame_acquisition + satnogs_upsat_fsk_frame_encoder + satnogs_upsat_transmitter + satnogs_qb50_deframer satnogs_cw_matched_filter_ff diff --git a/grc/satnogs_noaa_apt_sink.xml b/grc/satnogs_noaa_apt_sink.xml index 81e7745..661cd7e 100644 --- a/grc/satnogs_noaa_apt_sink.xml +++ b/grc/satnogs_noaa_apt_sink.xml @@ -2,55 +2,54 @@ NOAA APT Sink satnogs_noaa_apt_sink - [SatNOGS] import satnogs - satnogs.noaa_apt_sink($*filename_png, $width, $height, $sync, $flip) - - Output PNG Filename - filename_png - - file_save + satnogs.noaa_apt_sink($filename_png, $width, $height, $sync, $flip) + + Output PNG Filename + filename_png + + file_save + + + PNG width + width + 2080 + int + + + PNG height + height + 1800 + int + + + Synchronize + sync + False + bool + + + + + Flip Image + flip + False + bool + + - - PNG width - width - 2080 - int - - - PNG height - height - 1500 - int - - - Synchronize - sync - False - bool - - - - - Flip Image - flip - False - bool - - - in float diff --git a/include/satnogs/noaa_apt_sink.h b/include/satnogs/noaa_apt_sink.h index 779d083..e3cacdc 100644 --- a/include/satnogs/noaa_apt_sink.h +++ b/include/satnogs/noaa_apt_sink.h @@ -60,8 +60,6 @@ namespace gr * @param filename_png the base filename of the output PNG file(s) * @param width the width of the image in the APT transmission * @param height the height of the image in the APT transmission - * @param split user option for splitting the two images contained - * in a NOAA APT transmission * @param sync user option for synchronizing to the first of the * two training sequences * @param flip user option to rotate the image(s) 180 degrees