pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-16 01:52:04 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

LonPressTime now configurable

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-10 00:49:58 -05:00
parent bc934e3659
commit d25d513e40
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input/ButtonThread.cpp
View File

@ -28,11 +28,13 @@ ButtonThread::ButtonThread(const char *name) : OSThread(name)
} }
bool ButtonThread::initButton(uint8_t pinNumber, bool activeLow, bool activePullup, uint32_t pullupSense, voidFuncPtr intRoutine, bool ButtonThread::initButton(uint8_t pinNumber, bool activeLow, bool activePullup, uint32_t pullupSense, voidFuncPtr intRoutine,
input_broker_event singlePress, input_broker_event longPress, input_broker_event doublePress, input_broker_event singlePress, input_broker_event longPress, uint16_t longPressTime,
input_broker_event triplePress, input_broker_event shortLong, bool touchQuirk) input_broker_event doublePress, input_broker_event triplePress, input_broker_event shortLong,
bool touchQuirk)
{ {
if (inputBroker) if (inputBroker)
inputBroker->registerSource(this); inputBroker->registerSource(this);
_longPressTime = longPressTime;
_pinNum = pinNumber; _pinNum = pinNumber;
_activeLow = activeLow; _activeLow = activeLow;
_touchQuirk = touchQuirk; _touchQuirk = touchQuirk;
@ -97,9 +99,9 @@ bool ButtonThread::initButton(uint8_t pinNumber, bool activeLow, bool activePull
userButton.setDebounceMs(1); userButton.setDebounceMs(1);
if (screen) { if (screen) {
userButton.setClickMs(20); userButton.setClickMs(20);
userButton.setPressMs(BUTTON_LONGPRESS_MS); userButton.setPressMs(_longPressTime);
} else { } else {
userButton.setPressMs(BUTTON_LONGPRESS_MS * 3); userButton.setPressMs(_longPressTime);
userButton.setClickMs(BUTTON_CLICK_MS); userButton.setClickMs(BUTTON_CLICK_MS);
} }
attachButtonInterrupts(); attachButtonInterrupts();
@ -139,7 +141,7 @@ int32_t ButtonThread::runOnce()
// Progressive lead-up sound system // Progressive lead-up sound system
if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS && if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS &&
(millis() - buttonPressStartTime) < BUTTON_LONGPRESS_MS) { (millis() - buttonPressStartTime) < _longPressTime) {
// Start the progressive sequence if not already active // Start the progressive sequence if not already active
if (!leadUpSequenceActive) { if (!leadUpSequenceActive) {

15
src/input/ButtonThread.h
View File

@ -11,15 +11,6 @@ typedef void (*voidFuncPtr)(void);
#define BUTTON_CLICK_MS 250 #define BUTTON_CLICK_MS 250
#endif #endif
#ifdef HAS_SCREEN
#undef BUTTON_LONGPRESS_MS
#define BUTTON_LONGPRESS_MS 500
#else
#ifndef BUTTON_LONGPRESS_MS
#define BUTTON_LONGPRESS_MS 5000
#endif
#endif
#ifndef BUTTON_TOUCH_MS #ifndef BUTTON_TOUCH_MS
#define BUTTON_TOUCH_MS 400 #define BUTTON_TOUCH_MS 400
#endif #endif
@ -39,8 +30,9 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
static const uint32_t c_holdOffTime = 30000; // hold off 30s after boot static const uint32_t c_holdOffTime = 30000; // hold off 30s after boot
bool initButton(uint8_t pinNumber, bool activeLow, bool activePullup, uint32_t pullupSense, voidFuncPtr intRoutine, bool initButton(uint8_t pinNumber, bool activeLow, bool activePullup, uint32_t pullupSense, voidFuncPtr intRoutine,
input_broker_event singlePress, input_broker_event longPress = INPUT_BROKER_NONE, input_broker_event singlePress, input_broker_event longPress = INPUT_BROKER_NONE,
input_broker_event doublePress = INPUT_BROKER_NONE, input_broker_event triplePress = INPUT_BROKER_NONE, uint16_t longPressTime = 500, input_broker_event doublePress = INPUT_BROKER_NONE,
input_broker_event shortLong = INPUT_BROKER_NONE, bool touchQuirk = false); input_broker_event triplePress = INPUT_BROKER_NONE, input_broker_event shortLong = INPUT_BROKER_NONE,
bool touchQuirk = false);
enum ButtonEventType { enum ButtonEventType {
BUTTON_EVENT_NONE, BUTTON_EVENT_NONE,
@ -81,6 +73,7 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
input_broker_event _shortLong = INPUT_BROKER_NONE; input_broker_event _shortLong = INPUT_BROKER_NONE;
voidFuncPtr _intRoutine = nullptr; voidFuncPtr _intRoutine = nullptr;
uint16_t _longPressTime = 500;
int _pinNum = 0; int _pinNum = 0;
bool _activeLow = true; bool _activeLow = true;
bool _touchQuirk = false; bool _touchQuirk = false;

4
src/main.cpp
View File

@ -924,7 +924,7 @@ void setup()
BaseType_t higherWake = 0; BaseType_t higherWake = 0;
mainDelay.interruptFromISR(&higherWake); mainDelay.interruptFromISR(&higherWake);
}, },
INPUT_BROKER_BACK); INPUT_BROKER_BACK, INPUT_BROKER_SHUTDOWN, 4000);
#endif #endif
#if defined(BUTTON_PIN) #if defined(BUTTON_PIN)
@ -962,7 +962,7 @@ void setup()
BaseType_t higherWake = 0; BaseType_t higherWake = 0;
mainDelay.interruptFromISR(&higherWake); mainDelay.interruptFromISR(&higherWake);
}, },
INPUT_BROKER_USER_PRESS, INPUT_BROKER_SHUTDOWN, INPUT_BROKER_SEND_PING, INPUT_BROKER_GPS_TOGGLE); INPUT_BROKER_USER_PRESS, INPUT_BROKER_SHUTDOWN, 5000, INPUT_BROKER_SEND_PING, INPUT_BROKER_GPS_TOGGLE);
#endif #endif
#endif #endif