Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #495 from DJ2LS/ls-modem

Browse source 
fix error where stopping the modem wasnt possible
This commit is contained in:
DJ2LS 2023-10-23 21:05:48 +02:00 committed by GitHub
commit 3bcb21326c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gui/src/js/sock.js
View file

@ -46,7 +46,7 @@ function connectModem() {
client.on("connect", function () { client.on("connect", function () {
console.log("Modem connection established"); console.log("Modem connection established");
stateStore.modem_running_state = "running";
stateStore.busy_state = "-"; stateStore.busy_state = "-";
stateStore.arq_state = "-"; stateStore.arq_state = "-";
stateStore.frequency = "-"; stateStore.frequency = "-";
@ -63,7 +63,9 @@ client.on("error", function (err) {
console.log("Modem connection error"); console.log("Modem connection error");
console.log(err); console.log(err);
modemShowConnectStateError = 0; modemShowConnectStateError = 0;
stateStore.modem_running_state = "stopped";
} }
setTimeout(connectModem, 500); setTimeout(connectModem, 500);
client.destroy(); client.destroy();
stateStore.busy_state = "-"; stateStore.busy_state = "-";
@ -93,6 +95,7 @@ client.on("end", function (data) {
stateStore.dbfs_level = 0; stateStore.dbfs_level = 0;
stateStore.updateTncState(client.readyState); stateStore.updateTncState(client.readyState);
client.destroy(); client.destroy();
stateStore.modem_running_state = "stopped";
setTimeout(connectModem, 500); setTimeout(connectModem, 500);
}); });

4
modem/sock.py
View file

@ -1128,12 +1128,12 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
def daemon_stop_modem(self, received_json): def daemon_stop_modem(self, received_json):
try: try:
log.warning("[SCK] Stopping Modem")
Daemon.modemstarted = False
Daemon.modemprocess.kill() Daemon.modemprocess.kill()
# unregister process from atexit to avoid process zombies # unregister process from atexit to avoid process zombies
atexit.unregister(Daemon.modemprocess.kill) atexit.unregister(Daemon.modemprocess.kill)
log.warning("[SCK] Stopping Modem")
Daemon.modemstarted = False
command_response("stop_modem", True) command_response("stop_modem", True)
except Exception as err: except Exception as err:
command_response("stop_modem", False) command_response("stop_modem", False)