Commit b358d1b4 authored by Manolis Surligas's avatar Manolis Surligas

Merge branch 'only-hex-data' into 'master'

Remove .txt decoded frames files

See merge request !123
parents 73d68a71 3cc611c6
......@@ -3256,7 +3256,7 @@ max_modulation_freq = 3000</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/afsk1200_crc_ok</value>
<value>decoded_data_file_path</value>
</param>
</block>
<block>
......
......@@ -2970,124 +2970,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1126, 555)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0</value>
</param>
<param>
<key>output_type</key>
<value>0</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>(1126, 619)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0_0</value>
</param>
<param>
<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>
<value>(1136, 588)</value>
</param>
<param>
<key>_rotation</key>
......@@ -3103,7 +2986,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>prefix_name</key>
<value>/tmp/fsk9600_crc_ok</value>
<value>decoded_data_file_path</value>
</param>
</block>
<block>
......@@ -3302,7 +3185,7 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>
......@@ -3425,24 +3308,6 @@ we shift the LO a little further</value>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_frame_file_sink_0</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_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>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>
......
......@@ -2970,124 +2970,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1126, 555)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0</value>
</param>
<param>
<key>output_type</key>
<value>0</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>(960, 620)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_frame_file_sink_0_0</value>
</param>
<param>
<key>output_type</key>
<value>0</value>
</param>
<param>
<key>prefix_name</key>
<value>decoded_data_file_path</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>(1248, 764)</value>
<value>(1176, 604)</value>
</param>
<param>
<key>_rotation</key>
......@@ -3302,7 +3185,7 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>
......@@ -3425,24 +3308,6 @@ we shift the LO a little further</value>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>satnogs_ax25_decoder_bm_0</source_block_id>
<sink_block_id>satnogs_frame_file_sink_0</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_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>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>
......
......@@ -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 Nov 26 22:43:03 2017
# Generated: Sat Dec 9 19:39:06 2017
##################################################
from gnuradio import analog
......@@ -72,7 +72,7 @@ class satnogs_afsk1200_ax25(gr.top_block):
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_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('/tmp/afsk1200_crc_ok', 1)
self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 1)
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, 1)
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) )
......
This diff is collapsed.
......@@ -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: Wed Nov 1 13:04:00 2017
# Generated: Sat Dec 9 19:37:01 2017
##################################################
from gnuradio import analog
......@@ -70,9 +70,6 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
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 = satnogs.frame_file_sink('/tmp/fsk9600_crc_failed', 1)
self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 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.handle_rx_dev_args(rx_sdr_device, dev_args) )
......@@ -106,9 +103,6 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
##################################################
# Connections
##################################################
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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment