mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
improved hamlib integration
...also updated node dependencies to latest version...
This commit is contained in:
parent
9c7029c60d
commit
468f660ebe
3644
gui/package-lock.json
generated
3644
gui/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -1,15 +1,19 @@
|
|||
{
|
||||
"name": "codec2-FreeDATA",
|
||||
"name": "FreeDATA",
|
||||
"version": "0.0.1",
|
||||
"description": "codec2-FreeDATA ",
|
||||
"description": "FreeDATA ",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0",
|
||||
"npm": ">=6.0.0"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/DJ2LS/codec2-FreeDATA.git"
|
||||
"url": "git+https://github.com/DJ2LS/FeeDATA.git"
|
||||
},
|
||||
"keywords": [
|
||||
"TNC",
|
||||
|
@ -20,16 +24,16 @@
|
|||
"author": "DJ2LS",
|
||||
"license": "LGPL-2.1",
|
||||
"bugs": {
|
||||
"url": "https://github.com/DJ2LS/codec2-FreeDATA/issues"
|
||||
"url": "https://github.com/DJ2LS/FreeDATA/issues"
|
||||
},
|
||||
"homepage": "https://github.com/DJ2LS/codec2-FreeDATA#readme",
|
||||
"homepage": "https://github.com/DJ2LS/FreeDATA#readme",
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.1.0",
|
||||
"chart.js": "^3.5.1",
|
||||
"qth-locator": "^2.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "14.0.0",
|
||||
"electron": "^15.0.0",
|
||||
"electron-builder": "^22.11.7"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -658,11 +658,11 @@ ipcRenderer.on('action-update-daemon-state', (event, arg) => {
|
|||
document.getElementById('audio_output_selectbox').disabled = true
|
||||
document.getElementById('stopTNC').disabled = false
|
||||
document.getElementById('startTNC').disabled = true
|
||||
document.getElementById('myCall').disabled = false
|
||||
//document.getElementById('myCall').disabled = false
|
||||
document.getElementById('dxCall').disabled = false
|
||||
document.getElementById('saveMyCall').disabled = false
|
||||
document.getElementById('myGrid').disabled = false
|
||||
document.getElementById('saveMyGrid').disabled = false
|
||||
//document.getElementById('saveMyCall').disabled = false
|
||||
//document.getElementById('myGrid').disabled = false
|
||||
//document.getElementById('saveMyGrid').disabled = false
|
||||
document.getElementById("hamlib_serialspeed").disabled = true
|
||||
//document.getElementById("startTransmission").disabled = false
|
||||
|
||||
|
@ -675,11 +675,11 @@ ipcRenderer.on('action-update-daemon-state', (event, arg) => {
|
|||
document.getElementById('audio_output_selectbox').disabled = false
|
||||
document.getElementById('stopTNC').disabled = true
|
||||
document.getElementById('startTNC').disabled = false
|
||||
document.getElementById('myCall').disabled = true
|
||||
//document.getElementById('myCall').disabled = true
|
||||
document.getElementById('dxCall').disabled = true
|
||||
document.getElementById('saveMyCall').disabled = true
|
||||
document.getElementById('myGrid').disabled = true
|
||||
document.getElementById('saveMyGrid').disabled = true
|
||||
//document.getElementById('saveMyCall').disabled = true
|
||||
//document.getElementById('myGrid').disabled = true
|
||||
//document.getElementById('saveMyGrid').disabled = true
|
||||
document.getElementById("hamlib_serialspeed").disabled = false
|
||||
//document.getElementById("startTransmission").disabled = true
|
||||
|
||||
|
|
1628
gui/src/index.html
1628
gui/src/index.html
File diff suppressed because it is too large
Load diff
38
tnc/modem.py
38
tnc/modem.py
|
@ -110,10 +110,14 @@ class RF():
|
|||
FFT_THREAD.start()
|
||||
|
||||
# --------------------------------------------CONFIGURE HAMLIB
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_RIG,0)
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_SERIAL_DTR,0)
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_SERIAL_RTS,1)
|
||||
#self.my_rig.set_conf("dtr_state", "OFF")
|
||||
#my_rig.set_conf("rts_state", "OFF")
|
||||
#self.my_rig.set_conf("ptt_type", "RTS")
|
||||
#my_rig.set_conf("ptt_type", "RIG_PTT_SERIAL_RTS")
|
||||
|
||||
print(static.HAMLIB_PTT_TYPE)
|
||||
print(static.HAMLIB_DEVICE_ID)
|
||||
print(static.HAMLIB_DEVICE_PORT)
|
||||
# try to init hamlib
|
||||
try:
|
||||
Hamlib.rig_set_debug(Hamlib.RIG_DEBUG_NONE)
|
||||
|
@ -121,39 +125,36 @@ class RF():
|
|||
self.my_rig.set_conf("rig_pathname", static.HAMLIB_DEVICE_PORT)
|
||||
self.my_rig.set_conf("retry", "5")
|
||||
self.my_rig.set_conf("serial_speed", static.HAMLIB_SERIAL_SPEED)
|
||||
|
||||
#self.my_rig.set_conf("dtr_state", "OFF")
|
||||
#my_rig.set_conf("rts_state", "OFF")
|
||||
#self.my_rig.set_conf("ptt_type", "RTS")
|
||||
#my_rig.set_conf("ptt_type", "RIG_PTT_SERIAL_RTS")
|
||||
|
||||
self.my_rig.set_conf("serial_handshake", "None")
|
||||
self.my_rig.set_conf("stop_bits", "1")
|
||||
self.my_rig.set_conf("data_bits", "8")
|
||||
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_RIG,0)
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_SERIAL_DTR,0)
|
||||
#my_rig.set_ptt(Hamlib.RIG_PTT_SERIAL_RTS,1)
|
||||
|
||||
if static.HAMLIB_PTT_TYPE == 'RIG_PTT_RIG':
|
||||
if static.HAMLIB_PTT_TYPE == 'RIG':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_RIG
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'DTR':
|
||||
elif static.HAMLIB_PTT_TYPE == 'DTR-H':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_SERIAL_DTR
|
||||
self.my_rig.set_conf("ptt_type", "RTS")
|
||||
self.my_rig.set_conf("dtr_state", "HIGH")
|
||||
self.my_rig.set_conf("ptt_type", "DTR")
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'DTR-L':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_SERIAL_DTR
|
||||
self.my_rig.set_conf("dtr_state", "LOW")
|
||||
self.my_rig.set_conf("ptt_type", "DTR")
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'RTS':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_SERIAL_RTS
|
||||
self.my_rig.set_conf("dtr_state", "OFF")
|
||||
self.my_rig.set_conf("ptt_type", "RTS")
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'RIG_PTT_PARALLEL':
|
||||
elif static.HAMLIB_PTT_TYPE == 'PARALLEL':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_PARALLEL
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'RIG_PTT_RIG_MICDATA':
|
||||
elif static.HAMLIB_PTT_TYPE == 'MICDATA':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_RIG_MICDATA
|
||||
|
||||
elif static.HAMLIB_PTT_TYPE == 'RIG_PTT_CM108':
|
||||
elif static.HAMLIB_PTT_TYPE == 'CM108':
|
||||
self.hamlib_ptt_type = Hamlib.RIG_PTT_CM108
|
||||
|
||||
else: # static.HAMLIB_PTT_TYPE == 'RIG_PTT_NONE':
|
||||
|
@ -173,6 +174,7 @@ class RF():
|
|||
except:
|
||||
print("Unexpected error:", sys.exc_info()[0])
|
||||
print("can't open rig")
|
||||
sys.exit("hamlib error")
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue