diff --git a/src/ButtonThread.h b/src/ButtonThread.h index 9d7fd2ae5..b295f896a 100644 --- a/src/ButtonThread.h +++ b/src/ButtonThread.h @@ -123,9 +123,7 @@ class ButtonThread : public concurrency::OSThread static void userButtonPressedLong() { // LOG_DEBUG("Long press!\n"); - if (screen_found == true) { - screen->adjustBrightness(); - } + screen->adjustBrightness(); // If user button is held down for 10 seconds, shutdown the device. if ((millis() - longPressTime > 10000) && (longPressTime > 0)) { #if defined(ARCH_NRF52) || defined(ARCH_ESP32) diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp index 645132f38..2068025c2 100644 --- a/src/platform/esp32/main-esp32.cpp +++ b/src/platform/esp32/main-esp32.cpp @@ -162,7 +162,7 @@ void esp32Loop() // radio.radioIf.canSleep(); } -void cpuDeepSleep(uint64_t msecToWake) +void cpuDeepSleep(uint32_t msecToWake) { /* Some ESP32 IOs have internal pullups or pulldowns, which are enabled by default. diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp index 1cbe05631..36ddefeb4 100644 --- a/src/platform/nrf52/main-nrf52.cpp +++ b/src/platform/nrf52/main-nrf52.cpp @@ -155,7 +155,7 @@ void nrf52Setup() nRFCrypto.end(); } -void cpuDeepSleep(uint64_t msecToWake) +void cpuDeepSleep(uint32_t msecToWake) { // FIXME, configure RTC or button press to wake us // FIXME, power down SPI, I2C, RAMs diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index fee6e05f9..4e957cb1e 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -16,7 +16,7 @@ void setBluetoothEnable(bool on) // not needed } -void cpuDeepSleep(uint64_t msecs) +void cpuDeepSleep(uint32_t msecs) { notImplemented("cpuDeepSleep"); } diff --git a/src/platform/rp2040/main-rp2040.cpp b/src/platform/rp2040/main-rp2040.cpp index 1de8c5b68..af200f961 100644 --- a/src/platform/rp2040/main-rp2040.cpp +++ b/src/platform/rp2040/main-rp2040.cpp @@ -7,7 +7,7 @@ void setBluetoothEnable(bool on) // not needed } -void cpuDeepSleep(uint64_t msecs) +void cpuDeepSleep(uint32_t msecs) { // not needed } diff --git a/src/platform/stm32wl/main-stm32wl.cpp b/src/platform/stm32wl/main-stm32wl.cpp index 147408441..8ebcb029e 100644 --- a/src/platform/stm32wl/main-stm32wl.cpp +++ b/src/platform/stm32wl/main-stm32wl.cpp @@ -15,7 +15,7 @@ void getMacAddr(uint8_t *dmac) dmac[i] = i; } -void cpuDeepSleep(uint64_t msecToWake) {} +void cpuDeepSleep(uint32_t msecToWake) {} /* pacify libc_nano */ extern "C" { diff --git a/src/sleep.cpp b/src/sleep.cpp index 5fdacb73e..9d2b557ac 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -201,7 +201,7 @@ void doGPSpowersave(bool on) #endif } -void doDeepSleep(uint64_t msecToWake) +void doDeepSleep(uint32_t msecToWake) { if (INCLUDE_vTaskSuspend && (msecToWake == portMAX_DELAY)) { LOG_INFO("Entering deep sleep forever\n"); diff --git a/src/sleep.h b/src/sleep.h index af59a8dad..a4b8f37b5 100644 --- a/src/sleep.h +++ b/src/sleep.h @@ -4,7 +4,7 @@ #include "Observer.h" #include "configuration.h" -void doDeepSleep(uint64_t msecToWake), cpuDeepSleep(uint64_t msecToWake); +void doDeepSleep(uint32_t msecToWake), cpuDeepSleep(uint32_t msecToWake); #ifdef ARCH_ESP32 #include "esp_sleep.h"