mirror of
https://github.com/meshtastic/firmware.git
synced 2026-08-01 10:58:30 -04:00
Merge branch 'develop' into codex/packet-auth-policy
This commit is contained in:
@@ -179,7 +179,7 @@ int CannedMessageModule::splitConfiguredMessages()
|
||||
while (i < upTo) {
|
||||
if (this->messageBuffer[i] == '|') {
|
||||
this->messageBuffer[i] = '\0'; // End previous message
|
||||
if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT)
|
||||
if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT - 1)
|
||||
break;
|
||||
tempMessages[tempCount++] = (this->messageBuffer + i + 1);
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ class TouchInkHUDBridge : public Observer<const InputEvent *>
|
||||
|
||||
// Check whether a system applet (e.g. menu) is currently handling input
|
||||
bool systemHandlingInput = false;
|
||||
for (NicheGraphics::InkHUD::SystemApplet *sa : inkhud->systemApplets) {
|
||||
for (const NicheGraphics::InkHUD::SystemApplet *sa : inkhud->systemApplets) {
|
||||
if (sa->handleInput) {
|
||||
systemHandlingInput = true;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user