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

Added select as the rotary encoder button press

Browse Source
This commit is contained in:
HarukiToreda 2025-05-22 01:42:08 -04:00
parent 9d9fb2d74c
commit d98612a2ca
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/InputBroker.h
View File

@ -19,6 +19,8 @@
#define INPUT_BROKER_MSG_FN_SYMBOL_ON 0xf1 #define INPUT_BROKER_MSG_FN_SYMBOL_ON 0xf1
#define INPUT_BROKER_MSG_FN_SYMBOL_OFF 0xf2 #define INPUT_BROKER_MSG_FN_SYMBOL_OFF 0xf2
#define INPUT_BROKER_MSG_BLUETOOTH_TOGGLE 0xAA #define INPUT_BROKER_MSG_BLUETOOTH_TOGGLE 0xAA
#define INPUT_BROKER_MSG_SELECT 0x0D // Enter key / rotary encoder click
typedef struct _InputEvent { typedef struct _InputEvent {
const char *source; const char *source;

24
src/modules/CannedMessageModule.cpp
View File

@ -251,9 +251,23 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
return 0; // Ignore input while sending return 0; // Ignore input while sending
} }
static int lastDestIndex = -1; // Cache the last index static int lastDestIndex = -1; // Cache the last index
bool selectionChanged = false; // Track if UI needs redrawing bool isUp = false;
bool isUp = event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP); bool isDown = false;
bool isDown = event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN); bool isSelect = false;
// Accept both inputEvent and kbchar from rotary encoder or CardKB
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP) ||
event->kbchar == INPUT_BROKER_MSG_UP) {
isUp = true;
}
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN) ||
event->kbchar == INPUT_BROKER_MSG_DOWN) {
isDown = true;
}
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT) ||
event->kbchar == INPUT_BROKER_MSG_SELECT) {
isSelect = true;
}
if (this->destSelect == CANNED_MESSAGE_DESTINATION_TYPE_NODE) { if (this->destSelect == CANNED_MESSAGE_DESTINATION_TYPE_NODE) {
if (event->kbchar >= 32 && event->kbchar <= 126) { if (event->kbchar >= 32 && event->kbchar <= 126) {
@ -327,7 +341,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
screen->forceDisplay(); screen->forceDisplay();
shouldRedraw = false; shouldRedraw = false;
} }
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT)) { if (isSelect) {
if (this->destIndex < static_cast<int>(this->activeChannelIndices.size())) { if (this->destIndex < static_cast<int>(this->activeChannelIndices.size())) {
this->dest = NODENUM_BROADCAST; this->dest = NODENUM_BROADCAST;
this->channel = this->activeChannelIndices[this->destIndex]; this->channel = this->activeChannelIndices[this->destIndex];
@ -383,7 +397,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
} }
} }
} }
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT)) { if (isSelect) {
if (strcmp(this->messages[this->currentMessageIndex], "[Select Destination]") == 0) { if (strcmp(this->messages[this->currentMessageIndex], "[Select Destination]") == 0) {
returnToCannedList = true; returnToCannedList = true;