mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge branch 'develop' into dev-interface-tests
This commit is contained in:
commit
adb0c82332
4 changed files with 7 additions and 7 deletions
|
@ -2,7 +2,7 @@
|
||||||
"name": "FreeDATA",
|
"name": "FreeDATA",
|
||||||
"description": "FreeDATA Client application for connecting to FreeDATA server",
|
"description": "FreeDATA Client application for connecting to FreeDATA server",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.14.3-alpha",
|
"version": "0.14.4-alpha",
|
||||||
"main": "dist-electron/main/index.js",
|
"main": "dist-electron/main/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "vite",
|
"start": "vite",
|
||||||
|
|
|
@ -45,7 +45,7 @@ const serialStore = useSerialStore();
|
||||||
@change="onChange"
|
@change="onChange"
|
||||||
v-model.number="settings.remote.RADIO.model_id"
|
v-model.number="settings.remote.RADIO.model_id"
|
||||||
>
|
>
|
||||||
<option selected value="-- ignore --">-- ignore --</option>
|
<option selected value="0">-- ignore --</option>
|
||||||
<option value="1">Hamlib Dummy</option>
|
<option value="1">Hamlib Dummy</option>
|
||||||
<option value="2">Hamlib NET rigctl</option>
|
<option value="2">Hamlib NET rigctl</option>
|
||||||
<option value="4">FLRig FLRig</option>
|
<option value="4">FLRig FLRig</option>
|
||||||
|
|
|
@ -299,13 +299,13 @@ class radio:
|
||||||
|
|
||||||
# PTT Port and Type
|
# PTT Port and Type
|
||||||
if not should_ignore(config.get('ptt_port')):
|
if not should_ignore(config.get('ptt_port')):
|
||||||
args += ['--ptt-port', config['ptt_port']]
|
args += ['-p', config['ptt_port']]
|
||||||
if not should_ignore(config.get('ptt_type')):
|
if not should_ignore(config.get('ptt_type')):
|
||||||
args += ['--ptt-type', config['ptt_type']]
|
args += ['-P', config['ptt_type']]
|
||||||
|
|
||||||
# Serial DCD and DTR
|
# Serial DCD and DTR
|
||||||
if not should_ignore(config.get('serial_dcd')):
|
if not should_ignore(config.get('serial_dcd')):
|
||||||
args += ['--dcd-type', config['serial_dcd']]
|
args += ['-D', config['serial_dcd']]
|
||||||
|
|
||||||
if not should_ignore(config.get('serial_dtr')):
|
if not should_ignore(config.get('serial_dtr')):
|
||||||
args += ['--set-conf', f'dtr_state={config["serial_dtr"]}']
|
args += ['--set-conf', f'dtr_state={config["serial_dtr"]}']
|
||||||
|
@ -323,7 +323,7 @@ class radio:
|
||||||
# Handle custom arguments for rigctld
|
# Handle custom arguments for rigctld
|
||||||
# Custom args are split via ' ' so python doesn't add extranaeous quotes on windows
|
# Custom args are split via ' ' so python doesn't add extranaeous quotes on windows
|
||||||
args += config_rigctld["arguments"].split(" ")
|
args += config_rigctld["arguments"].split(" ")
|
||||||
#print("Hamlib args ==>" + str(args))
|
print("Hamlib args ==>" + str(args))
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ from schedule_manager import ScheduleManager
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
CORS(app, resources={r"/*": {"origins": "*"}})
|
CORS(app, resources={r"/*": {"origins": "*"}})
|
||||||
sock = Sock(app)
|
sock = Sock(app)
|
||||||
MODEM_VERSION = "0.14.3-alpha"
|
MODEM_VERSION = "0.14.4-alpha"
|
||||||
|
|
||||||
# set config file to use
|
# set config file to use
|
||||||
def set_config():
|
def set_config():
|
||||||
|
|
Loading…
Reference in a new issue