diff --git a/data/tracker_conf.json b/data/tracker_conf.json
index 77f21d1..d0bab56 100644
--- a/data/tracker_conf.json
+++ b/data/tracker_conf.json
@@ -51,8 +51,6 @@
"maxDistanceToTracker": 30,
"standingUpdateTime": 15,
"sendAltitude": true,
- "bluetoothType": 1,
- "bluetoothActive": true,
"disableGPS": false
},
"winlink": {
diff --git a/data_embed/bootstrap.css.gz b/data_embed/bootstrap.css.gz
index f068539..5c0c361 100644
Binary files a/data_embed/bootstrap.css.gz and b/data_embed/bootstrap.css.gz differ
diff --git a/data_embed/bootstrap.js.gz b/data_embed/bootstrap.js.gz
index 6b331a9..63f6628 100644
Binary files a/data_embed/bootstrap.js.gz and b/data_embed/bootstrap.js.gz differ
diff --git a/data_embed/favicon.png.gz b/data_embed/favicon.png.gz
index dcb648d..bec01a2 100644
Binary files a/data_embed/favicon.png.gz and b/data_embed/favicon.png.gz differ
diff --git a/data_embed/index.html b/data_embed/index.html
index 69f73ef..add83cb 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -544,52 +544,6 @@
-
-
-
-
-
-
- Digipeating
-
-
Define the Digipeater mode
-
-
-
-
- Repeater Mode
-
- off
-
- WIDE1 (fill-in) Digi
-
-
- WIDE2 (+WIDE1) Digi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Battery
-
-
- Battery Monitor & Health
-
-
- Max Voltage on input pin is 3.3V.
-
-
- Calculate voltage divider accordingly.
-
-
-
-
-
-
-
- Send Internal Voltage
-
-
-
- (Send Voltage As Telemetry)
-
-
-
- Monitor Internal Voltage Health
-
-
-
Internal Sleep Voltage
-
-
- volts
-
-
-
-
-
-
- Send External Voltage
-
-
-
- Monitor External Voltage Health
-
-
-
External Sleep Voltage
-
-
- volts
-
-
-
-
- External Voltage Pin
-
-
-
External Voltage divider R1
-
-
- kOhm
-
-
-
-
External Voltage divider R2
-
-
- kOhm
-
-
-
-
-
-
-
-
@@ -1135,9 +911,9 @@
d="M3.05 3.05a7 7 0 0 0 0 9.9.5.5 0 0 1-.707.707 8 8 0 0 1 0-11.314.5.5 0 0 1 .707.707m2.122 2.122a4 4 0 0 0 0 5.656.5.5 0 1 1-.708.708 5 5 0 0 1 0-7.072.5.5 0 0 1 .708.708m5.656-.708a.5.5 0 0 1 .708 0 5 5 0 0 1 0 7.072.5.5 0 1 1-.708-.708 4 4 0 0 0 0-5.656.5.5 0 0 1 0-.708m2.122-2.12a.5.5 0 0 1 .707 0 8 8 0 0 1 0 11.313.5.5 0 0 1-.707-.707 7 7 0 0 0 0-9.9.5.5 0 0 1 0-.707zM6 8a2 2 0 1 1 2.5 1.937V15.5a.5.5 0 0 1-1 0V9.937A2 2 0 0 1 6 8"
/>
- Telemetry
+ Wx Telemetry
- Define Wx telemetry
+ Define Wx Telemetry (Wx Data will only be sended when Station doesn't move for at least 15 min)
-
-
Height Correction (Above Sea-Level)
-
-
- meters
-
-
Temperature Correction
C° Celsius
+
+
+
+ Send Wx Telemetry in GPS Beacon
+
+
+
@@ -1220,58 +991,33 @@
d="M9.293 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0M9.5 3.5v-2l3 3h-2a1 1 0 0 1-1-1M4.5 9a.5.5 0 0 1 0-1h7a.5.5 0 0 1 0 1zM4 10.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5m.5 2.5a.5.5 0 0 1 0-1h4a.5.5 0 0 1 0 1z"
/>
- Syslog
+ BlueTooth
Broadcast the system log over the
- network. BT Classic or BLE Configuration.
@@ -1301,29 +1047,26 @@
d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"
/>
- TNC
+ BATTERY
TNC and KISS configuration BATTERY Information on GPS Beacon Configuration
@@ -1380,7 +1123,7 @@
d="M.88 8C-2.427 1.68 4.41-2 7.823 1.143q.09.083.176.171a3 3 0 0 1 .176-.17C11.59-2 18.426 1.68 15.12 8h-2.783l-1.874-4.686a.5.5 0 0 0-.945.049L7.921 8.956 6.464 5.314a.5.5 0 0 0-.88-.091L3.732 8z"
/>
- Reboot Time
+ PTT Trigger
@@ -1404,23 +1147,84 @@
Time before forced Reboot Pin used for external Amp trigger
hours Pin
+
+
+
+
+
+
Time to enable trigger before Tx
+
+
+ miliseconds
+
+
+
+
+
+
Time to disable trigger after Tx
+
+
+ miliseconds
+
+
+
+
+
@@ -1453,262 +1257,32 @@
d="M8.5 5.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0"
/>
- Auto AP
+ WiFi AP
Add your password and power off timeout to
- auto access point. Auto AP will start if
- there is no WiFi connection. Timeout will
- count from startup or last client
- disconnected. Add your password to access WiFi AP.
Password
-
-
Power off timeout
- (in minutes)
-
-
- Set to 0 if you don't
- want this option.
-
-
-
-
-
-
-
-
- OTA
-
-
Set your username and password to allow
- firmware updating over-the-air.
-
-
-
-
-
-
-
-
-
-
-
- Admin
-
-
Set your username and password to allow
- access to the web interface.
-
-
-
-
-
-
- Web interface authentication
-
-
-
-
- Username
-
-
-
- Password
-
-
-
-
-
-
-
-
-
-
-
-
-
- Experimental
-
-
You can test new features. Use at your own risk!
-
-
-
-
-
-
-
Low voltage cut off (Deep sleep below specific voltage)
-
-
Volts
-
- MCU will deep sleep when below provided battery voltage to save power. Set to 0 if you don't want this option. Please calibrate your voltage reading first!
-
-
-
-
-
hasParam("display.showSymbol", true);
if (request->hasParam("display.ecoMode", true)) {
Config.display.ecoMode = true;
if (request->hasParam("display.timeout", true)) {
@@ -91,17 +94,31 @@ namespace WEB_Utils {
} else {
Config.display.ecoMode = false;
}
-
Config.display.turn180 = request->hasParam("display.turn180", true);
- Config.display.showSymbol = request->hasParam("display.showSymbol", true);
+
+ Config.battery.sendVoltage = request->hasParam("battery.sendVoltage", true);
+ Config.battery.voltageAsTelemetry = request->hasParam("battery.voltageAsTelemetry", true);
+ Config.battery.sendVoltageAlways = request->hasParam("battery.sendVoltageAlways", true);
+
+ // other
+ Config.simplifiedTrackerMode = request->hasParam("other.simplifiedTrackerMode", true);
+ Config.sendCommentAfterXBeacons = request->getParam("other.sendCommentAfterXBeacons", true)->value().toInt();
+ Config.path = request->getParam("other.path", true)->value();
+ Config.nonSmartBeaconRate = request->getParam("other.nonSmartBeaconRate", true)->value().toInt();
+ Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt();
+ Config.maxDistanceToTracker = request->getParam("other.maxDistanceToTracker", true)->value().toInt();
+ Config.standingUpdateTime = request->getParam("other.standingUpdateTime", true)->value().toInt();
+ Config.sendAltitude = request->hasParam("other.sendAltitude", true);
+ Config.disableGPS = request->hasParam("other.disableGPS", true);
+ //
if (request->hasParam("winlink.password", true)) {
Config.winlink.password = request->getParam("winlink.password", true)->value();
}
-
- /*Config.bme.active = request->hasParam("bme.active", true);
- Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat();
- Config.bme.sendTelemetry = request->hasParam("bme.sendTelemetry", true);
+
+ Config.bme.active = request->hasParam("bme.active", true);
+ Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat();
+ Config.bme.sendTelemetry = request->hasParam("bme.sendTelemetry", true);
Config.notification.ledTx = request->hasParam("notification.ledTx", true);
Config.notification.ledTxPin = request->getParam("notification.ledTxPin", true)->value().toInt();
@@ -119,24 +136,19 @@ namespace WEB_Utils {
Config.notification.lowBatteryBeep = request->hasParam("notification.lowBatteryBeep", true);
Config.notification.shutDownBeep = request->hasParam("notification.shutDownBeep", true);
+ // lora
+
+ Config.bluetooth.active = request->hasParam("bluetooth.active", true);
+ Config.bluetooth.type = request->getParam("bluetooth.type", true)->value().toInt();
+
Config.ptt.active = request->hasParam("ptt.active", true);
Config.ptt.io_pin = request->getParam("ptt.io_pin", true)->value().toInt();
Config.ptt.preDelay = request->getParam("ptt.preDelay", true)->value().toInt();
Config.ptt.postDelay = request->getParam("ptt.postDelay", true)->value().toInt();
Config.ptt.reverse = request->hasParam("ptt.reverse", true);
- Config.simplifiedTrackerMode = request->hasParam("other.simplifiedTrackerMode", true);
- Config.sendCommentAfterXBeacons = request->getParam("other.sendCommentAfterXBeacons", true)->value().toInt();
- Config.path = request->getParam("other.path", true)->value();
- Config.nonSmartBeaconRate = request->getParam("other.nonSmartBeaconRate", true)->value().toInt();
- Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt();
- Config.maxDistanceToTracker = request->getParam("other.maxDistanceToTracker", true)->value().toInt();
- Config.standingUpdateTime = request->getParam("other.standingUpdateTime", true)->value().toInt();
- Config.sendAltitude = request->hasParam("other.sendAltitude", true);
- Config.sendBatteryInfo = request->hasParam("other.sendBatteryInfo", true);
- Config.bluetoothType = request->getParam("other.bluetoothType", true)->value().toInt();
- Config.bluetoothActive = request->hasParam("other.bluetoothActive", true);
- Config.disableGPS = request->hasParam("other.disableGPS", true);*/
+
+ // wifi
Config.writeFile();