From 12d1010da9f3e790db896da4c576a2ed9b40cb4d Mon Sep 17 00:00:00 2001 From: Mashintime Date: Mon, 12 Feb 2024 16:17:24 -0500 Subject: [PATCH 01/10] Bump version --- gui/package.json | 2 +- modem/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/package.json b/gui/package.json index d165507e..ac0b4088 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA Client application for connecting to FreeDATA server", "private": true, - "version": "0.13.4-alpha", + "version": "0.13.5-alpha", "main": "dist-electron/main/index.js", "scripts": { "start": "vite", diff --git a/modem/server.py b/modem/server.py index 3fb046f4..43b4e8ee 100644 --- a/modem/server.py +++ b/modem/server.py @@ -29,7 +29,7 @@ app = Flask(__name__) CORS(app) CORS(app, resources={r"/*": {"origins": "*"}}) sock = Sock(app) -MODEM_VERSION = "0.13.4-alpha" +MODEM_VERSION = "0.13.5-alpha" # set config file to use def set_config(): From 0e1986b2da283d4850bdfd9d785c480a15806c21 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 14 Feb 2024 09:13:39 +0100 Subject: [PATCH 02/10] removed possibly obsolete arq state at wrong position --- modem/arq_session.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modem/arq_session.py b/modem/arq_session.py index 4fd424d4..8bae69af 100644 --- a/modem/arq_session.py +++ b/modem/arq_session.py @@ -98,7 +98,6 @@ class ARQSession(): if isinstance(received_data, bytearray) and isinstance(type_byte, int): self.arq_data_type_handler.dispatch(type_byte, received_data) - self.states.setARQ(False) return self.log(f"Ignoring unknown transition from state {self.state.name} with frame {frame['frame_type']}") From 4f50b802acabe414e3eef6e9cca88533fc6cd8a8 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 14 Feb 2024 09:27:20 +0100 Subject: [PATCH 03/10] adjusted state manager in data type handler --- modem/arq_data_type_handler.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modem/arq_data_type_handler.py b/modem/arq_data_type_handler.py index 4de79f13..8745056a 100644 --- a/modem/arq_data_type_handler.py +++ b/modem/arq_data_type_handler.py @@ -54,6 +54,9 @@ class ARQDataTypeHandler: def dispatch(self, type_byte: int, data: bytearray): session_type = self.get_session_type_from_value(type_byte) + + self.state_manager.setARQ(False) + if session_type and session_type in self.handlers and 'handle' in self.handlers[session_type]: return self.handlers[session_type]['handle'](data) else: @@ -61,6 +64,9 @@ class ARQDataTypeHandler: def failed(self, type_byte: int, data: bytearray): session_type = self.get_session_type_from_value(type_byte) + + self.state_manager.setARQ(False) + if session_type in self.handlers and 'failed' in self.handlers[session_type]: return self.handlers[session_type]['failed'](data) else: @@ -74,6 +80,9 @@ class ARQDataTypeHandler: def transmitted(self, type_byte: int, data: bytearray): session_type = self.get_session_type_from_value(type_byte) + + self.state_manager.setARQ(False) + if session_type in self.handlers and 'transmitted' in self.handlers[session_type]: return self.handlers[session_type]['transmitted'](data) else: From b569cbc3156900a6561a24ad0a62e5e6ddc4d482 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 14 Feb 2024 16:20:00 +0100 Subject: [PATCH 04/10] adjusted a rigctld command --- modem/rigctld.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modem/rigctld.py b/modem/rigctld.py index 79ca0108..471d7469 100644 --- a/modem/rigctld.py +++ b/modem/rigctld.py @@ -246,12 +246,16 @@ class radio: if not should_ignore(config.get('serial_dcd', "0")): args += ['--set-dcd', config['serial_dcd']] if not should_ignore(config.get('serial_dtr', "0")): - args += ['--set-dtr', config['serial_dtr']] + args += ['--set-conf', f'dtr_state={config["serial_dtr"]}'] - # Handling Stop Bits with the corrected --set-conf syntax + # Handling Data Bits and Stop Bits + if not should_ignore(config.get('data_bits', "0")): + args += ['--set-conf', f'data_bits={config["data_bits"]}'] if not should_ignore(config.get('stop_bits', "0")): args += ['--set-conf', f'stop_bits={config["stop_bits"]}'] + # Fixme #rts_state + # Handle custom arguments for rigctld # Custom args are split via ' ' so python doesn't add extranaeous quotes on windows args += config_rigctld["arguments"].split(" ") From 8d47d4890eb1d829d2a94c914ed8643c43ef7978 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 14 Feb 2024 16:29:18 +0100 Subject: [PATCH 05/10] removed rigctld typo --- modem/rigctld.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modem/rigctld.py b/modem/rigctld.py index 471d7469..fc4628dd 100644 --- a/modem/rigctld.py +++ b/modem/rigctld.py @@ -229,29 +229,29 @@ class radio: return value in ['ignore', 0] # Model ID, Serial Port, and Speed - if not should_ignore(config.get('model_id', "0")): + if not should_ignore(config.get('model_id')): args += ['-m', str(config['model_id'])] - if not should_ignore(config.get('serial_port', "0")): + if not should_ignore(config.get('serial_port')): args += ['-r', config['serial_port']] - if not should_ignore(config.get('serial_speed', "0")): + if not should_ignore(config.get('serial_speed')): args += ['-s', str(config['serial_speed'])] # PTT Port and Type - if not should_ignore(config.get('ptt_port', "0")): + if not should_ignore(config.get('ptt_port')): args += ['--ptt-port', config['ptt_port']] - if not should_ignore(config.get('ptt_type', "0")): + if not should_ignore(config.get('ptt_type')): args += ['--ptt-type', config['ptt_type']] # Serial DCD and DTR - if not should_ignore(config.get('serial_dcd', "0")): + if not should_ignore(config.get('serial_dcd')): args += ['--set-dcd', config['serial_dcd']] - if not should_ignore(config.get('serial_dtr', "0")): + if not should_ignore(config.get('serial_dtr')): args += ['--set-conf', f'dtr_state={config["serial_dtr"]}'] # Handling Data Bits and Stop Bits - if not should_ignore(config.get('data_bits', "0")): + if not should_ignore(config.get('data_bits')): args += ['--set-conf', f'data_bits={config["data_bits"]}'] - if not should_ignore(config.get('stop_bits', "0")): + if not should_ignore(config.get('stop_bits')): args += ['--set-conf', f'stop_bits={config["stop_bits"]}'] # Fixme #rts_state From 916c2a4a634a93f51079b0e9fe1fde3793b679fa Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 14 Feb 2024 16:45:19 +0100 Subject: [PATCH 06/10] delete beacons older than 2 days --- modem/schedule_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modem/schedule_manager.py b/modem/schedule_manager.py index 93b62823..2bc22adf 100644 --- a/modem/schedule_manager.py +++ b/modem/schedule_manager.py @@ -70,7 +70,7 @@ class ScheduleManager: cmd.run(self.event_manager, self.modem) def delete_beacons(self): - DatabaseManagerBeacon(self.event_manager).beacon_cleanup_older_than_days(14) + DatabaseManagerBeacon(self.event_manager).beacon_cleanup_older_than_days(2) def push_to_explorer(self): self.config = self.config_manager.read() From fc055671cbdb06583f680fa67208cfdcbe24e7d9 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 17 Feb 2024 10:41:09 -0500 Subject: [PATCH 07/10] Adjustments to rigctld arguments --- modem/rigctld.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modem/rigctld.py b/modem/rigctld.py index fc4628dd..0d988a9d 100644 --- a/modem/rigctld.py +++ b/modem/rigctld.py @@ -244,7 +244,7 @@ class radio: # Serial DCD and DTR if not should_ignore(config.get('serial_dcd')): - args += ['--set-dcd', config['serial_dcd']] + args += ['--dcd-type', config['serial_dcd']] if not should_ignore(config.get('serial_dtr')): args += ['--set-conf', f'dtr_state={config["serial_dtr"]}'] @@ -255,6 +255,8 @@ class radio: args += ['--set-conf', f'stop_bits={config["stop_bits"]}'] # Fixme #rts_state + if not should_ignore(config.get('rts_state')): + args += ['--set-conf', f'stop_bits={config["rts_state"]}'] # Handle custom arguments for rigctld # Custom args are split via ' ' so python doesn't add extranaeous quotes on windows From 7eaac1cc298b2af57f6b3e0c4f4f57e7991fbd41 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 17 Feb 2024 11:03:59 -0500 Subject: [PATCH 08/10] Fix typos/remove rts --- modem/rigctld.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modem/rigctld.py b/modem/rigctld.py index 9b171c18..7e987d18 100644 --- a/modem/rigctld.py +++ b/modem/rigctld.py @@ -244,8 +244,7 @@ class radio: # Serial DCD and DTR if not should_ignore(config.get('serial_dcd')): - - args += ['--dcd-type', config['serial_dcd']] + args += ['--dcd-type', config.get('serial_dcd')] if not should_ignore(config.get('serial_dtr')): args += ['--set-conf', f'dtr_state={config["serial_dtr"]}'] @@ -257,9 +256,8 @@ class radio: args += ['--set-conf', f'stop_bits={config["stop_bits"]}'] # Fixme #rts_state - - if not should_ignore(config.get('rts_state')): - args += ['--set-conf', f'stop_bits={config["rts_state"]}'] + # if not should_ignore(config.get('rts_state')): + # args += ['--set-conf', f'stop_bits={config["rts_state"]}'] # Handle custom arguments for rigctld # Custom args are split via ' ' so python doesn't add extranaeous quotes on windows From c26f9cb9ba4f23bfd21ba2c0568800e5d108979f Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 17 Feb 2024 12:55:10 -0500 Subject: [PATCH 09/10] Incr Next Version --- gui/package.json | 2 +- modem/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/package.json b/gui/package.json index ac0b4088..34cc15e2 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA Client application for connecting to FreeDATA server", "private": true, - "version": "0.13.5-alpha", + "version": "0.13.6-alpha", "main": "dist-electron/main/index.js", "scripts": { "start": "vite", diff --git a/modem/server.py b/modem/server.py index 43b4e8ee..00ef9f86 100644 --- a/modem/server.py +++ b/modem/server.py @@ -29,7 +29,7 @@ app = Flask(__name__) CORS(app) CORS(app, resources={r"/*": {"origins": "*"}}) sock = Sock(app) -MODEM_VERSION = "0.13.5-alpha" +MODEM_VERSION = "0.13.6-alpha" # set config file to use def set_config(): From 5bee82a17c979cd32559f0417a15057e105fe976 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 17 Feb 2024 16:57:54 -0500 Subject: [PATCH 10/10] Further adjustment --- modem/rigctld.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modem/rigctld.py b/modem/rigctld.py index 7e987d18..be112cdc 100644 --- a/modem/rigctld.py +++ b/modem/rigctld.py @@ -244,7 +244,7 @@ class radio: # Serial DCD and DTR if not should_ignore(config.get('serial_dcd')): - args += ['--dcd-type', config.get('serial_dcd')] + args += ['--dcd-type', config['serial_dcd']] if not should_ignore(config.get('serial_dtr')): args += ['--set-conf', f'dtr_state={config["serial_dtr"]}']