From c44626cb42b8341aedd4d4cc3d4259acb53e6131 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Sat, 21 Dec 2024 17:46:10 +0100 Subject: [PATCH] Unclutter main.cpp --- src/main.cpp | 252 ++++++++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 136 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b9d2ae7..845de01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,152 +22,132 @@ uint wifiLostConnection; uint priceNotifyLostConnection = 0; uint blockNotifyLostConnection = 0; -// char ptrTaskList[1500]; -extern "C" void app_main() -{ +int64_t getUptime() { + return esp_timer_get_time() / 1000000; +} + +void handlePriceNotifyDisconnection() { + if (priceNotifyLostConnection == 0) { + priceNotifyLostConnection = getUptime(); + Serial.println(F("Lost price notification connection, trying to reconnect...")); + } + + if ((getUptime() - priceNotifyLostConnection) > 300) { // 5 minutes timeout + Serial.println(F("Price notification connection lost for 5 minutes, restarting handler...")); + restartPriceNotify(); + priceNotifyLostConnection = 0; + } +} + +void handleBlockNotifyDisconnection() { + if (blockNotifyLostConnection == 0) { + blockNotifyLostConnection = getUptime(); + Serial.println(F("Lost block notification connection, trying to reconnect...")); + } + + if ((getUptime() - blockNotifyLostConnection) > 300) { // 5 minutes timeout + Serial.println(F("Block notification connection lost for 5 minutes, restarting handler...")); + restartBlockNotify(); + blockNotifyLostConnection = 0; + } +} + +void handleFrontlight() { +#ifdef HAS_FRONTLIGHT + if (hasLightLevel() && preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE) != 0) { + uint lightLevel = getLightLevel(); + uint luxThreshold = preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE); + + if (lightLevel <= 1 && preferences.getBool("flOffWhenDark", DEFAULT_FL_OFF_WHEN_DARK)) { + if (frontlightIsOn()) frontlightFadeOutAll(); + } else if (lightLevel < luxThreshold && !frontlightIsOn()) { + frontlightFadeInAll(); + } else if (frontlightIsOn() && lightLevel > luxThreshold) { + frontlightFadeOutAll(); + } + } +#endif +} + +void checkWiFiConnection() { + if (!WiFi.isConnected()) { + if (!wifiLostConnection) { + wifiLostConnection = getUptime(); + Serial.println(F("Lost WiFi connection, trying to reconnect...")); + } + if ((getUptime() - wifiLostConnection) > 600) { + Serial.println(F("Still no connection after 10 minutes, restarting...")); + delay(2000); + ESP.restart(); + } + WiFi.begin(); + } else if (wifiLostConnection) { + wifiLostConnection = 0; + Serial.println(F("Connection restored, reset timer.")); + } +} + +void checkMissedBlocks() { + Serial.println(F("Long time (45 min) since last block, checking if I missed anything...")); + int currentBlock = getBlockFetch(); + if (currentBlock != -1) { + if (currentBlock != getBlockHeight()) { + Serial.println(F("Detected stuck block height... restarting block handler.")); + restartBlockNotify(); + } + setLastBlockUpdate(getUptime()); + } +} + + +void monitorDataConnections() { + // Price notification monitoring + if (getPriceNotifyInit() && !preferences.getBool("fetchEurPrice", DEFAULT_FETCH_EUR_PRICE) && !isPriceNotifyConnected()) { + handlePriceNotifyDisconnection(); + } else if (priceNotifyLostConnection > 0 && isPriceNotifyConnected()) { + priceNotifyLostConnection = 0; + } + + // Block notification monitoring + if (getBlockNotifyInit() && !isBlockNotifyConnected()) { + handleBlockNotifyDisconnection(); + } else if (blockNotifyLostConnection > 0 && isBlockNotifyConnected()) { + blockNotifyLostConnection = 0; + } + + // Check for missed price updates + if ((getLastPriceUpdate(CURRENCY_USD) - getUptime()) > (preferences.getUInt("minSecPriceUpd", DEFAULT_SECONDS_BETWEEN_PRICE_UPDATE) * 5)) { + Serial.println(F("Detected 5 missed price updates... restarting price handler.")); + restartPriceNotify(); + priceNotifyLostConnection = 0; + } + + // Check for missed blocks + if ((getLastBlockUpdate() - getUptime()) > 45 * 60) { + checkMissedBlocks(); + } +} + +extern "C" void app_main() { initArduino(); - Serial.begin(115200); setup(); - while (true) - { - // vTaskList(ptrTaskList); - // Serial.println(F("**********************************")); - // Serial.println(F("Task State Prio Stack Num")); - // Serial.println(F("**********************************")); - // Serial.print(ptrTaskList); - // Serial.println(F("**********************************")); - if (eventSourceTaskHandle != NULL) + while (true) { + if (eventSourceTaskHandle != NULL) { xTaskNotifyGive(eventSourceTaskHandle); + } - int64_t currentUptime = esp_timer_get_time() / 1000000; - ; - - if (!getIsOTAUpdating()) - { -#ifdef HAS_FRONTLIGHT - if (hasLightLevel()) { - if (preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE) != 0) - { - if (hasLightLevel() && getLightLevel() <= 1 && preferences.getBool("flOffWhenDark", DEFAULT_FL_OFF_WHEN_DARK)) - { - if (frontlightIsOn()) { - frontlightFadeOutAll(); - } - } - else if (hasLightLevel() && getLightLevel() < preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE) && !frontlightIsOn()) - { - frontlightFadeInAll(); - } - else if (frontlightIsOn() && getLightLevel() > preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE)) - { - frontlightFadeOutAll(); - } - } - } -#endif + if (!getIsOTAUpdating()) { + handleFrontlight(); + checkWiFiConnection(); + monitorDataConnections(); - if (!WiFi.isConnected()) - { - if (!wifiLostConnection) - { - wifiLostConnection = currentUptime; - Serial.println(F("Lost WiFi connection, trying to reconnect...")); - } - - if ((currentUptime - wifiLostConnection) > 600) - { - Serial.println(F("Still no connection after 10 minutes, restarting...")); - delay(2000); - ESP.restart(); - } - - WiFi.begin(); - } - else if (wifiLostConnection) - { - wifiLostConnection = 0; - Serial.println(F("Connection restored, reset timer.")); - } - - if (getPriceNotifyInit() && !preferences.getBool("fetchEurPrice", DEFAULT_FETCH_EUR_PRICE) && !isPriceNotifyConnected()) - { - priceNotifyLostConnection++; - Serial.println(F("Lost price data connection...")); - queueLedEffect(LED_DATA_PRICE_ERROR); - - // if price WS connection does not come back after 6*5 seconds, destroy and recreate - if (priceNotifyLostConnection > 6) - { - Serial.println(F("Restarting price handler...")); - - restartPriceNotify(); - // setupPriceNotify(); - priceNotifyLostConnection = 0; - } - } - else if (priceNotifyLostConnection > 0 && isPriceNotifyConnected()) - { - priceNotifyLostConnection = 0; - } - - if (getBlockNotifyInit() && !isBlockNotifyConnected()) - { - blockNotifyLostConnection++; - Serial.println(F("Lost block data connection...")); - queueLedEffect(LED_DATA_BLOCK_ERROR); - // if mempool WS connection does not come back after 6*5 seconds, destroy and recreate - if (blockNotifyLostConnection > 6) - { - Serial.println(F("Restarting block handler...")); - - restartBlockNotify(); - // setupBlockNotify(); - blockNotifyLostConnection = 0; - } - } - else if (blockNotifyLostConnection > 0 && isBlockNotifyConnected()) - { - blockNotifyLostConnection = 0; - } - - // if more than 5 price updates are missed, there is probably something wrong, reconnect - if ((getLastPriceUpdate(CURRENCY_USD) - currentUptime) > (preferences.getUInt("minSecPriceUpd", DEFAULT_SECONDS_BETWEEN_PRICE_UPDATE) * 5)) - { - Serial.println(F("Detected 5 missed price updates... restarting price handler.")); - - restartPriceNotify(); - // setupPriceNotify(); - - priceNotifyLostConnection = 0; - } - - // If after 45 minutes no mempool blocks, check the rest API - if ((getLastBlockUpdate() - currentUptime) > 45 * 60) - { - Serial.println(F("Long time (45 min) since last block, checking if I missed anything...")); - int currentBlock = getBlockFetch(); - if (currentBlock != -1) - { - if (currentBlock != getBlockHeight()) - { - Serial.println(F("Detected stuck block height... restarting block handler.")); - // Mempool source stuck, restart - restartBlockNotify(); - // setupBlockNotify(); - } - // set last block update so it doesn't fetch for 45 minutes - setLastBlockUpdate(currentUptime); - } - } - - if (currentUptime - getLastTimeSync() > 24 * 60 * 60) - { + if (getUptime() - getLastTimeSync() > 24 * 60 * 60) { Serial.println(F("Last time update is longer than 24 hours ago, sync again")); syncTime(); - }; + } } vTaskDelay(pdMS_TO_TICKS(5000));