diff --git a/data/igate_conf.json b/data/igate_conf.json index dd4aeb2..5226d0b 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -16,7 +16,9 @@ "symbol": "a", "path": "WIDE1-1", "sendViaAPRSIS": false, - "sendViaRF": false + "sendViaRF": false, + "statusActive": false, + "statusPacket": "" }, "aprs_is": { "active": false, diff --git a/data_embed/index.html b/data_embed/index.html index cf24ac6..46c8f13 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -253,7 +253,36 @@ name="personalNote" id="personalNote" class="form-control" - placeholder="A Couple of words." + placeholder="A couple of words" + /> + +
+
+ + +
+
+
+ +
diff --git a/include/configuration.h b/include/configuration.h index 86fea1e..32c57b9 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -49,6 +49,8 @@ public: bool sendViaAPRSIS; bool gpsActive; bool gpsAmbiguity; + bool statusActive; + String statusPacket; }; class APRS_IS { diff --git a/src/configuration.cpp b/src/configuration.cpp index d89b960..6df7f41 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -62,6 +62,9 @@ void Configuration::writeFile() { data["beacon"]["sendViaRF"] = beacon.sendViaRF; data["beacon"]["path"] = beacon.path; + data["beacon"]["statusActive"] = beacon.statusActive; + data["beacon"]["statusPacket"] = beacon.statusPacket; + data["beacon"]["gpsActive"] = beacon.gpsActive; data["beacon"]["gpsAmbiguity"] = beacon.gpsAmbiguity; @@ -178,6 +181,9 @@ bool Configuration::readFile() { beacon.sendViaAPRSIS = data["beacon"]["sendViaAPRSIS"] | false; beacon.sendViaRF = data["beacon"]["sendViaRF"] | false; + beacon.statusActive = data["beacon"]["statusActive"] | false; + beacon.statusPacket = data["beacon"]["statusPacket"] | ""; + beacon.gpsActive = data["beacon"]["gpsActive"] | false; beacon.gpsAmbiguity = data["beacon"]["gpsAmbiguity"] | false; @@ -295,6 +301,9 @@ void Configuration::init() { beacon.sendViaRF = false; beacon.path = "WIDE1-1"; + beacon.statusActive = false; + beacon.statusPacket = ""; + beacon.gpsActive = false; beacon.gpsAmbiguity = false; diff --git a/src/utils.cpp b/src/utils.cpp index 20494e0..368ca46 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -79,15 +79,15 @@ namespace Utils { } if (WiFi.status() == WL_CONNECTED && Config.aprs_is.active && Config.beacon.sendViaAPRSIS) { delay(1000); - status.concat(",qAC:>https://github.com/richonguzman/LoRa_APRS_iGate "); - status.concat(versionDate); + status.concat(",qAC:>"); + status.concat(Config.beacon.statusPacket); APRS_IS_Utils::upload(status); - SYSLOG_Utils::log(2, status, 0, 0.0, 0); // APRSIS TX + SYSLOG_Utils::log(2, status, 0, 0.0, 0); // APRSIS TX statusAfterBoot = false; } if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) { - status.concat(":>https://github.com/richonguzman/LoRa_APRS_iGate "); - status.concat(versionDate); + status.concat(":>"); + status.concat(Config.beacon.statusPacket); STATION_Utils::addToOutputPacketBuffer(status); statusAfterBoot = false; } @@ -337,7 +337,7 @@ namespace Utils { beaconUpdate = false; } - if (statusAfterBoot) { + if (statusAfterBoot && Config.beacon.statusActive && !Config.beacon.statusPacket.isEmpty()) { processStatus(); } } diff --git a/src/web_utils.cpp b/src/web_utils.cpp index 87fc7cd..01970c1 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -129,19 +129,19 @@ namespace WEB_Utils { Config.wifiAPs.push_back(wifiap); } - Config.callsign = request->getParam("callsign", true)->value(); + Config.callsign = request->getParam("callsign", true)->value(); - Config.wifiAutoAP.password = request->getParam("wifi.autoAP.password", true)->value(); - Config.wifiAutoAP.timeout = request->getParam("wifi.autoAP.timeout", true)->value().toInt(); + Config.wifiAutoAP.password = request->getParam("wifi.autoAP.password", true)->value(); + Config.wifiAutoAP.timeout = request->getParam("wifi.autoAP.timeout", true)->value().toInt(); - Config.aprs_is.active = request->hasParam("aprs_is.active", true); - Config.aprs_is.passcode = request->getParam("aprs_is.passcode", true)->value(); - Config.aprs_is.server = request->getParam("aprs_is.server", true)->value(); - Config.aprs_is.port = request->getParam("aprs_is.port", true)->value().toInt(); - Config.aprs_is.filter = request->getParam("aprs_is.filter", true)->value(); - Config.aprs_is.messagesToRF = request->hasParam("aprs_is.messagesToRF", true); - Config.aprs_is.objectsToRF = request->hasParam("aprs_is.objectsToRF", true); + Config.aprs_is.active = request->hasParam("aprs_is.active", true); + Config.aprs_is.passcode = request->getParam("aprs_is.passcode", true)->value(); + Config.aprs_is.server = request->getParam("aprs_is.server", true)->value(); + Config.aprs_is.port = request->getParam("aprs_is.port", true)->value().toInt(); + Config.aprs_is.filter = request->getParam("aprs_is.filter", true)->value(); + Config.aprs_is.messagesToRF = request->hasParam("aprs_is.messagesToRF", true); + Config.aprs_is.objectsToRF = request->hasParam("aprs_is.objectsToRF", true); Config.beacon.interval = request->getParam("beacon.interval", true)->value().toInt(); @@ -154,6 +154,9 @@ namespace WEB_Utils { Config.beacon.symbol = request->getParam("beacon.symbol", true)->value(); Config.beacon.path = request->getParam("beacon.path", true)->value(); + Config.beacon.statusActive = request->hasParam("beacon.statusActive", true); + Config.beacon.statusPacket = request->getParam("beacon.statusPacket", true)->value(); + Config.beacon.gpsActive = request->hasParam("beacon.gpsActive", true); Config.beacon.gpsAmbiguity = request->hasParam("beacon.gpsAmbiguity", true);