Unsignedio
/
openmodemconfigutil
mirror of https://github.com/markqvist/openmodemconfigutil.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added modem mode indication to ui

master
Mark Qvist 2019-04-05 14:03:47 +02:00
parent df952b71bb
commit 2270dae085
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openmodemconfig.py
View File

@ -77,6 +77,7 @@ class KISS():
CMD_BT_MODE = chr(0x0E) CMD_BT_MODE = chr(0x0E)
CMD_SERIAL_BAUDRATE = chr(0x10) CMD_SERIAL_BAUDRATE = chr(0x10)
CMD_EN_DIAGS = chr(0x13) CMD_EN_DIAGS = chr(0x13)
CMD_MODE = chr(0x14)
CMD_PRINT_CONFIG = chr(0xF0) CMD_PRINT_CONFIG = chr(0xF0)
CMD_LED_INTENSITY = chr(0x08) CMD_LED_INTENSITY = chr(0x08)
CMD_RETURN = chr(0xFF) CMD_RETURN = chr(0xFF)
@ -108,6 +109,10 @@ class KISS():
CONFIG_BLUETOOTH_AUTODETECT = chr(0x01) CONFIG_BLUETOOTH_AUTODETECT = chr(0x01)
CONFIG_BLUETOOTH_REQUIRED = chr(0x02) CONFIG_BLUETOOTH_REQUIRED = chr(0x02)
MODE_AFSK_300 = chr(0x01)
MODE_AFSK_1200 = chr(0x02)
MODE_AFSK_2400 = chr(0x03)
@staticmethod @staticmethod
def escape(data): def escape(data):
data = data.replace(chr(0xdb), chr(0xdb)+chr(0xdd)) data = data.replace(chr(0xdb), chr(0xdb)+chr(0xdd))
@ -148,6 +153,8 @@ class KISSInterface(Interface):
self.persistence = persistence if persistence != None else 64; self.persistence = persistence if persistence != None else 64;
self.slottime = slottime if slottime != None else 20; self.slottime = slottime if slottime != None else 20;
self.modem_mode = None
self.config_p = None self.config_p = None
self.config_slottime = None self.config_slottime = None
self.config_preamble = None self.config_preamble = None
@ -495,6 +502,8 @@ class KISSInterface(Interface):
config_buffer = config_buffer+byte config_buffer = config_buffer+byte
elif (command == KISS.CMD_AUDIO_PEAK): elif (command == KISS.CMD_AUDIO_PEAK):
self.displayPeak(byte) self.displayPeak(byte)
elif (command == KISS.CMD_MODE):
self.modem_mode = byte
else: else:
time_since_last = int(time.time()*1000) - last_read_ms time_since_last = int(time.time()*1000) - last_read_ms
if len(data_buffer) > 0 and time_since_last > self.timeout: if len(data_buffer) > 0 and time_since_last > self.timeout:
@ -568,7 +577,8 @@ class appRequestHandler(BaseHTTPRequestHandler):
"crypto_lock": ord(kiss_interface.config_crypto_lock), "crypto_lock": ord(kiss_interface.config_crypto_lock),
"gps_mode": ord(kiss_interface.config_gps_mode), "gps_mode": ord(kiss_interface.config_gps_mode),
"bluetooth_mode": ord(kiss_interface.config_bluetooth_mode), "bluetooth_mode": ord(kiss_interface.config_bluetooth_mode),
"serial_baudrate": ord(kiss_interface.config_serial_baudrate) "serial_baudrate": ord(kiss_interface.config_serial_baudrate),
"modem_mode": ord(kiss_interface.modem_mode)
} }
request.wfile.write(json.dumps({"response":"ok", "config":configData}).encode("utf-8")) request.wfile.write(json.dumps({"response":"ok", "config":configData}).encode("utf-8"))
else: else:

5
public/index.html
View File

@ -99,9 +99,10 @@
</div> </div>
<div class="eight wide column"> <div class="eight wide column">
<select class="ui fullwidth dropdown disabled"> <select class="ui fullwidth dropdown disabled" id="s_modem_mode">
<option value="Unknown" selected>Unknown</option>
<option value="AFSK300">AFSK300</option> <option value="AFSK300">AFSK300</option>
<option value="AFSK1200" selected>AFSK1200</option> <option value="AFSK1200">AFSK1200</option>
<option value="AFSK2400">AFSK2400</option> <option value="AFSK2400">AFSK2400</option>
</select> </select>
</div> </div>

6
public/main.js
View File

@ -41,7 +41,7 @@ function request_connection() {
console.log(data); console.log(data);
if (data["response"] == "ok") { if (data["response"] == "ok") {
console.log("Serial port open"); console.log("Serial port open");
setTimeout(request_config, 250); setTimeout(request_config, 600);
} else { } else {
console.log("Could not connect"); console.log("Could not connect");
document.connection_state = false; document.connection_state = false;
@ -58,6 +58,7 @@ function request_config() {
url: "/getconfig", url: "/getconfig",
timeout: 500, timeout: 500,
success: function(data) { success: function(data) {
console.log(data);
if (data["response"] == "ok") { if (data["response"] == "ok") {
console.log("Connected!"); console.log("Connected!");
jQuery("#disconnectbutton").show(); jQuery("#disconnectbutton").show();
@ -366,6 +367,9 @@ function update_fields_from_config(configdata) {
} else { } else {
jQuery("#c_logtosd").checkbox("uncheck"); jQuery("#c_logtosd").checkbox("uncheck");
} }
if (parseInt(configdata["modem_mode"]) == 1) { jQuery("#s_modem_mode").dropdown("set selected", "AFSK300");}
if (parseInt(configdata["modem_mode"]) == 2) { jQuery("#s_modem_mode").dropdown("set selected", "AFSK1200");}
if (parseInt(configdata["modem_mode"]) == 3) { jQuery("#s_modem_mode").dropdown("set selected", "AFSK2400");}
}, 50); }, 50);
} }