pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-05 02:59:11 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Guard for no BUTTON_PIN; handle portduino

Browse Source
This commit is contained in:
Todd Herbert 2025-01-13 23:30:39 +13:00
parent f15897e173
commit 8449ba7341
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/ScanAndSelect.cpp
View File

@ -42,11 +42,18 @@ bool ScanAndSelectInput::init()
else else
pin = 0; // GPIO 0 then pin = 0; // GPIO 0 then
// Short circuit: if selected pin conficts with the user button // Short circuit: if selected pin conficts with the user button
#ifdef USERPREFS_BUTTON_PIN #if defined(ARCH_PORTDUINO)
int pinUserButton = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin int pinUserButton = 0;
if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
pinUserButton = settingsMap[user];
}
#elif defined(USERPREFS_BUTTON_PIN)
int pinUserButton = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN;
#elif defined(BUTTON_PIN)
int pinUserButton = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;
#else #else
int pinUserButton = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN; // Resolved button pin int pinUserButton = config.device.button_gpio;
#endif #endif
if (pin == pinUserButton) { if (pin == pinUserButton) {
LOG_ERROR("ScanAndSelect conflict with user button"); LOG_ERROR("ScanAndSelect conflict with user button");