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

Fix faulty generated flowgraphs 

* Fix faulty generated flowgraphs using old version of gr-soapy
* Disable by default the IQ storage
This commit is contained in:
Manolis Surligas 2019-12-23 17:48:32 +02:00
parent 74055132af
commit cb981074b9
18 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/flowgraphs/afsk1200_ax25.grc
View File

@ -785,7 +785,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/bpsk_ax25.grc
View File

@ -716,7 +716,7 @@ blocks:
- name: satnogs_iq_sink_0_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/cw_decoder.grc
View File

@ -628,7 +628,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/example_flowgraph.grc
View File

@ -391,7 +391,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/fsk_ax25.grc
View File

@ -708,7 +708,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/iq_receiver.grc
View File

@ -310,7 +310,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/satellites/amsat_fox_duv_decoder.grc
View File

@ -526,7 +526,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/satellites/noaa_apt_decoder.grc
View File

@ -451,7 +451,7 @@ blocks:
- name: satnogs_iq_sink_0_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

2
apps/flowgraphs/satellites/reaktor_hello_world_fsk9600_decoder.grc
View File

@ -689,7 +689,7 @@ blocks:
- name: satnogs_iq_sink_0
id: satnogs_iq_sink
parameters:
activate: '1'
activate: enable_iq_dump
affinity: ''
alias: ''
append: 'False'

6
apps/flowgraphs/satellites/satnogs_amsat_fox_duv_decoder.py
View File

@ -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, "custom", f, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32")
else:
self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32")
if 0 != 0:
self.soapy_source_0.set_master_clock_rate(0)
@ -169,7 +169,7 @@ class satnogs_amsat_fox_duv_decoder(gr.top_block):
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_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, 0)
self.satnogs_frame_decoder_0 = satnogs.frame_decoder(variable_amsat_duv_decoder_0, 1 * 1)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, audio_samp_rate, 1)

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

@ -167,7 +167,7 @@ class satnogs_noaa_apt_decoder(gr.top_block):
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, 0.8)
self.satnogs_noaa_apt_sink_1 = satnogs.noaa_apt_sink(decoded_data_file_path, 2080, 1800, True, False)
self.satnogs_iq_sink_0_0 = satnogs.iq_sink(16768, iq_file_path, False, 1)
self.satnogs_iq_sink_0_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, 4*4160*4, 1)
self.rational_resampler_xxx_0_0 = filter.rational_resampler_fff(
interpolation=1,

6
apps/flowgraphs/satellites/satnogs_reaktor_hello_world_fsk9600_decoder.py
View File

@ -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, "custom", f, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32")
else:
self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32")
if 0 != 0:
self.soapy_source_0.set_master_clock_rate(0)
@ -172,7 +172,7 @@ class satnogs_reaktor_hello_world_fsk9600_decoder(gr.top_block):
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_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, 0)
self.satnogs_frame_decoder_0_0 = satnogs.frame_decoder(variable_ieee802_15_4_variant_decoder_0, 1 * 1)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, baudrate*decimation, 1)

6
apps/flowgraphs/satnogs_afsk1200_ax25.py
View File

@ -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, "custom", f, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32")
else:
self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32")
if 0 != 0:
self.soapy_source_0.set_master_clock_rate(0)
@ -174,7 +174,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, 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_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, 0)
self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1)
self.satnogs_frame_decoder_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0, 1 * 1)

6
apps/flowgraphs/satnogs_bpsk_ax25.py
View File

@ -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, "custom", f, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32")
else:
self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32")
if 0 != 0:
self.soapy_source_0.set_master_clock_rate(0)
@ -178,7 +178,7 @@ class satnogs_bpsk_ax25(gr.top_block):
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_iq_sink_0_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, 0)
self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1)
self.satnogs_frame_decoder_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0, 1 * 1)

2
apps/flowgraphs/satnogs_cw_decoder.py
View File

@ -170,7 +170,7 @@ class satnogs_cw_decoder(gr.top_block):
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_morse_decoder_0 = satnogs.morse_decoder(ord('#'), 3)
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1)
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
self.satnogs_frame_file_sink_0_0 = satnogs.frame_file_sink(decoded_data_file_path, 0)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, audio_samp_rate, 1)
self.satnogs_cw_to_symbol_1 = satnogs.cw_to_symbol(audio_samp_rate/10, 2.0, 0.9, wpm, dot_samples//dec)

2
apps/flowgraphs/satnogs_example_flowgraph.py
View File

@ -168,7 +168,7 @@ class satnogs_example_flowgraph(gr.top_block):
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(baudrate*decimation, rx_freq, 10, 1024, waterfall_file_path, 1)
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_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1)
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, audio_samp_rate, 1)
self.dc_blocker_xx_0_0 = filter.dc_blocker_ff(1024, True)
self.analog_quadrature_demod_cf_0_0_0 = analog.quadrature_demod_cf(0.9)

6
apps/flowgraphs/satnogs_fsk_ax25.py
View File

@ -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, "custom", f, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, f, samp_rate_rx, "fc32")
else:
self.soapy_source_0 = soapy.source(1, dev, "custom", dev_args, samp_rate_rx, "fc32")
self.soapy_source_0 = soapy.source(1, dev, dev_args, samp_rate_rx, "fc32")
if 0 != 0:
self.soapy_source_0.set_master_clock_rate(0)
@ -172,7 +172,7 @@ class satnogs_fsk_ax25(gr.top_block):
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_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, 0)
self.satnogs_frame_decoder_0_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0_0, 1 * 1)
self.satnogs_frame_decoder_0_0 = satnogs.frame_decoder(variable_ax25_decoder_0, 1 * 1)

2
apps/flowgraphs/satnogs_iq_receiver.py
View File

@ -154,7 +154,7 @@ class satnogs_iq_receiver(gr.top_block):
self.soapy_source_0.set_gain(0,"RFGR", 9, False )
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(out_samp_rate, rx_freq, 10, 1024, waterfall_file_path, 1)
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_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, 1)
self.satnogs_iq_sink_0 = satnogs.iq_sink(16768, iq_file_path, False, enable_iq_dump)
self.satnogs_doppler_compensation_0 = satnogs.doppler_compensation(samp_rate_rx, rx_freq, lo_offset, out_samp_rate, enable_doppler_correction)