Remove noop CANNED_MESSAGE_MODULE_ENABLE define

2026-01-29 13:12:04 +00:00 · 2026-01-28 21:25:10 -06:00
parent 1d219a93ab
commit 44787839cd
20 changed files with 1 additions and 27 deletions
--- a/src/input/SerialKeyboard.cpp
+++ b/src/input/SerialKeyboard.cpp
@@ -5,7 +5,6 @@
 SerialKeyboard *globalSerialKeyboard = nullptr;

 #ifdef INPUTBROKER_SERIAL_TYPE
-#define CANNED_MESSAGE_MODULE_ENABLE 1 // in case it's not set in the variant file

 #if INPUTBROKER_SERIAL_TYPE == 1 // It's a Chatter
 // 3 SHIFT level (lower case, upper case, numbers), up to 4 repeated presses, button number
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -130,8 +130,7 @@ CannedMessageModule::CannedMessageModule()
    : SinglePortModule("canned", meshtastic_PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("CannedMessage")
 {
    this->loadProtoForModule();
-    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE &&
-        !CANNED_MESSAGE_MODULE_ENABLE) {
+    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE) {
        LOG_INFO("CannedMessageModule: No messages are configured. Module is disabled");
        this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
        disable();
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -27,10 +27,6 @@ enum CannedMessageModuleIconType { shift, backspace, space, enter };
 #define CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT 50
 #define CANNED_MESSAGE_MODULE_MESSAGES_SIZE 800

-#ifndef CANNED_MESSAGE_MODULE_ENABLE
-#define CANNED_MESSAGE_MODULE_ENABLE 0
-#endif
-
 // ============================
 //        Data Structures
 // ============================
--- a/variants/esp32/chatter2/variant.h
+++ b/variants/esp32/chatter2/variant.h
@@ -98,7 +98,6 @@
 #define KB_LOAD 21 // load values from the switch and store in shift register
 #define KB_CLK 22  // clock pin for serial data out
 #define KB_DATA 23 // data pin
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //
--- a/variants/esp32/tbeam/variant.h
+++ b/variants/esp32/tbeam/variant.h
@@ -57,7 +57,6 @@
 #ifndef TOUCH_IRQ
 #define TOUCH_IRQ -1
 #endif
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1

 #define ST7796_NSS 25
--- a/variants/esp32s3/hackaday-communicator/variant.h
+++ b/variants/esp32s3/hackaday-communicator/variant.h
@@ -31,7 +31,6 @@
 // #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 // #define KB_BL_PIN 46                   // not used for now
 #define KB_INT 13
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 #define TFT_DC 39
 #define TFT_CS 41
--- a/variants/esp32s3/picomputer-s3/variant.h
+++ b/variants/esp32s3/picomputer-s3/variant.h
@@ -52,8 +52,6 @@
 // Picomputer gets a white on black display
 #define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 #define INPUTBROKER_MATRIX_TYPE 1

 #define KEYS_COLS                                                                                                                \
--- a/variants/esp32s3/rak_wismesh_tap_v2/variant.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -50,7 +50,6 @@
 #define HAS_BUTTON 1
 #define BUTTON_PIN 0

-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1

 #define BATTERY_PIN 1
--- a/variants/esp32s3/t-deck-pro/variant.h
+++ b/variants/esp32s3/t-deck-pro/variant.h
@@ -43,7 +43,6 @@

 // TCA8418 keyboard
 #define KB_BL_PIN 42
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 // microphone PCM5102A
 #define PCM5102A_SCK 47
--- a/variants/esp32s3/t-deck/variant.h
+++ b/variants/esp32s3/t-deck/variant.h
@@ -61,7 +61,6 @@
 #define KB_POWERON 10                  // must be set to HIGH
 #define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
 #define KB_BL_PIN 46                   // not used for now
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 // trackball
 #define HAS_TRACKBALL 1
--- a/variants/esp32s3/tlora-pager/variant.h
+++ b/variants/esp32s3/tlora-pager/variant.h
@@ -61,7 +61,6 @@
 #define I2C_NO_RESCAN
 #define KB_BL_PIN 46
 #define KB_INT 6
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 // audio codec ES8311
 #define HAS_I2S
--- a/variants/esp32s3/tracksenger/internal/variant.h
+++ b/variants/esp32s3/tracksenger/internal/variant.h
@@ -78,7 +78,6 @@
 // keyboard changes

 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 #define INPUTBROKER_MATRIX_TYPE 1

--- a/variants/esp32s3/tracksenger/lcd/variant.h
+++ b/variants/esp32s3/tracksenger/lcd/variant.h
@@ -102,7 +102,6 @@
 // keyboard changes

 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 #define INPUTBROKER_MATRIX_TYPE 1

--- a/variants/esp32s3/tracksenger/oled/variant.h
+++ b/variants/esp32s3/tracksenger/oled/variant.h
@@ -79,7 +79,6 @@
 // keyboard changes

 #define PIN_BUZZER 43
-#define CANNED_MESSAGE_MODULE_ENABLE 1

 #define INPUTBROKER_MATRIX_TYPE 1

--- a/variants/native/portduino-buildroot/variant.h
+++ b/variants/native/portduino-buildroot/variant.h
@@ -1,6 +1,5 @@
 #define HAS_SCREEN 1
 #define USE_TFTDISPLAY 1
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define HAS_GPS 1
 #define MAX_RX_TOPHONE portduino_config.maxtophone
 #define MAX_NUM_NODES portduino_config.MaxNodes
--- a/variants/native/portduino/variant.h
+++ b/variants/native/portduino/variant.h
@@ -2,7 +2,6 @@
 #define HAS_SCREEN 1
 #endif
 #define USE_TFTDISPLAY 1
-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define HAS_GPS 1
 #define MAX_RX_TOPHONE portduino_config.maxtophone
 #define MAX_NUM_NODES portduino_config.MaxNodes
--- a/variants/nrf52840/meshtiny/variant.h
+++ b/variants/nrf52840/meshtiny/variant.h
@@ -66,8 +66,6 @@ extern "C" {
 #define INPUTDRIVER_ENCODER_BTN 28
 #define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 150

-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 /*
 * Buzzer - PWM
 */
--- a/variants/nrf52840/rak_wismeshtap/variant.h
+++ b/variants/nrf52840/rak_wismeshtap/variant.h
@@ -311,7 +311,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define USE_POWERSAVE
 #define SLEEP_TIME 120

-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1
 /*----------------------------------------------------------------------------
 *        Arduino objects - C++ only
--- a/variants/nrf52840/seeed_wio_tracker_L1/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1/variant.h
@@ -158,8 +158,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 //  joystick
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

-#define CANNED_MESSAGE_MODULE_ENABLE 1
-
 #define CANNED_MESSAGE_ADD_CONFIRMATION 1

 // trackball
--- a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
@@ -177,7 +177,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define TB_PRESS 29
 #define TB_DIRECTION FALLING

-#define CANNED_MESSAGE_MODULE_ENABLE 1
 #define CANNED_MESSAGE_ADD_CONFIRMATION 1

 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━