diff --git a/data_embed/index.html b/data_embed/index.html index 9186487..07689bb 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -646,7 +646,7 @@ name="digi.mode" id="digi.mode" > - off + OFF WIDE1 (fill-in) Digi @@ -659,16 +659,18 @@ Eco ModesEco Mode - OFF + + OFF (Normal Mode) + - Ultra Eco Mode (Sleep until Packet Rx (WiFiAP/WebUI and Display disabled)) + Ultra Eco Mode (Sleep till Packet Rx (WiFiAP/WebUI & Display disabled)) OFF (Normal Mode without WiFiAP) diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp index 3a30ecd..e18065b 100644 --- a/src/aprs_is_utils.cpp +++ b/src/aprs_is_utils.cpp @@ -370,6 +370,7 @@ namespace APRS_IS_Utils { listenAPRSIS(); } } + if (Config.digi.ecoMode == 1) displayToggle(false); } } \ No newline at end of file diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp index afaca86..635f19c 100644 --- a/src/digi_utils.cpp +++ b/src/digi_utils.cpp @@ -149,7 +149,7 @@ namespace DIGI_Utils { String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket); if (loraPacket != "") { STATION_Utils::addToOutputPacketBuffer(loraPacket); - displayToggle(true); + if (Config.digi.ecoMode != 1) displayToggle(true); lastScreenOn = millis(); } } diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 85e820e..9b0c91d 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -133,7 +133,8 @@ namespace LoRa_Utils { } #ifdef INTERNAL_LED_PIN - if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, HIGH); // disabled in Ultra Eco Mode + //if (Config.digi.ecoMode != 1) + digitalWrite(INTERNAL_LED_PIN, HIGH); // disabled in Ultra Eco Mode #endif int state = radio.transmit("\x3c\xff\x01" + newPacket); transmitFlag = true; @@ -148,7 +149,8 @@ namespace LoRa_Utils { Utils::println(String(state)); } #ifdef INTERNAL_LED_PIN - if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, LOW); // disabled in Ultra Eco Mode + //if (Config.digi.ecoMode != 1) + digitalWrite(INTERNAL_LED_PIN, LOW); // disabled in Ultra Eco Mode #endif if (Config.loramodule.txFreq != Config.loramodule.rxFreq) { changeFreqRx(); @@ -163,7 +165,7 @@ namespace LoRa_Utils { String packet = ""; int state = radio.readData(packet); if (state == RADIOLIB_ERR_NONE) { - // + Utils::println("<--- LoRa Packet Rx : " + packet.substring(3)); } else { packet = ""; } diff --git a/src/sleep_utils.cpp b/src/sleep_utils.cpp index 3ea5791..8766e00 100644 --- a/src/sleep_utils.cpp +++ b/src/sleep_utils.cpp @@ -48,7 +48,9 @@ namespace SLEEP_Utils { } void startSleeping() { - esp_sleep_enable_timer_wakeup(getSecondsToSleep() * 1000000); // 1 min = 60sec + uint32_t timeToSleep = getSecondsToSleep(); + esp_sleep_enable_timer_wakeup(timeToSleep * 1000000); // 1 min = 60sec + Serial.print("(Sleeping : "); Serial.print(timeToSleep); Serial.println("seconds)"); delay(100); LoRa_Utils::wakeRadio(); esp_light_sleep_start();