From 74055132af0e7c9ae2a9ce17d4120ce2a052c699 Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sat, 21 Dec 2019 17:08:36 +0200 Subject: [PATCH] Use the new JSON format for the decoded frames --- apps/flowgraphs/afsk1200_ax25.grc | 28 +++++++++++++++---- apps/flowgraphs/bpsk_ax25.grc | 28 +++++++++++++++---- apps/flowgraphs/fsk_ax25.grc | 28 +++++++++++++++---- .../satellites/amsat_fox_duv_decoder.grc | 25 ++++++++++++++--- .../reaktor_hello_world_fsk9600_decoder.grc | 25 ++++++++++++++--- .../satnogs_amsat_fox_duv_decoder.py | 10 ++++--- ...ogs_reaktor_hello_world_fsk9600_decoder.py | 10 ++++--- apps/flowgraphs/satnogs_afsk1200_ax25.py | 13 +++++---- apps/flowgraphs/satnogs_bpsk_ax25.py | 13 +++++---- apps/flowgraphs/satnogs_fsk_ax25.py | 13 +++++---- 10 files changed, 141 insertions(+), 52 deletions(-) diff --git a/apps/flowgraphs/afsk1200_ax25.grc b/apps/flowgraphs/afsk1200_ax25.grc index 2ff79d5..da86b80 100644 --- a/apps/flowgraphs/afsk1200_ax25.grc +++ b/apps/flowgraphs/afsk1200_ax25.grc @@ -779,7 +779,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1168, 948.0] + coordinate: [1264, 948.0] rotation: 0 state: enabled - name: satnogs_iq_sink_0 @@ -799,6 +799,22 @@ blocks: coordinate: [32, 564.0] rotation: 180 state: enabled +- name: satnogs_json_converter_0 + id: satnogs_json_converter + parameters: + affinity: '' + alias: '' + comment: '' + extra: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1064, 924.0] + rotation: 0 + state: true - name: satnogs_ogg_encoder_0 id: satnogs_ogg_encoder parameters: @@ -848,7 +864,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1168, 860.0] + coordinate: [1264, 860.0] rotation: 0 state: enabled - name: satnogs_waterfall_sink_0 @@ -1069,10 +1085,10 @@ connections: - [low_pass_filter_1, '0', analog_quadrature_demod_cf_0, '0'] - [low_pass_filter_2_0, '0', digital_clock_recovery_mm_xx_0, '0'] - [satnogs_doppler_compensation_0, '0', virtual_sink_0, '0'] -- [satnogs_frame_decoder_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0, out, satnogs_udp_msg_sink_0_0, in] -- [satnogs_frame_decoder_0_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0_0, out, satnogs_udp_msg_sink_0_0, in] +- [satnogs_frame_decoder_0_0, out, satnogs_json_converter_0, in] +- [satnogs_frame_decoder_0_0_0, out, satnogs_json_converter_0, in] +- [satnogs_json_converter_0, out, satnogs_frame_file_sink_0_1_0, frame] +- [satnogs_json_converter_0, out, satnogs_udp_msg_sink_0_0, in] - [satnogs_tcp_rigctl_msg_source_0, freq, satnogs_doppler_compensation_0, doppler] - [soapy_source_0, '0', satnogs_doppler_compensation_0, '0'] - [virtual_source_0, '0', blocks_delay_0, '0'] diff --git a/apps/flowgraphs/bpsk_ax25.grc b/apps/flowgraphs/bpsk_ax25.grc index 83f127a..1f4119b 100644 --- a/apps/flowgraphs/bpsk_ax25.grc +++ b/apps/flowgraphs/bpsk_ax25.grc @@ -710,7 +710,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1592, 612.0] + coordinate: [1720, 612.0] rotation: 0 state: enabled - name: satnogs_iq_sink_0_0 @@ -730,6 +730,22 @@ blocks: coordinate: [16, 508.0] rotation: 180 state: enabled +- name: satnogs_json_converter_0 + id: satnogs_json_converter + parameters: + affinity: '' + alias: '' + comment: '' + extra: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1536, 660.0] + rotation: 0 + state: true - name: satnogs_ogg_encoder_0 id: satnogs_ogg_encoder parameters: @@ -779,7 +795,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1592, 684.0] + coordinate: [1720, 676.0] rotation: 0 state: enabled - name: satnogs_waterfall_sink_0_0 @@ -975,10 +991,10 @@ connections: - [low_pass_filter_0_0, '0', blocks_rotator_cc_0_0, '0'] - [pfb_arb_resampler_xxx_0, '0', analog_agc2_xx_0_0, '0'] - [satnogs_doppler_compensation_0, '0', virtual_sink_0, '0'] -- [satnogs_frame_decoder_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0, out, satnogs_udp_msg_sink_0_0, in] -- [satnogs_frame_decoder_0_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0_0, out, satnogs_udp_msg_sink_0_0, in] +- [satnogs_frame_decoder_0_0, out, satnogs_json_converter_0, in] +- [satnogs_frame_decoder_0_0_0, out, satnogs_json_converter_0, in] +- [satnogs_json_converter_0, out, satnogs_frame_file_sink_0_1_0, frame] +- [satnogs_json_converter_0, out, satnogs_udp_msg_sink_0_0, in] - [satnogs_tcp_rigctl_msg_source_0, freq, satnogs_doppler_compensation_0, doppler] - [soapy_source_0, '0', satnogs_doppler_compensation_0, '0'] - [virtual_source_0, '0', analog_agc2_xx_0, '0'] diff --git a/apps/flowgraphs/fsk_ax25.grc b/apps/flowgraphs/fsk_ax25.grc index ed54e94..9cc9dff 100644 --- a/apps/flowgraphs/fsk_ax25.grc +++ b/apps/flowgraphs/fsk_ax25.grc @@ -702,7 +702,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [888, 716.0] + coordinate: [816, 716.0] rotation: 180 state: enabled - name: satnogs_iq_sink_0 @@ -722,6 +722,22 @@ blocks: coordinate: [40, 508.0] rotation: 180 state: enabled +- name: satnogs_json_converter_0 + id: satnogs_json_converter + parameters: + affinity: '' + alias: '' + comment: '' + extra: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1040, 684.0] + rotation: 180 + state: true - name: satnogs_ogg_encoder_0 id: satnogs_ogg_encoder parameters: @@ -771,7 +787,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [885, 634] + coordinate: [816, 636.0] rotation: 180 state: enabled - name: satnogs_waterfall_sink_0 @@ -971,10 +987,10 @@ connections: - [low_pass_filter_1, '0', dc_blocker_xx_0, '0'] - [pfb_arb_resampler_xxx_1, '0', dc_blocker_xx_0_0, '0'] - [satnogs_doppler_compensation_0, '0', virtual_sink_0, '0'] -- [satnogs_frame_decoder_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0, out, satnogs_udp_msg_sink_0_0, in] -- [satnogs_frame_decoder_0_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0_0, out, satnogs_udp_msg_sink_0_0, in] +- [satnogs_frame_decoder_0_0, out, satnogs_json_converter_0, in] +- [satnogs_frame_decoder_0_0_0, out, satnogs_json_converter_0, in] +- [satnogs_json_converter_0, out, satnogs_frame_file_sink_0_1_0, frame] +- [satnogs_json_converter_0, out, satnogs_udp_msg_sink_0_0, in] - [satnogs_tcp_rigctl_msg_source_0, freq, satnogs_doppler_compensation_0, doppler] - [soapy_source_0, '0', satnogs_doppler_compensation_0, '0'] - [virtual_source_0, '0', analog_quadrature_demod_cf_0_0_0, '0'] diff --git a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc index 800843e..c1c28f9 100644 --- a/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc +++ b/apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc @@ -520,7 +520,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1160, 676.0] + coordinate: [1000, 676.0] rotation: 180 state: enabled - name: satnogs_iq_sink_0 @@ -540,6 +540,22 @@ blocks: coordinate: [48, 628.0] rotation: 180 state: enabled +- name: satnogs_json_converter_0 + id: satnogs_json_converter + parameters: + affinity: '' + alias: '' + comment: '' + extra: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1216, 684.0] + rotation: 180 + state: true - name: satnogs_ogg_encoder_0 id: satnogs_ogg_encoder parameters: @@ -589,7 +605,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1160, 740.0] + coordinate: [1024, 740.0] rotation: 180 state: enabled - name: satnogs_waterfall_sink_0 @@ -782,8 +798,9 @@ connections: - [low_pass_filter_1, '0', dc_blocker_xx_0, '0'] - [root_raised_cosine_filter_0, '0', digital_clock_recovery_mm_xx_0_0_0, '0'] - [satnogs_doppler_compensation_0, '0', virtual_sink_0, '0'] -- [satnogs_frame_decoder_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0, out, satnogs_udp_msg_sink_0_0, in] +- [satnogs_frame_decoder_0, out, satnogs_json_converter_0, in] +- [satnogs_json_converter_0, out, satnogs_frame_file_sink_0_1_0, frame] +- [satnogs_json_converter_0, out, satnogs_udp_msg_sink_0_0, in] - [satnogs_tcp_rigctl_msg_source_0, freq, satnogs_doppler_compensation_0, doppler] - [soapy_source_0, '0', satnogs_doppler_compensation_0, '0'] - [virtual_source_0, '0', low_pass_filter_0, '0'] diff --git a/apps/flowgraphs/satellites/reaktor_hello_world_fsk9600_decoder.grc b/apps/flowgraphs/satellites/reaktor_hello_world_fsk9600_decoder.grc index 199be77..4c214b9 100644 --- a/apps/flowgraphs/satellites/reaktor_hello_world_fsk9600_decoder.grc +++ b/apps/flowgraphs/satellites/reaktor_hello_world_fsk9600_decoder.grc @@ -683,7 +683,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [664, 660.0] + coordinate: [496, 660.0] rotation: 180 state: enabled - name: satnogs_iq_sink_0 @@ -703,6 +703,22 @@ blocks: coordinate: [24, 508.0] rotation: 180 state: enabled +- name: satnogs_json_converter_0 + id: satnogs_json_converter + parameters: + affinity: '' + alias: '' + comment: '' + extra: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [720, 692.0] + rotation: 180 + state: true - name: satnogs_ogg_encoder_0 id: satnogs_ogg_encoder parameters: @@ -752,7 +768,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [688, 732.0] + coordinate: [520, 724.0] rotation: 180 state: enabled - name: satnogs_waterfall_sink_0 @@ -951,8 +967,9 @@ connections: - [low_pass_filter_1, '0', dc_blocker_xx_0, '0'] - [pfb_arb_resampler_xxx_1, '0', dc_blocker_xx_0_0, '0'] - [satnogs_doppler_compensation_0, '0', virtual_sink_0, '0'] -- [satnogs_frame_decoder_0_0, out, satnogs_frame_file_sink_0_1_0, frame] -- [satnogs_frame_decoder_0_0, out, satnogs_udp_msg_sink_0_0, in] +- [satnogs_frame_decoder_0_0, out, satnogs_json_converter_0, in] +- [satnogs_json_converter_0, out, satnogs_frame_file_sink_0_1_0, frame] +- [satnogs_json_converter_0, out, satnogs_udp_msg_sink_0_0, in] - [satnogs_tcp_rigctl_msg_source_0, freq, satnogs_doppler_compensation_0, doppler] - [soapy_source_0, '0', satnogs_doppler_compensation_0, '0'] - [virtual_source_0, '0', analog_quadrature_demod_cf_0_0_0, '0'] diff --git a/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py b/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py index c5b923f..c1c7ee6 100755 --- a/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py +++ b/apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py @@ -71,9 +71,9 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): f = f.replace('\"', '') f = f.replace("\\'", '') f = f.strip(',') - self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", f, samp_rate_rx, "fc32") else: - self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32") if 0 != 0: self.soapy_source_0.set_master_clock_rate(0) @@ -168,6 +168,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, int(1000.0/doppler_correction_per_sec) + 1, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) + self.satnogs_json_converter_0 = satnogs.json_converter() self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_decoder_0 = satnogs.frame_decoder(variable_amsat_duv_decoder_0, 1 * 1) @@ -209,8 +210,9 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_frame_decoder_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_doppler_compensation_0, 'doppler')) self.connect((self.analog_quadrature_demod_cf_0, 0), (self.satnogs_ogg_encoder_0, 0)) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.low_pass_filter_1, 0)) diff --git a/apps/flowgraphs/satellites/satnogs_reaktor_hello_world_fsk9600_decoder.py b/apps/flowgraphs/satellites/satnogs_reaktor_hello_world_fsk9600_decoder.py index 2406fc2..ad0cd1b 100755 --- a/apps/flowgraphs/satellites/satnogs_reaktor_hello_world_fsk9600_decoder.py +++ b/apps/flowgraphs/satellites/satnogs_reaktor_hello_world_fsk9600_decoder.py @@ -74,9 +74,9 @@ class satnogs_reaktor_hello_world_fsk9600_decoder(gr.top_block): f = f.replace('\"', '') f = f.replace("\\'", '') f = f.strip(',') - self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", f, samp_rate_rx, "fc32") else: - self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32") if 0 != 0: self.soapy_source_0.set_master_clock_rate(0) @@ -171,6 +171,7 @@ class satnogs_reaktor_hello_world_fsk9600_decoder(gr.top_block): self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, int(1000.0/doppler_correction_per_sec) + 1, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) + self.satnogs_json_converter_0 = satnogs.json_converter() self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_decoder_0_0 = satnogs.frame_decoder(variable_ieee802_15_4_variant_decoder_0, 1 * 1) @@ -215,8 +216,9 @@ class satnogs_reaktor_hello_world_fsk9600_decoder(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_doppler_compensation_0, 'doppler')) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.dc_blocker_xx_0, 0)) self.connect((self.analog_quadrature_demod_cf_0_0_0, 0), (self.pfb_arb_resampler_xxx_1, 0)) diff --git a/apps/flowgraphs/satnogs_afsk1200_ax25.py b/apps/flowgraphs/satnogs_afsk1200_ax25.py index 0415953..c53ca15 100755 --- a/apps/flowgraphs/satnogs_afsk1200_ax25.py +++ b/apps/flowgraphs/satnogs_afsk1200_ax25.py @@ -76,9 +76,9 @@ class satnogs_afsk1200_ax25(gr.top_block): f = f.replace('\"', '') f = f.replace("\\'", '') f = f.strip(',') - self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", f, samp_rate_rx, "fc32") else: - self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32") if 0 != 0: self.soapy_source_0.set_master_clock_rate(0) @@ -173,6 +173,7 @@ class satnogs_afsk1200_ax25(gr.top_block): self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, int(1000.0/doppler_correction_per_sec) + 1, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) + self.satnogs_json_converter_0 = satnogs.json_converter() self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1) @@ -243,10 +244,10 @@ class satnogs_afsk1200_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_doppler_compensation_0, 'doppler')) self.connect((self.analog_quadrature_demod_cf_0, 0), (self.dc_blocker_xx_0_0, 0)) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.band_pass_filter_0, 0)) diff --git a/apps/flowgraphs/satnogs_bpsk_ax25.py b/apps/flowgraphs/satnogs_bpsk_ax25.py index 9d39aca..6d03dbe 100755 --- a/apps/flowgraphs/satnogs_bpsk_ax25.py +++ b/apps/flowgraphs/satnogs_bpsk_ax25.py @@ -80,9 +80,9 @@ class satnogs_bpsk_ax25(gr.top_block): f = f.replace('\"', '') f = f.replace("\\'", '') f = f.strip(',') - self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", f, samp_rate_rx, "fc32") else: - self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32") if 0 != 0: self.soapy_source_0.set_master_clock_rate(0) @@ -177,6 +177,7 @@ class satnogs_bpsk_ax25(gr.top_block): self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, int(1000.0/doppler_correction_per_sec) + 1, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) + self.satnogs_json_converter_0 = satnogs.json_converter() self.satnogs_iq_sink_0_0 = satnogs.iq_sink(16768, iq_file_path, False, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1) @@ -220,10 +221,10 @@ class satnogs_bpsk_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_doppler_compensation_0, 'doppler')) self.connect((self.analog_agc2_xx_0, 0), (self.low_pass_filter_0, 0)) self.connect((self.analog_agc2_xx_0, 0), (self.pfb_arb_resampler_xxx_0, 0)) diff --git a/apps/flowgraphs/satnogs_fsk_ax25.py b/apps/flowgraphs/satnogs_fsk_ax25.py index 31fab74..5aff636 100755 --- a/apps/flowgraphs/satnogs_fsk_ax25.py +++ b/apps/flowgraphs/satnogs_fsk_ax25.py @@ -74,9 +74,9 @@ class satnogs_fsk_ax25(gr.top_block): f = f.replace('\"', '') f = f.replace("\\'", '') f = f.strip(',') - self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", f, samp_rate_rx, "fc32") else: - self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32") + self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32") if 0 != 0: self.soapy_source_0.set_master_clock_rate(0) @@ -171,6 +171,7 @@ class satnogs_fsk_ax25(gr.top_block): self.satnogs_udp_msg_sink_0_0 = satnogs.udp_msg_sink(udp_IP, udp_port, 1500) self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, int(1000.0/doppler_correction_per_sec) + 1, 1500) self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0) + self.satnogs_json_converter_0 = satnogs.json_converter() self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1) self.satnogs_frame_file_sink_0_1_0 = satnogs.frame_file_sink(decoded_data_file_path, 0) self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1) @@ -216,10 +217,10 @@ class satnogs_fsk_ax25(gr.top_block): ################################################## # Connections ################################################## - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) - self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_frame_decoder_0_0_0, 'out'), (self.satnogs_json_converter_0, 'in')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_frame_file_sink_0_1_0, 'frame')) + self.msg_connect((self.satnogs_json_converter_0, 'out'), (self.satnogs_udp_msg_sink_0_0, 'in')) self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_doppler_compensation_0, 'doppler')) self.connect((self.analog_quadrature_demod_cf_0_0, 0), (self.dc_blocker_xx_0, 0)) self.connect((self.analog_quadrature_demod_cf_0_0_0, 0), (self.pfb_arb_resampler_xxx_1, 0))