kopia lustrzana https://github.com/meshtastic/firmware
fix parameters and compilation
rodzic
29c13b5c30
commit
a9eb19fc62
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -16,7 +16,7 @@ void setBluetoothEnable(bool on)
|
|||
// not needed
|
||||
}
|
||||
|
||||
void cpuDeepSleep(uint64_t msecs)
|
||||
void cpuDeepSleep(uint32_t msecs)
|
||||
{
|
||||
notImplemented("cpuDeepSleep");
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ void setBluetoothEnable(bool on)
|
|||
// not needed
|
||||
}
|
||||
|
||||
void cpuDeepSleep(uint64_t msecs)
|
||||
void cpuDeepSleep(uint32_t msecs)
|
||||
{
|
||||
// not needed
|
||||
}
|
||||
|
|
|
@ -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" {
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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"
|
||||
|
|
Ładowanie…
Reference in New Issue