mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-10 23:22:05 +00:00
Keymatrix Bugfix: Allow key 3 to send associated text
Feature: setting a text "~" emulates IO5/Userbutton with keymatrix.
This commit is contained in:
parent
b54044fd00
commit
4a2b02347f
@ -176,7 +176,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
|
|||||||
DEBUG_MSG("Canned message event Matrix key pressed\n");
|
DEBUG_MSG("Canned message event Matrix key pressed\n");
|
||||||
// this will send the text immediately on matrix press
|
// this will send the text immediately on matrix press
|
||||||
this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
|
this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
|
||||||
this->payload = event->kbchar;
|
this->payload = MATRIXKEY;
|
||||||
this->currentMessageIndex = event->kbchar -1;
|
this->currentMessageIndex = event->kbchar -1;
|
||||||
this->lastTouchMillis = millis();
|
this->lastTouchMillis = millis();
|
||||||
validEvent = true;
|
validEvent = true;
|
||||||
@ -246,7 +246,12 @@ int32_t CannedMessageModule::runOnce()
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ((this->messagesCount > this->currentMessageIndex) && (strlen(this->messages[this->currentMessageIndex]) > 0)) {
|
if ((this->messagesCount > this->currentMessageIndex) && (strlen(this->messages[this->currentMessageIndex]) > 0)) {
|
||||||
sendText(NODENUM_BROADCAST, this->messages[this->currentMessageIndex], true);
|
if(strcmp (this->messages[this->currentMessageIndex], "~") == 0) {
|
||||||
|
powerFSM.trigger(EVENT_PRESS);
|
||||||
|
return INT32_MAX;
|
||||||
|
} else {
|
||||||
|
sendText(NODENUM_BROADCAST, this->messages[this->currentMessageIndex], true);
|
||||||
|
}
|
||||||
this->runState = CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE;
|
this->runState = CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE;
|
||||||
} else {
|
} else {
|
||||||
DEBUG_MSG("Reset message is empty.\n");
|
DEBUG_MSG("Reset message is empty.\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user