diff --git a/src/Power.cpp b/src/Power.cpp index aad5b26ae..460f598b3 100644 --- a/src/Power.cpp +++ b/src/Power.cpp @@ -16,8 +16,8 @@ #include "buzz/buzz.h" #include "configuration.h" #include "main.h" +#include "meshUtils.h" #include "sleep.h" -#include "utils.h" #ifdef DEBUG_HEAP_MQTT #include "mqtt/MQTT.h" @@ -221,10 +221,7 @@ class AnalogBatteryLevel : public HasBatteryLevel /** * return true if there is a battery installed in this unit */ - virtual bool isBatteryConnect() override - { - return getBatteryPercent() != -1; - } + virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; } /// If we see a battery voltage higher than physics allows - assume charger is pumping /// in power @@ -245,10 +242,7 @@ class AnalogBatteryLevel : public HasBatteryLevel /// Assume charging if we have a battery and external power is connected. /// we can't be smart enough to say 'full'? - virtual bool isCharging() override - { - return isBatteryConnect() && isVbusIn(); - } + virtual bool isCharging() override { return isBatteryConnect() && isVbusIn(); } private: /// If we see a battery voltage higher than physics allows - assume charger is pumping diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index d4ed6fdb6..43635c441 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -36,11 +36,11 @@ along with this program. If not, see . #include "mesh-pb-constants.h" #include "mesh/Channels.h" #include "mesh/generated/meshtastic/deviceonly.pb.h" +#include "meshUtils.h" #include "modules/ExternalNotificationModule.h" #include "modules/TextMessageModule.h" #include "sleep.h" #include "target_specific.h" -#include "utils.h" #ifdef ARCH_ESP32 #include "esp_task_wdt.h" diff --git a/src/utils.h b/src/meshUtils.h similarity index 100% rename from src/utils.h rename to src/meshUtils.h diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp index 8abe6d56d..17a312664 100644 --- a/src/platform/esp32/main-esp32.cpp +++ b/src/platform/esp32/main-esp32.cpp @@ -9,10 +9,10 @@ #include "BleOta.h" #include "mesh/http/WiFiAPClient.h" +#include "meshUtils.h" #include "sleep.h" #include "soc/rtc.h" #include "target_specific.h" -#include "utils.h" #include #include #include @@ -220,4 +220,4 @@ void cpuDeepSleep(uint32_t msecToWake) esp_sleep_enable_timer_wakeup(msecToWake * 1000ULL); // call expects usecs esp_deep_sleep_start(); // TBD mA sleep current (battery) -} +} \ No newline at end of file