mirror/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-08 23:48:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into t-watch-fixes

Browse Source
This commit is contained in:
Manuel
2023-08-08 18:21:57 +02:00
committed by GitHub
parent 0fe99b0caa f9798b7dda
commit 9a7777dbdb
38 changed files with 909 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/CannedMessageModule.cpp
View File

@@ -10,6 +10,10 @@
#include "main.h" // for cardkb_found
#ifndef INPUTBROKER_MATRIX_TYPE
#define INPUTBROKER_MATRIX_TYPE 0
#endif
#ifdef OLED_RU
#include "graphics/fonts/OLEDDisplayFontsRU.h"
#endif
@@ -62,7 +66,7 @@ CannedMessageModule::CannedMessageModule()
if (moduleConfig.canned_message.enabled) {
this->loadProtoForModule();
if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address != CARDKB_ADDR) &&
(cardkb_found.address != TDECK_KB_ADDR)) {
(cardkb_found.address != TDECK_KB_ADDR) && !INPUTBROKER_MATRIX_TYPE) {
LOG_INFO("CannedMessageModule: No messages are configured. Module is disabled\n");
this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
disable();