ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

agregados switches

This commit is contained in:
richonguzman 2024-09-25 12:59:47 -03:00
parent 35df91d9d1
commit 0d57053a70
9 changed files with 332 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data_embed/bootstrap.css.gz
View File

Binary file not shown.

BIN
data_embed/bootstrap.js.gz
View File

Binary file not shown.

BIN
data_embed/favicon.png.gz
View File

Binary file not shown.

282
data_embed/index.html
View File

@ -142,15 +142,15 @@
<div class="row mt-2"> <div class="row mt-2">
<div class="col-6"> <div class="col-6">
<label <label
for="other.rememberStationTime" for="rememberStationTime"
class="form-label" class="form-label"
>Remember Station Time</label >Remember Station Time</label
> >
<div class="input-group"> <div class="input-group">
<input <input
type="number" type="number"
name="other.rememberStationTime" name="rememberStationTime"
id="other.rememberStationTime" id="rememberStationTime"
placeholder="30" placeholder="30"
class="form-control" class="form-control"
required="" required=""
@ -410,6 +410,282 @@
</div> </div>
<hr /> <hr />
<div class="row my-5 d-flex align-items-top">
<div class="col-lg-3 col-sm-12">
<h5>
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
fill="currentColor"
class="bi bi-heart-pulse-fill"
viewBox="0 0 16 16"
>
<path
d="M1.475 9C2.702 10.84 4.779 12.871 8 15c3.221-2.129 5.298-4.16 6.525-6H12a.5.5 0 0 1-.464-.314l-1.457-3.642-1.598 5.593a.5.5 0 0 1-.945.049L5.889 6.568l-1.473 2.21A.5.5 0 0 1 4 9z"
/>
<path
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"
/>
</svg>
NOTIFICATIONS
</h5>
</div>
<div class="col-lg-9 col-sm-12">
<div class="row">
<div class="col-6">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.ledTx"
id="notification.ledTx"
class="form-check-input"
/>
<label
for="notification.ledTx"
class="form-label"
>Tx Led Active</label
>
</div>
</div>
<div class="col-6">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.ledMessage"
id="notification.ledMessage"
class="form-check-input"
/>
<label
for="notification.ledMessage"
class="form-label"
>Messsage Rx Led Active</label
>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col-6">
<label
for="notification.ledTxPin"
class="form-label"
>Pin used for Tx Led</label
>
<div class="input-group">
<input
type="number"
name="notification.ledTxPin"
id="notification.ledTxPin"
class="form-control"
/>
<span class="input-group-text"
>Pin</span
>
</div>
</div>
<div class="col-6">
<label
for="notification.ledMessagePin"
class="form-label"
>Pin used for Message Rx Led</label
>
<div class="input-group">
<input
type="number"
name="notification.ledMessagePin"
id="notification.ledMessagePin"
class="form-control"
/>
<span class="input-group-text"
>Pin</span
>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col-6">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.buzzerActive"
id="notification.buzzerActive"
class="form-check-input"
/>
<label
for="notification.buzzerActive"
class="form-label"
>Buzzer Active</label
>
</div>
</div>
<div class="col-6">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.ledFlashlight"
id="notification.ledFlashlight"
class="form-check-input"
/>
<label
for="notification.ledFlashlight"
class="form-label"
>Flashlight Pin Active</label
>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col-6">
<label
for="notification.buzzerPinTone"
class="form-label"
>Buzzer Tone Pin</label
>
<div class="input-group">
<input
type="number"
name="notification.buzzerPinTone"
id="notification.buzzerPinTone"
class="form-control"
/>
<span class="input-group-text"
>Pin</span
>
</div>
</div>
<div class="col-6">
<label
for="notification.ledFlashlightPin"
class="form-label"
>Pin used for Flashlight Pin</label
>
<div class="input-group">
<input
type="number"
name="notification.ledFlashlightPin"
id="notification.ledFlashlightPin"
class="form-control"
/>
<span class="input-group-text"
>Pin</span
>
</div>
</div>
<div class="col-6">
<label
for="notification.buzzerPinVcc"
class="form-label"
>Buzzer Vcc Pin</label
>
<div class="input-group">
<input
type="number"
name="notification.buzzerPinVcc"
id="notification.buzzerPinVcc"
class="form-control"
/>
<span class="input-group-text"
>Pin</span
>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.bootUpBeep"
id="notification.bootUpBeep"
class="form-check-input"
/>
<label
for="notification.bootUpBeep"
class="form-label"
>Boot Up Beep</label
>
</div>
</div>
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.txBeep"
id="notification.txBeep"
class="form-check-input"
/>
<label
for="notification.txBeep"
class="form-label"
>Tx Beep</label
>
</div>
</div>
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.messageRxBeep"
id="notification.messageRxBeep"
class="form-check-input"
/>
<label
for="notification.messageRxBeep"
class="form-label"
>Message Rx Beep</label
>
</div>
</div>
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.stationBeep"
id="notification.stationBeep"
class="form-check-input"
/>
<label
for="notification.stationBeep"
class="form-label"
>Station Rx Beep</label
>
</div>
</div>
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.lowBatteryBeep"
id="notification.lowBatteryBeep"
class="form-check-input"
/>
<label
for="notification.lowBatteryBeep"
class="form-label"
>Low Battery Beep</label
>
</div>
</div>
<div class="col-12">
<div class="form-check form-switch">
<input
type="checkbox"
name="notification.shutDownBeep"
id="notification.shutDownBeep"
class="form-check-input"
/>
<label
for="notification.shutDownBeep"
class="form-label"
>Shutdown Beep</label
>
</div>
</div>
</div>
</div>
</div>
<hr />
<div class="row my-5 d-flex align-items-top"> <div class="row my-5 d-flex align-items-top">
<div class="col-lg-3 col-sm-12"> <div class="col-lg-3 col-sm-12">
<h5> <h5>

BIN
data_embed/index.html.gz
View File

Binary file not shown.

40
data_embed/script.js
View File

@ -67,7 +67,9 @@ logCheckbox.addEventListener("change", function () {
function loadSettings(settings) { function loadSettings(settings) {
currentSettings = settings; currentSettings = settings;
// Display // BEACONS
// DISPLAY
document.getElementById("display.showSymbol").checked = settings.display.showSymbol; document.getElementById("display.showSymbol").checked = settings.display.showSymbol;
document.getElementById("display.ecoMode").checked = settings.display.ecoMode; document.getElementById("display.ecoMode").checked = settings.display.ecoMode;
document.getElementById("display.timeout").value = settings.display.timeout; document.getElementById("display.timeout").value = settings.display.timeout;
@ -82,18 +84,48 @@ function loadSettings(settings) {
document.getElementById("battery.voltageAsTelemetry").checked = settings.battery.voltageAsTelemetry; document.getElementById("battery.voltageAsTelemetry").checked = settings.battery.voltageAsTelemetry;
document.getElementById("battery.sendVoltageAlways").checked = settings.battery.sendVoltageAlways; document.getElementById("battery.sendVoltageAlways").checked = settings.battery.sendVoltageAlways;
// OTHER
/*document.getElementById("simplifiedTrackerMode").checked = settings.simplifiedTrackerMode;
document.getElementById("sendCommentAfterXBeacons").value = settings.sendCommentAfterXBeacons;
document.getElementById("path").value = settings.path;
document.getElementById("nonSmartBeaconRate").value = settings.nonSmartBeaconRate;*/
document.getElementById("rememberStationTime").value = settings.rememberStationTime;
/*document.getElementById("maxDistanceToTracker").value = settings.maxDistanceToTracker;
document.getElementById("standingUpdateTime").value = settings.standingUpdateTime;
document.getElementById("sendAltitude").checked = settings.sendAltitude ;
document.getElementById("disableGPS").checked = settings.disableGPS;*/
// WINLINK
document.getElementById("winlink.password").value = settings.winlink.password;
// TELEMETRY BME/WX // TELEMETRY BME/WX
document.getElementById("bme.active").checked = settings.bme.active; document.getElementById("bme.active").checked = settings.bme.active;
document.getElementById("bme.temperatureCorrection").value = settings.bme.temperatureCorrection.toFixed(1); document.getElementById("bme.temperatureCorrection").value = settings.bme.temperatureCorrection.toFixed(1);
document.getElementById("bme.sendTelemetry").checked = settings.bme.sendTelemetry; document.getElementById("bme.sendTelemetry").checked = settings.bme.sendTelemetry;
// NOTIFICATION
document.getElementById("notification.ledTx").checked = settings.notification.ledTx;
document.getElementById("notification.ledTxPin").value = settings.notification.ledTxPin;
document.getElementById("notification.ledMessage").checked = settings.notification.ledMessage;
document.getElementById("notification.ledMessagePin").value = settings.notification.ledMessagePin;
document.getElementById("notification.ledFlashlight").checked = settings.notification.ledFlashlight;
document.getElementById("notification.ledFlashlightPin").value = settings.notification.ledFlashlightPin;
document.getElementById("notification.buzzerActive").checked = settings.notification.buzzerActive;
document.getElementById("notification.buzzerPinTone").value = settings.notification.buzzerPinTone;
document.getElementById("notification.buzzerPinVcc").value = settings.notification.buzzerPinVcc;
document.getElementById("notification.bootUpBeep").checked = settings.notification.bootUpBeep;
document.getElementById("notification.txBeep").checked = settings.notification.txBeep;
document.getElementById("notification.messageRxBeep").checked = settings.notification.messageRxBeep;
document.getElementById("notification.stationBeep").checked = settings.notification.stationBeep;
document.getElementById("notification.lowBatteryBeep").checked = settings.notification.lowBatteryBeep;
document.getElementById("notification.shutDownBeep").checked = settings.notification.shutDownBeep;
// LORA
// BLUETOOTH // BLUETOOTH
document.getElementById("bluettooth.active").checked = settings.bluetooth.active; document.getElementById("bluettooth.active").checked = settings.bluetooth.active;
document.getElementById("bluettooth.type").value = settings.bluetooth.type; document.getElementById("bluettooth.type").value = settings.bluetooth.type;
// WINLINK
document.getElementById("winlink.password").value = settings.winlink.password;
// PTT Trigger // PTT Trigger
document.getElementById("ptt.active").checked = settings.ptt.active; document.getElementById("ptt.active").checked = settings.ptt.active;
document.getElementById("ptt.io_pin").value = settings.ptt.io_pin; document.getElementById("ptt.io_pin").value = settings.ptt.io_pin;

BIN
data_embed/script.js.gz
View File

Binary file not shown.

BIN
data_embed/style.css.gz
View File

Binary file not shown.

36
src/web_utils.cpp
View File

@ -100,19 +100,15 @@ namespace WEB_Utils {
Config.battery.voltageAsTelemetry = request->hasParam("battery.voltageAsTelemetry", true); Config.battery.voltageAsTelemetry = request->hasParam("battery.voltageAsTelemetry", true);
Config.battery.sendVoltageAlways = request->hasParam("battery.sendVoltageAlways", true); Config.battery.sendVoltageAlways = request->hasParam("battery.sendVoltageAlways", true);
Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); /*Config.simplifiedTrackerMode = request->hasParam("simplifiedTrackerMode", true);
Config.sendCommentAfterXBeacons = request->getParam("sendCommentAfterXBeacons", true)->value().toInt();
// other Config.path = request->getParam("path", true)->value();
/*Config.simplifiedTrackerMode = request->hasParam("other.simplifiedTrackerMode", true); Config.nonSmartBeaconRate = request->getParam("nonSmartBeaconRate", true)->value().toInt();*/
Config.sendCommentAfterXBeacons = request->getParam("other.sendCommentAfterXBeacons", true)->value().toInt(); Config.rememberStationTime = request->getParam("rememberStationTime", true)->value().toInt();
Config.path = request->getParam("other.path", true)->value(); /*Config.maxDistanceToTracker = request->getParam("maxDistanceToTracker", true)->value().toInt();
Config.nonSmartBeaconRate = request->getParam("other.nonSmartBeaconRate", true)->value().toInt(); Config.standingUpdateTime = request->getParam("standingUpdateTime", true)->value().toInt();
Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); Config.sendAltitude = request->hasParam("sendAltitude", true);
Config.maxDistanceToTracker = request->getParam("other.maxDistanceToTracker", true)->value().toInt(); Config.disableGPS = request->hasParam("disableGPS", true);*/
Config.standingUpdateTime = request->getParam("other.standingUpdateTime", true)->value().toInt();
Config.sendAltitude = request->hasParam("other.sendAltitude", true);
Config.disableGPS = request->hasParam("other.disableGPS", true);*/
//
Config.winlink.password = request->getParam("winlink.password", true)->value(); Config.winlink.password = request->getParam("winlink.password", true)->value();
@ -120,21 +116,21 @@ namespace WEB_Utils {
Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat(); Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat();
Config.bme.sendTelemetry = request->hasParam("bme.sendTelemetry", true); Config.bme.sendTelemetry = request->hasParam("bme.sendTelemetry", true);
/*Config.notification.ledTx = request->hasParam("notification.ledTx", true); Config.notification.ledTx = request->hasParam("notification.ledTx", true);
Config.notification.ledTxPin = request->getParam("notification.ledTxPin", true)->value().toInt(); //Config.notification.ledTxPin = request->getParam("notification.ledTxPin", true)->value().toInt();
Config.notification.ledMessage = request->hasParam("notification.ledMessage", true); Config.notification.ledMessage = request->hasParam("notification.ledMessage", true);
Config.notification.ledMessagePin = request->getParam("notification.ledMessagePin", true)->value().toInt(); //Config.notification.ledMessagePin = request->getParam("notification.ledMessagePin", true)->value().toInt();
Config.notification.ledFlashlight = request->hasParam("notification.ledFlashlight", true); Config.notification.ledFlashlight = request->hasParam("notification.ledFlashlight", true);
Config.notification.ledFlashlightPin = request->getParam("notification.ledFlashlightPin", true)->value().toInt(); //Config.notification.ledFlashlightPin = request->getParam("notification.ledFlashlightPin", true)->value().toInt();
Config.notification.buzzerActive = request->hasParam("notification.buzzerActive", true); Config.notification.buzzerActive = request->hasParam("notification.buzzerActive", true);
Config.notification.buzzerPinTone = request->getParam("notification.buzzerPinTone", true)->value().toInt(); //Config.notification.buzzerPinTone = request->getParam("notification.buzzerPinTone", true)->value().toInt();
Config.notification.buzzerPinVcc = request->getParam("notification.buzzerPinVcc", true)->value().toInt(); //Config.notification.buzzerPinVcc = request->getParam("notification.buzzerPinVcc", true)->value().toInt();
Config.notification.bootUpBeep = request->hasParam("notification.bootUpBeep", true); Config.notification.bootUpBeep = request->hasParam("notification.bootUpBeep", true);
Config.notification.txBeep = request->hasParam("notification.txBeep", true); Config.notification.txBeep = request->hasParam("notification.txBeep", true);
Config.notification.messageRxBeep = request->hasParam("notification.messageRxBeep", true); Config.notification.messageRxBeep = request->hasParam("notification.messageRxBeep", true);
Config.notification.stationBeep = request->hasParam("notification.stationBeep", true); Config.notification.stationBeep = request->hasParam("notification.stationBeep", true);
Config.notification.lowBatteryBeep = request->hasParam("notification.lowBatteryBeep", true); Config.notification.lowBatteryBeep = request->hasParam("notification.lowBatteryBeep", true);
Config.notification.shutDownBeep = request->hasParam("notification.shutDownBeep", true);*/ Config.notification.shutDownBeep = request->hasParam("notification.shutDownBeep", true);
// lora // lora