sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix NOAA issue caused by bad GRC regeneration

This commit is contained in:
Manolis Surligas 2018-02-24 00:19:40 +02:00
parent 05f9e41158
commit 14ad8ad879
4 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
View File

@ -5,7 +5,7 @@
# Title: NOAA APT Decoder # Title: NOAA APT Decoder
# Author: Manolis Surligas, George Vardakis # Author: Manolis Surligas, George Vardakis
# Description: A NOAA APT Decoder with automatic image synchronization # 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 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_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_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_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_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.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( self.rational_resampler_xxx_2 = filter.rational_resampler_ccc(

14
grc/satnogs_block_tree.xml
View File

@ -3,11 +3,15 @@
<cat> <cat>
<name>Satellites</name> <name>Satellites</name>
<cat> <cat>
<name>UPSat</name> <name>NOAA</name>
<block>satnogs_upsat_fsk_frame_acquisition</block> <block>satnogs_noaa_apt_sink</block>
<block>satnogs_upsat_fsk_frame_encoder</block> </cat>
<block>satnogs_upsat_transmitter</block> <cat>
<block>satnogs_qb50_deframer</block> <name>UPSat</name>
<block>satnogs_upsat_fsk_frame_acquisition</block>
<block>satnogs_upsat_fsk_frame_encoder</block>
<block>satnogs_upsat_transmitter</block>
<block>satnogs_qb50_deframer</block>
</cat> </cat>
</cat> </cat>
<block>satnogs_cw_matched_filter_ff</block> <block>satnogs_cw_matched_filter_ff</block>

93
grc/satnogs_noaa_apt_sink.xml
View File

@ -2,55 +2,54 @@
<block> <block>
<name>NOAA APT Sink</name> <name>NOAA APT Sink</name>
<key>satnogs_noaa_apt_sink</key> <key>satnogs_noaa_apt_sink</key>
<category>[SatNOGS]</category>
<import>import satnogs</import> <import>import satnogs</import>
<make>satnogs.noaa_apt_sink($*filename_png, $width, $height, $sync, $flip)</make> <make>satnogs.noaa_apt_sink($filename_png, $width, $height, $sync, $flip)</make>
<param> <param>
<name>Output PNG Filename</name> <name>Output PNG Filename</name>
<key>filename_png</key> <key>filename_png</key>
<value></value> <value></value>
<type>file_save</type> <type>file_save</type>
</param>
<param>
<name>PNG width</name>
<key>width</key>
<value>2080</value>
<type>int</type>
</param>
<param>
<name>PNG height</name>
<key>height</key>
<value>1800</value>
<type>int</type>
</param>
<param>
<name>Synchronize</name>
<key>sync</key>
<value>False</value>
<type>bool</type>
<option>
<name>Yes</name>
<key>True</key>
</option>
<option>
<name>No</name>
<key>False</key>
</option>
</param>
<param>
<name>Flip Image</name>
<key>flip</key>
<value>False</value>
<type>bool</type>
<option>
<name>Yes</name>
<key>True</key>
</option>
<option>
<name>No</name>
<key>False</key>
</option>
</param> </param>
<param>
<name>PNG width</name>
<key>width</key>
<value>2080</value>
<type>int</type>
</param>
<param>
<name>PNG height</name>
<key>height</key>
<value>1500</value>
<type>int</type>
</param>
<param>
<name>Synchronize</name>
<key>sync</key>
<value>False</value>
<type>bool</type>
<option>
<name>Yes</name>
<key>True</key>
</option>
<option>
<name>No</name>
<key>False</key>
</option>
</param>
<param>
<name>Flip Image</name>
<key>flip</key>
<value>False</value>
<type>bool</type>
<option>
<name>Yes</name>
<key>True</key>
</option>
<option>
<name>No</name>
<key>False</key>
</option>
</param>
<sink> <sink>
<name>in</name> <name>in</name>
<type>float</type> <type>float</type>

2
include/satnogs/noaa_apt_sink.h
View File

@ -60,8 +60,6 @@ namespace gr
* @param filename_png the base filename of the output PNG file(s) * @param filename_png the base filename of the output PNG file(s)
* @param width the width of the image in the APT transmission * @param width the width of the image in the APT transmission
* @param height the height 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 * @param sync user option for synchronizing to the first of the
* two training sequences * two training sequences
* @param flip user option to rotate the image(s) 180 degrees * @param flip user option to rotate the image(s) 180 degrees