pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 12:20:43 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2264-feature-check-for-low-heap-before-adding-to-nodedb-was-reboot-loop-heap-too-low

Browse Source
This commit is contained in:
Thomas Göttgens 2023-04-13 23:09:33 +02:00 committed by GitHub
commit ec44ca49fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -85,7 +85,7 @@ lib_deps =
${env.lib_deps} ${env.lib_deps}
mprograms/QMC5883LCompass@^1.1.1 mprograms/QMC5883LCompass@^1.1.1
end2endzone/NonBlockingRTTTL@^1.3.0 end2endzone/NonBlockingRTTTL@^1.3.0
https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76 https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da
build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0 build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0
build_src_filter = ${env.build_src_filter} -<platform/portduino/> build_src_filter = ${env.build_src_filter} -<platform/portduino/>

5
src/ButtonThread.h
View File

@ -123,9 +123,8 @@ class ButtonThread : public concurrency::OSThread
static void userButtonPressedLong() static void userButtonPressedLong()
{ {
// LOG_DEBUG("Long press!\n"); // LOG_DEBUG("Long press!\n");
screen->adjustBrightness(); // If user button is held down for 5 seconds, shutdown the device.
// If user button is held down for 10 seconds, shutdown the device. if ((millis() - longPressTime > 5000) && (longPressTime > 0)) {
if ((millis() - longPressTime > 10000) && (longPressTime > 0)) {
#if defined(ARCH_NRF52) || defined(ARCH_ESP32) #if defined(ARCH_NRF52) || defined(ARCH_ESP32)
// Do actual shutdown when button released, otherwise the button release // Do actual shutdown when button released, otherwise the button release
// may wake the board immediatedly. // may wake the board immediatedly.