Merge branch 'develop' into dev-arq

This commit is contained in:
DJ2LS 2024-02-18 16:16:24 +01:00 committed by GitHub
commit 303ac0d6ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions

View file

@ -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.6-alpha",
"main": "dist-electron/main/index.js",
"scripts": {
"start": "vite",

View file

@ -244,7 +244,8 @@ 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 +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"]}']
# Handle custom arguments for rigctld
# Custom args are split via ' ' so python doesn't add extranaeous quotes on windows

View file

@ -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.6-alpha"
# set config file to use
def set_config():