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

Add frame file sink blocks

This commit is contained in:
Manolis Surligas 2017-07-30 19:37:01 +03:00
parent 7b8ef57d37
commit 1a785b68ca
3 changed files with 121 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/CMakeLists.txt
View File

@ -29,5 +29,6 @@ GR_PYTHON_INSTALL(
flowgraphs/satnogs_generic_iq_receiver.py
flowgraphs/satnogs_bpsk_demod.py
flowgraphs/satnogs_apt_demod.py
flowgraphs/satnogs_fsk9600_ax25.py
DESTINATION bin
)

124
apps/flowgraphs/fsk9600_ax25.grc
View File

@ -2607,7 +2607,7 @@ we shift the LO a little further</value>
</param>
</block>
<block>
<key>satnogs_multi_format_msg_sink</key>
<key>satnogs_frame_file_sink</key>
<param>
<key>alias</key>
<value></value>
@ -2626,7 +2626,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1030, 579)</value>
<value>(1126, 555)</value>
</param>
<param>
<key>_rotation</key>
@ -2634,15 +2634,19 @@ we shift the LO a little further</value>
</param>
<param>
<key>id</key>
<value>satnogs_multi_format_msg_sink_0</value>
<value>satnogs_frame_file_sink_0</value>
</param>
<param>
<key>format</key>
<value>1</value>
<key>output_type</key>
<value>0</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/fsk9600_crc_failed</value>
</param>
</block>
<block>
<key>satnogs_multi_format_msg_sink</key>
<key>satnogs_frame_file_sink</key>
<param>
<key>alias</key>
<value></value>
@ -2661,7 +2665,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1030, 631)</value>
<value>(1126, 619)</value>
</param>
<param>
<key>_rotation</key>
@ -2669,12 +2673,94 @@ we shift the LO a little further</value>
</param>
<param>
<key>id</key>
<value>satnogs_multi_format_msg_sink_0_0</value>
<value>satnogs_frame_file_sink_0_0</value>
</param>
<param>
<key>format</key>
<key>output_type</key>
<value>0</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/fsk9600_crc_ok</value>
</param>
</block>
<block>
<key>satnogs_frame_file_sink</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1126, 683)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0_1</value>
</param>
<param>
<key>output_type</key>
<value>1</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/fsk9600_crc_failed</value>
</param>
</block>
<block>
<key>satnogs_frame_file_sink</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1142, 747)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0_1_0</value>
</param>
<param>
<key>output_type</key>
<value>1</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/fsk9600_crc_ok</value>
</param>
</block>
<block>
<key>satnogs_ogg_encoder</key>
@ -2944,15 +3030,27 @@ we shift the LO a little further</value>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_multi_format_msg_sink_0</sink_block_id>
<sink_block_id>satnogs_frame_file_sink_0</sink_block_id>
<source_key>failed_pdu</source_key>
<sink_key>in</sink_key>
<sink_key>frame</sink_key>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_multi_format_msg_sink_0_0</sink_block_id>
<sink_block_id>satnogs_frame_file_sink_0_1</sink_block_id>
<source_key>failed_pdu</source_key>
<sink_key>frame</sink_key>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_frame_file_sink_0_0</sink_block_id>
<source_key>pdu</source_key>
<sink_key>in</sink_key>
<sink_key>frame</sink_key>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_frame_file_sink_0_1_0</sink_block_id>
<source_key>pdu</source_key>
<sink_key>frame</sink_key>
</connection>
<connection>
<source_block_id>satnogs_coarse_doppler_correction_cc_0</source_block_id>

14
apps/flowgraphs/satnogs_fsk9600_ax25.py
View File

@ -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: Sun Jul 30 00:21:32 2017
# Generated: Sun Jul 30 19:43:50 2017
##################################################
from gnuradio import analog
@ -61,8 +61,10 @@ class satnogs_fsk9600_ax25(gr.top_block):
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 8, 1024, waterfall_file_path, 1)
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_multi_format_msg_sink_0_0 = satnogs.multi_format_msg_sink(1)
self.satnogs_multi_format_msg_sink_0 = satnogs.multi_format_msg_sink(1)
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_ok', 1)
self.satnogs_frame_file_sink_0_1 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 1)
self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_ok', 0)
self.satnogs_frame_file_sink_0 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 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.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.hw_rx_settings[rx_sdr_device]['dev_arg'] )
@ -97,8 +99,10 @@ class satnogs_fsk9600_ax25(gr.top_block):
##################################################
# Connections
##################################################
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_multi_format_msg_sink_0, 'in'))
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_multi_format_msg_sink_0_0, 'in'))
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0, 'frame'))
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_0, 'frame'))
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'failed_pdu'), (self.satnogs_frame_file_sink_0_1, 'frame'))
self.msg_connect((self.satnogs_ax25_decoder_bm_0, 'pdu'), (self.satnogs_frame_file_sink_0_1_0, 'frame'))
self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq'))
self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.dc_blocker_xx_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.analog_quadrature_demod_cf_0_0, 0))