rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-23 03:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the up/down shortcut to launch canned messages (#8370)

Browse Source 
* Remove the up/down shortcut to launch canned messages

* Enabled MQTT and WEBSERVER by default (#8679)

Signed-off-by: kur1k0 <zhuzirun@m5stack.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>

---------

Signed-off-by: kur1k0 <zhuzirun@m5stack.com>
Co-authored-by: Riker <zhuzirun@m5stack.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
Jonathan Bennett
2025-11-30 20:53:15 -06:00
committed by GitHub
parent ce6278f351
commit 7d9f629df3
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/CannedMessageModule.cpp
View File

@@ -427,16 +427,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;
} }
@@ -450,6 +441,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)

2
variants/esp32c6/m5stack_unitc6l/platformio.ini
View File

@@ -22,8 +22,6 @@ build_flags =
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-D HAS_BLUETOOTH=1 -D HAS_BLUETOOTH=1
-D MESHTASTIC_EXCLUDE_WEBSERVER
-D MESHTASTIC_EXCLUDE_MQTT
-DCONFIG_BT_NIMBLE_EXT_ADV=1 -DCONFIG_BT_NIMBLE_EXT_ADV=1
-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2 -DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
-D NIMBLE_TWO -D NIMBLE_TWO