mirror of
https://github.com/richonguzman/LoRa_APRS_iGate.git
synced 2026-05-07 21:54:26 +02:00
indexOf transformation
This commit is contained in:
+23
-21
@@ -77,10 +77,14 @@ namespace QUERY_Utils {
|
||||
answer.concat("?WHERE on development 73!");
|
||||
} */
|
||||
else if (STATION_Utils::isManager(station) && (!queryFromAPRSIS || !Config.remoteManagement.rfOnly)) {
|
||||
if (queryQuestion.indexOf("?EM=OFF") == 0) {
|
||||
if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
|
||||
if (Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
|
||||
answer = (Config.digi.ecoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
|
||||
int digiMode = Config.digi.mode;
|
||||
int digiEcoMode = Config.digi.ecoMode;
|
||||
int radioTxActive = Config.loramodule.txActive;
|
||||
bool onlyRadioActive = radioTxActive && Config.loramodule.rxActive && !Config.aprs_is.active;
|
||||
if (queryQuestion.startsWith("?EM=OFF")) {
|
||||
if ((digiMode == 2 || digiMode == 3) && onlyRadioActive) {
|
||||
if (digiEcoMode == 1 || digiEcoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
|
||||
answer = (digiEcoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
|
||||
Config.digi.ecoMode = 0;
|
||||
Config.display.alwaysOn = true;
|
||||
Config.display.timeout = 10;
|
||||
@@ -92,9 +96,9 @@ namespace QUERY_Utils {
|
||||
} else {
|
||||
answer = "Digipeater Mode control not possible";
|
||||
}
|
||||
} else if (queryQuestion.indexOf("?EM=ON") == 0) {
|
||||
if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
|
||||
if (Config.digi.ecoMode == 0) { // Start Digipeater EcoMode
|
||||
} else if (queryQuestion.startsWith("?EM=ON")) {
|
||||
if ((digiMode == 2 || digiMode == 3) && onlyRadioActive) {
|
||||
if (digiEcoMode == 0) { // Start Digipeater EcoMode
|
||||
answer = "DigiEcoMode:ON";
|
||||
Config.digi.ecoMode = 1;
|
||||
shouldSleepLowVoltage = true; // to make sure all packets in outputPacketBuffer are sent before restart.
|
||||
@@ -105,31 +109,29 @@ namespace QUERY_Utils {
|
||||
} else {
|
||||
answer = "Digipeater Mode control not possible";
|
||||
}
|
||||
} else if (queryQuestion.indexOf("?EM=?") == 0) { // Digipeater EcoMode Status
|
||||
if (Config.digi.ecoMode == 0) {
|
||||
answer = "DigiEcoMode:OFF";
|
||||
} else if (Config.digi.ecoMode == 1) {
|
||||
answer = "DigiEcoMode:ON";
|
||||
} else {
|
||||
answer = "DigiEcoMode:OFF/Only Serial Output";
|
||||
} else if (queryQuestion.startsWith("?EM=?")) { // Digipeater EcoMode Status
|
||||
switch (digiEcoMode) {
|
||||
case 0: answer = "DigiEcoMode:OFF"; break;
|
||||
case 1: answer = "DigiEcoMode:ON"; break;
|
||||
default: answer = "DigiEcoMode:OFF/Only Serial Output";
|
||||
}
|
||||
} else if (queryQuestion.indexOf("?TX=ON") == 0) {
|
||||
if (Config.loramodule.txActive) {
|
||||
} else if (queryQuestion.startsWith("?TX=ON")) {
|
||||
if (radioTxActive) {
|
||||
answer = "TX was ON";
|
||||
} else {
|
||||
Config.loramodule.txActive = true;
|
||||
answer = "TX=ON";
|
||||
}
|
||||
} else if (queryQuestion.indexOf("?TX=OFF") == 0) {
|
||||
if (!Config.loramodule.txActive) {
|
||||
} else if (queryQuestion.startsWith("?TX=OFF")) {
|
||||
if (!radioTxActive) {
|
||||
answer = "TX was OFF";
|
||||
} else {
|
||||
Config.loramodule.txActive = false;
|
||||
answer = "TX=OFF";
|
||||
}
|
||||
} else if (queryQuestion.indexOf("?TX=?") == 0) {
|
||||
answer = (Config.loramodule.txActive) ? "TX=ON" : "TX=OFF";
|
||||
} else if (queryQuestion.indexOf("?COMMIT") == 0) { // saving for next reboot
|
||||
} else if (queryQuestion.startsWith("?TX=?")) {
|
||||
answer = (radioTxActive) ? "TX=ON" : "TX=OFF";
|
||||
} else if (queryQuestion.startsWith("?COMMIT")) { // saving for next reboot
|
||||
answer = "New Config Saved";
|
||||
Config.writeFile();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user