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

change settings to parameters 

This change sets all of the expected parameters to the g3ruh script. Without it, satnogsclient will send it paremeters that it does not understand, causing it to exit out.
This commit is contained in:
Corey Shields 2017-10-06 16:53:15 -04:00
parent 622965da42
commit 0643660580
2 changed files with 352 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
apps/flowgraphs/fsk9600_g3ruh_ax25.grc
View File

@ -95,7 +95,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(911, 1034)</value>
<value>(1128, 948)</value>
</param>
<param>
<key>_rotation</key>
@ -122,7 +122,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(743, 971)</value>
<value>(960, 884)</value>
</param>
<param>
<key>_rotation</key>
@ -149,7 +149,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(823, 1034)</value>
<value>(1040, 948)</value>
</param>
<param>
<key>_rotation</key>
@ -176,7 +176,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(743, 1034)</value>
<value>(960, 948)</value>
</param>
<param>
<key>_rotation</key>
@ -203,7 +203,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1014, 971)</value>
<value>(1232, 884)</value>
</param>
<param>
<key>_rotation</key>
@ -230,7 +230,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1014, 1034)</value>
<value>(1232, 948)</value>
</param>
<param>
<key>_rotation</key>
@ -258,7 +258,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(743, 843)</value>
<value>(960, 756)</value>
</param>
<param>
<key>_rotation</key>
@ -332,7 +332,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(863, 971)</value>
<value>(1080, 876)</value>
</param>
<param>
<key>_rotation</key>
@ -390,6 +390,92 @@ TX sampling rate</value>
<value>0</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(376, 1116)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>antenna</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>string</value>
</param>
<param>
<key>value</key>
<value></value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(224, 1104)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>bb_gain</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>eng_float</value>
</param>
<param>
<key>value</key>
<value>satnogs.not_set_rx_bb_gain</value>
</param>
</block>
<block>
<key>rational_resampler_xxx</key>
<param>
@ -543,6 +629,49 @@ TX sampling rate</value>
<value>/tmp/.satnogs/data/data</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(744, 992)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>dev_args</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>string</value>
</param>
<param>
<key>value</key>
<value>satnogs.not_set_dev_args</value>
</param>
</block>
<block>
<key>digital_binary_slicer_fb</key>
<param>
@ -755,7 +884,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1110, 843)</value>
<value>(512, 1112)</value>
</param>
<param>
<key>_rotation</key>
@ -798,7 +927,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(743, 755)</value>
<value>(272, 1216)</value>
</param>
<param>
<key>_rotation</key>
@ -884,6 +1013,92 @@ TX sampling rate</value>
<value>ccc</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(144, 1104)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>if_gain</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>eng_float</value>
</param>
<param>
<key>value</key>
<value>satnogs.not_set_rx_if_gain</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(720, 1112)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>iq_file_path</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>string</value>
</param>
<param>
<key>value</key>
<value>/tmp/iq.dat</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
@ -901,7 +1116,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(863, 843)</value>
<value>(432, 1224)</value>
</param>
<param>
<key>_rotation</key>
@ -1011,11 +1226,11 @@ we shift the LO a little further</value>
</param>
<param>
<key>ant0</key>
<value>satnogs.hw_rx_settings[rx_sdr_device]['antenna']</value>
<value>antenna</value>
</param>
<param>
<key>bb_gain0</key>
<value>satnogs.hw_rx_settings[rx_sdr_device]['bb_gain']</value>
<value>bb_gain</value>
</param>
<param>
<key>bw0</key>
@ -1039,7 +1254,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>if_gain0</key>
<value>satnogs.hw_rx_settings[rx_sdr_device]['if_gain']</value>
<value>if_gain</value>
</param>
<param>
<key>iq_balance_mode0</key>
@ -1047,7 +1262,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>gain0</key>
<value>satnogs.hw_rx_settings[rx_sdr_device]['rf_gain']</value>
<value>rf_gain</value>
</param>
<param>
<key>ant10</key>
@ -2299,7 +2514,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>args</key>
<value>satnogs.hw_rx_settings[rx_sdr_device]['dev_arg']</value>
<value>dev_args</value>
</param>
<param>
<key>_enabled</key>
@ -2426,7 +2641,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(975, 755)</value>
<value>(568, 1224)</value>
</param>
<param>
<key>_rotation</key>
@ -2469,7 +2684,50 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1054, 755)</value>
<value>(72, 1104)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>rf_gain</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>eng_float</value>
</param>
<param>
<key>value</key>
<value>satnogs.not_set_rx_rf_gain</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(600, 984)</value>
</param>
<param>
<key>_rotation</key>
@ -2512,7 +2770,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(959, 843)</value>
<value>(464, 992)</value>
</param>
<param>
<key>_rotation</key>
@ -2872,7 +3130,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>filename</key>
<value>/tmp/iq.bin</value>
<value>iq_file_path</value>
</param>
<param>
<key>_coordinate</key>
@ -3068,7 +3326,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(839, 755)</value>
<value>(56, 1216)</value>
</param>
<param>
<key>_rotation</key>

86
apps/flowgraphs/satnogs_fsk9600_g3ruh_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 Sep 24 11:56:08 2017
# Generated: Fri Oct 6 16:51:49 2017
##################################################
from gnuradio import analog
@ -24,7 +24,7 @@ import time
class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
def __init__(self, decoded_data_file_path='/tmp/.satnogs/data/data', doppler_correction_per_sec=1000, enable_iq_dump=0, file_path='test.wav', lo_offset=100e3, ppm=0, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
def __init__(self, decoded_data_file_path='/tmp/.satnogs/data/data', doppler_correction_per_sec=1000, enable_iq_dump=0, file_path='test.wav', lo_offset=100e3, ppm=0, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat', rf_gain=satnogs.not_set_rx_rf_gain, if_gain=satnogs.not_set_rx_if_gain, bb_gain=satnogs.not_set_rx_bb_gain, antenna='', dev_args=satnogs.not_set_dev_args, iq_file_path='/tmp/iq.dat'):
gr.top_block.__init__(self, "FSK9600 AX.25 decoder with G3RUH support")
##################################################
@ -40,6 +40,12 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
self.rx_freq = rx_freq
self.rx_sdr_device = rx_sdr_device
self.waterfall_file_path = waterfall_file_path
self.rf_gain = rf_gain
self.if_gain = if_gain
self.bb_gain = bb_gain
self.antenna = antenna
self.dev_args = dev_args
self.iq_file_path = iq_file_path
##################################################
# Variables
@ -62,24 +68,24 @@ class satnogs_fsk9600_g3ruh_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_iq_sink_0 = satnogs.iq_sink(16768, '/tmp/iq.bin', False, enable_iq_dump)
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.hw_rx_settings[rx_sdr_device]['dev_arg'] )
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + dev_args )
self.osmosdr_source_0.set_sample_rate(samp_rate_rx)
self.osmosdr_source_0.set_center_freq(rx_freq - lo_offset, 0)
self.osmosdr_source_0.set_freq_corr(ppm, 0)
self.osmosdr_source_0.set_dc_offset_mode(2, 0)
self.osmosdr_source_0.set_iq_balance_mode(0, 0)
self.osmosdr_source_0.set_gain_mode(False, 0)
self.osmosdr_source_0.set_gain(satnogs.hw_rx_settings[rx_sdr_device]['rf_gain'], 0)
self.osmosdr_source_0.set_if_gain(satnogs.hw_rx_settings[rx_sdr_device]['if_gain'], 0)
self.osmosdr_source_0.set_bb_gain(satnogs.hw_rx_settings[rx_sdr_device]['bb_gain'], 0)
self.osmosdr_source_0.set_antenna(satnogs.hw_rx_settings[rx_sdr_device]['antenna'], 0)
self.osmosdr_source_0.set_gain(rf_gain, 0)
self.osmosdr_source_0.set_if_gain(if_gain, 0)
self.osmosdr_source_0.set_bb_gain(bb_gain, 0)
self.osmosdr_source_0.set_antenna(antenna, 0)
self.osmosdr_source_0.set_bandwidth(samp_rate_rx, 0)
self.low_pass_filter_0 = filter.fir_filter_fff(1, firdes.low_pass(
@ -178,10 +184,6 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
def set_rx_sdr_device(self, rx_sdr_device):
self.rx_sdr_device = rx_sdr_device
self.set_samp_rate_rx(satnogs.hw_rx_settings[self.rx_sdr_device]['samp_rate'])
self.osmosdr_source_0.set_gain(satnogs.hw_rx_settings[self.rx_sdr_device]['rf_gain'], 0)
self.osmosdr_source_0.set_if_gain(satnogs.hw_rx_settings[self.rx_sdr_device]['if_gain'], 0)
self.osmosdr_source_0.set_bb_gain(satnogs.hw_rx_settings[self.rx_sdr_device]['bb_gain'], 0)
self.osmosdr_source_0.set_antenna(satnogs.hw_rx_settings[self.rx_sdr_device]['antenna'], 0)
self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain'])
def get_waterfall_file_path(self):
@ -190,6 +192,46 @@ class satnogs_fsk9600_g3ruh_ax25(gr.top_block):
def set_waterfall_file_path(self, waterfall_file_path):
self.waterfall_file_path = waterfall_file_path
def get_rf_gain(self):
return self.rf_gain
def set_rf_gain(self, rf_gain):
self.rf_gain = rf_gain
self.osmosdr_source_0.set_gain(self.rf_gain, 0)
def get_if_gain(self):
return self.if_gain
def set_if_gain(self, if_gain):
self.if_gain = if_gain
self.osmosdr_source_0.set_if_gain(self.if_gain, 0)
def get_bb_gain(self):
return self.bb_gain
def set_bb_gain(self, bb_gain):
self.bb_gain = bb_gain
self.osmosdr_source_0.set_bb_gain(self.bb_gain, 0)
def get_antenna(self):
return self.antenna
def set_antenna(self, antenna):
self.antenna = antenna
self.osmosdr_source_0.set_antenna(self.antenna, 0)
def get_dev_args(self):
return self.dev_args
def set_dev_args(self, dev_args):
self.dev_args = dev_args
def get_iq_file_path(self):
return self.iq_file_path
def set_iq_file_path(self, iq_file_path):
self.iq_file_path = iq_file_path
def get_samp_rate_rx(self):
return self.samp_rate_rx
@ -288,6 +330,24 @@ def argument_parser():
parser.add_option(
"", "--waterfall-file-path", dest="waterfall_file_path", type="string", default='/tmp/waterfall.dat',
help="Set waterfall_file_path [default=%default]")
parser.add_option(
"", "--rf-gain", dest="rf_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_rf_gain),
help="Set rf_gain [default=%default]")
parser.add_option(
"", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain),
help="Set if_gain [default=%default]")
parser.add_option(
"", "--bb-gain", dest="bb_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_bb_gain),
help="Set bb_gain [default=%default]")
parser.add_option(
"", "--antenna", dest="antenna", type="string", default='',
help="Set antenna [default=%default]")
parser.add_option(
"", "--dev-args", dest="dev_args", type="string", default=satnogs.not_set_dev_args,
help="Set dev_args [default=%default]")
parser.add_option(
"", "--iq-file-path", dest="iq_file_path", type="string", default='/tmp/iq.dat',
help="Set iq_file_path [default=%default]")
return parser
@ -295,7 +355,7 @@ def main(top_block_cls=satnogs_fsk9600_g3ruh_ax25, options=None):
if options is None:
options, _ = argument_parser().parse_args()
tb = top_block_cls(decoded_data_file_path=options.decoded_data_file_path, doppler_correction_per_sec=options.doppler_correction_per_sec, enable_iq_dump=options.enable_iq_dump, file_path=options.file_path, lo_offset=options.lo_offset, ppm=options.ppm, rigctl_port=options.rigctl_port, rx_freq=options.rx_freq, rx_sdr_device=options.rx_sdr_device, waterfall_file_path=options.waterfall_file_path)
tb = top_block_cls(decoded_data_file_path=options.decoded_data_file_path, doppler_correction_per_sec=options.doppler_correction_per_sec, enable_iq_dump=options.enable_iq_dump, file_path=options.file_path, lo_offset=options.lo_offset, ppm=options.ppm, rigctl_port=options.rigctl_port, rx_freq=options.rx_freq, rx_sdr_device=options.rx_sdr_device, waterfall_file_path=options.waterfall_file_path, rf_gain=options.rf_gain, if_gain=options.if_gain, bb_gain=options.bb_gain, antenna=options.antenna, dev_args=options.dev_args, iq_file_path=options.iq_file_path)
tb.start()
tb.wait()