diff --git a/gui/src/js/sock.js b/gui/src/js/sock.js index 643d886a..50836600 100644 --- a/gui/src/js/sock.js +++ b/gui/src/js/sock.js @@ -173,8 +173,8 @@ client.on("data", function (socketdata) { stateStore.arq_state = data["arq_state"]; stateStore.mode = data["mode"]; stateStore.bandwidth = data["bandwidth"]; - stateStore.tx_audio_level = data["audio_level"]; - stateStore.rx_audio_level = data["audio_level"]; + stateStore.tx_audio_level = data["tx_audio_level"]; + stateStore.rx_audio_level = data["rx_audio_level"]; // if audio level is different from config one, send new audio level to modem //console.log(parseInt(stateStore.tx_audio_level)) //console.log(parseInt(settings.tx_audio_level)) diff --git a/modem/config.py b/modem/config.py index 6d746013..cce08deb 100644 --- a/modem/config.py +++ b/modem/config.py @@ -58,7 +58,7 @@ class CONFIG: 'rx': data[3], 'tx': data[4], 'txaudiolevel': data[14], - 'rxaudiolevel': data[26], + 'rxaudiolevel': data[25], 'auto_tune': data[19] } @@ -79,7 +79,7 @@ class CONFIG: 'stats': data[19], 'fsk': data[13], 'tx_delay': data[21], - 'transmit_morse_identifier' : data[25] + 'transmit_morse_identifier' : data[26] } self.config['TCI'] = {'#TCI settings': None, 'ip': data[22], diff --git a/modem/daemon.py b/modem/daemon.py index c6aec992..c24769e5 100755 --- a/modem/daemon.py +++ b/modem/daemon.py @@ -212,7 +212,7 @@ class DAEMON: data[13] hamlib_rigctld_ip, data[14] hamlib_rigctld_path, data[15] hamlib_rigctld_server_port, - data[16] hamlib_rigctld_custom_args + data[16] hamlib_rigctld_custom_args """ self.start_rigctld(data) @@ -417,11 +417,8 @@ class DAEMON: except Exception as err: self.log.warning("[DMN] err starting rigctld: ", e=err) - - def start_modem(self, data): self.log.warning("[DMN] Starting Modem", rig=data[5], port=data[6]) - # list of parameters, necessary for running subprocess command as a list options = ["--port", str(DAEMON.port - 1)] @@ -492,17 +489,18 @@ class DAEMON: options.append(data[21]) #Mesh - print(data[24]) if data[24] == "True": options.append("--mesh") - #Morse identifier - print(data[25]) - if data[25] == "True": - options.append("--morse") + options.append("--rx-audio-level") - options.append(data[26]) + options.append(data[25]) + + #Morse identifier + if data[26] == "True": + options.append("--morse") + # safe data to config file config.write_entire_config(data) diff --git a/modem/sock.py b/modem/sock.py index d00b4cbb..17a56418 100644 --- a/modem/sock.py +++ b/modem/sock.py @@ -1096,7 +1096,8 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler): low_bandwidth_mode = str(helpers.return_key_from_object("False", startparam, "low_bandwidth_mode")) tuning_range_fmin = str(helpers.return_key_from_object("-50", startparam, "tuning_range_fmin")) tuning_range_fmax = str(helpers.return_key_from_object("50", startparam, "tuning_range_fmax")) - tx_audio_level = str(helpers.return_key_from_object("100", startparam, "tx_audio_level")) + tx_audio_level = str(helpers.return_key_from_object("0", startparam, "tx_audio_level")) + rx_audio_level = str(helpers.return_key_from_object("0", startparam, "rx_audio_level")) respond_to_cq = str(helpers.return_key_from_object("False", startparam, "respond_to_cq")) rx_buffer_size = str(helpers.return_key_from_object("16", startparam, "rx_buffer_size")) enable_explorer = str(helpers.return_key_from_object("False", startparam, "enable_explorer")) @@ -1149,7 +1150,8 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler): tx_delay, tci_ip, tci_port, - enable_mesh + enable_mesh, + rx_audio_level, ] ) command_response("start_modem", True) @@ -1363,7 +1365,8 @@ def send_modem_state(): "rf_level": str(HamlibParam.hamlib_rf), "strength": str(HamlibParam.hamlib_strength), "alc": str(HamlibParam.alc), - "audio_level": str(AudioParam.tx_audio_level), + "tx_audio_level": str(AudioParam.tx_audio_level), + "rx_audio_level": str(AudioParam.tx_audio_level), "audio_auto_tune": str(AudioParam.audio_auto_tune), "speed_level": str(ARQ.arq_speed_level), "mode": str(HamlibParam.hamlib_mode),