mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-27 15:02:41 +00:00
Merge 2ca9ae7418 into 799cf0e8b3
This commit is contained in:
commit
732c469f48
@ -360,16 +360,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
|
|||||||
return handleEmotePickerInput(event);
|
return handleEmotePickerInput(event);
|
||||||
|
|
||||||
case CANNED_MESSAGE_RUN_STATE_INACTIVE:
|
case CANNED_MESSAGE_RUN_STATE_INACTIVE:
|
||||||
if (isSelect) {
|
if (event->inputEvent == INPUT_BROKER_ALT_LONG) {
|
||||||
return 0; // Main button press no longer runs through powerFSM
|
|
||||||
}
|
|
||||||
// Let LEFT/RIGHT pass through so frame navigation works
|
|
||||||
if (event->inputEvent == INPUT_BROKER_LEFT || event->inputEvent == INPUT_BROKER_RIGHT) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// Handle UP/DOWN: activate canned message list!
|
|
||||||
if (event->inputEvent == INPUT_BROKER_UP || event->inputEvent == INPUT_BROKER_DOWN ||
|
|
||||||
event->inputEvent == INPUT_BROKER_ALT_LONG) {
|
|
||||||
LaunchWithDestination(NODENUM_BROADCAST);
|
LaunchWithDestination(NODENUM_BROADCAST);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -383,6 +374,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
|
|||||||
// Immediately process the input in the new state (freetext)
|
// Immediately process the input in the new state (freetext)
|
||||||
return handleFreeTextInput(event);
|
return handleFreeTextInput(event);
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// (Other states can be added here as needed)
|
// (Other states can be added here as needed)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user