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 Packages Projects Releases Wiki Activity

ARQ WIP - Timeout adjustments and added state to logging for debugging...

Browse source
This commit is contained in:
DJ2LS 2023-12-24 09:58:20 +01:00
parent 137ac189fc
commit 2db37adf21
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/src/js/eventHandler.js
View file

@ -23,7 +23,7 @@ export function connectionFailed(endpoint, event) {
}
export function stateDispatcher(data) {
data = JSON.parse(data);
//console.log(data);
console.log(data);
stateStore.modem_connection = "connected";

2
modem/arq_session.py
View file

@ -48,7 +48,7 @@ class ARQSession():
self.final = False # class wide final state for stopping transmissions on command
def log(self, message, isWarning = False):
msg = f"[{type(self).__name__}]: {message}"
msg = f"[{type(self).__name__}][{self.state}]: {message}"
logger = self.logger.warn if isWarning else self.logger.info
logger(msg)

19
modem/arq_session_iss.py
View file

@ -20,8 +20,11 @@ class ISS_State(Enum):
class ARQSessionISS(arq_session.ARQSession):
RETRIES_CONNECT = 10
TIMEOUT_CONNECT_ACK = 3
TIMEOUT_TRANSFER = 3
# DJ2LS: 3 seconds seems to be too small for radios with a too slow PTT toggle time
# DJ2LS: 3.5 seconds is working well WITHOUT a channel busy detection delay
TIMEOUT_CONNECT_ACK = 3.5
TIMEOUT_TRANSFER = 3.5
STATE_TRANSITION = {
ISS_State.OPEN_SENT: {
@ -108,10 +111,10 @@ class ARQSessionISS(arq_session.ARQSession):
if irs_frame["flag"]["FINAL"]:
if self.confirmed_bytes == len(self.data) and irs_frame["flag"]["CHECKSUM"]:
self.transmission_ended()
self.transmission_ended(irs_frame)
return
else:
self.transmission_failed()
self.transmission_failed(irs_frame)
return
payload_size = self.get_data_payload_size()
@ -126,14 +129,14 @@ class ARQSessionISS(arq_session.ARQSession):
self.launch_twr(burst, self.TIMEOUT_TRANSFER, self.RETRIES_CONNECT, mode='auto')
self.set_state(ISS_State.BURST_SENT)
def transmission_ended(self):
def transmission_ended(self, irs_frame):
self.set_state(ISS_State.ENDED)
self.log("All data transfered!")
self.log(f"All data transfered! flag_final={irs_frame['flag']['FINAL']}, flag_checksum={irs_frame['flag']['CHECKSUM']}")
self.event_manager.send_arq_session_finished(True, self.id, self.dxcall, len(self.data),True)
def transmission_failed(self):
def transmission_failed(self, irs_frame):
self.set_state(ISS_State.FAILED)
self.log("Transmission failed!")
self.log(f"Transmission failed! flag_final={irs_frame['flag']['FINAL']}, flag_checksum={irs_frame['flag']['CHECKSUM']}")
self.event_manager.send_arq_session_finished(True, self.id, self.dxcall, len(self.data),False)
def stop_transmission(self):