From 1d288414a5f642ad8d9e65f5648a6340cf21ad20 Mon Sep 17 00:00:00 2001 From: Andrew Moroz Date: Fri, 24 May 2024 00:02:03 -0400 Subject: [PATCH] t-watch-fix: Fully insulate T-Watch free text updates from other hardware platforms --- src/modules/CannedMessageModule.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 5292fec69..9b993ae5a 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -75,9 +75,11 @@ int CannedMessageModule::splitConfiguredMessages() String messages = cannedMessageModuleConfig.messages; +#ifdef T_WATCH_S3 String separator = messages.length() ? "|" : ""; messages = "[---- Free Text ----]" + separator + messages; +#endif // collect all the message parts strncpy(this->messageStore, messages.c_str(), sizeof(this->messageStore)); @@ -141,6 +143,8 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event) } } if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT)) { + +#ifdef T_WATCH_S3 if (this->currentMessageIndex == 0) { this->runState = CANNED_MESSAGE_RUN_STATE_FREETEXT; @@ -150,6 +154,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event) return 0; } +#endif // when inactive, call the onebutton shortpress instead. Activate Module only on up/down if ((this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED)) {