From 3955a5616e14518c391249731146328527077fb5 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sat, 7 Jun 2025 10:46:03 -0500 Subject: [PATCH] remove legacy string->print() --- src/PowerFSM.cpp | 13 ------------- src/commands.h | 1 - src/graphics/Screen.cpp | 24 ------------------------ src/graphics/Screen.h | 16 ---------------- src/input/ButtonThread.cpp | 7 ------- src/main.cpp | 3 --- src/mesh/NodeDB.cpp | 4 ---- src/modules/RemoteHardwareModule.cpp | 8 -------- src/modules/ReplyModule.cpp | 2 -- 9 files changed, 78 deletions(-) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index 440195a9f..b3a6b17ef 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -184,7 +184,6 @@ static void serialEnter() setBluetoothEnable(false); if (screen) { screen->setOn(true); - screen->print("Serial connected\n"); } } @@ -192,8 +191,6 @@ static void serialExit() { // Turn bluetooth back on when we leave serial stream API setBluetoothEnable(true); - if (screen) - screen->print("Serial disconnected\n"); } static void powerEnter() @@ -208,12 +205,6 @@ static void powerEnter() screen->setOn(true); setBluetoothEnable(true); // within enter() the function getState() returns the state we came from - - // Mothballed: print change of power-state to device screen - /* if (strcmp(powerFSM.getState()->name, "BOOT") != 0 && strcmp(powerFSM.getState()->name, "POWER") != 0 && - strcmp(powerFSM.getState()->name, "DARK") != 0) { - screen->print("Powered...\n"); - }*/ } } @@ -231,10 +222,6 @@ static void powerExit() if (screen) screen->setOn(true); setBluetoothEnable(true); - - // Mothballed: print change of power-state to device screen - /*if (!isPowered()) - screen->print("Unpowered...\n");*/ } static void onEnter() diff --git a/src/commands.h b/src/commands.h index f2b783010..e0bfab330 100644 --- a/src/commands.h +++ b/src/commands.h @@ -12,7 +12,6 @@ enum class Cmd { STOP_ALERT_FRAME, START_FIRMWARE_UPDATE_SCREEN, STOP_BOOT_SCREEN, - PRINT, SHOW_PREV_FRAME, SHOW_NEXT_FRAME }; \ No newline at end of file diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 0429e9e78..93dc0aead 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1201,10 +1201,6 @@ int32_t Screen::runOnce() EINK_ADD_FRAMEFLAG(dispdev, COSMETIC); // E-Ink: Explicitly use full-refresh for next frame setFrames(); break; - case Cmd::PRINT: - handlePrint(cmd.print_text); - free(cmd.print_text); - break; default: LOG_ERROR("Invalid screen cmd"); } @@ -1334,15 +1330,6 @@ void Screen::setFrames(FrameFocus focus) showingNormalScreen = true; indicatorIcons.clear(); -#ifdef USE_EINK - // If user has disabled the screensaver, warn them after boot - static bool warnedScreensaverDisabled = false; - if (config.display.screen_on_secs == 0 && !warnedScreensaverDisabled) { - screen->print("Screensaver disabled\n"); - warnedScreensaverDisabled = true; - } -#endif - moduleFrames = MeshModule::GetMeshModulesWithUIFrames(); LOG_DEBUG("Show %d module frames", moduleFrames.size()); #ifdef DEBUG_PORT @@ -1627,17 +1614,6 @@ void Screen::removeFunctionSymbol(std::string sym) setFastFramerate(); } -void Screen::handlePrint(const char *text) -{ - // the string passed into us probably has a newline, but that would confuse the logging system - // so strip it - LOG_DEBUG("Screen: %.*s", strlen(text) - 1, text); - if (!useDisplay || !showingNormalScreen) - return; - - dispdev->print(text); -} - void Screen::handleOnPress() { // If Canned Messages is using the "Scan and Select" input, dismiss the canned message frame when user button is pressed diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h index 8ee824f25..8f417ba05 100644 --- a/src/graphics/Screen.h +++ b/src/graphics/Screen.h @@ -30,7 +30,6 @@ class Screen void onPress() {} void setup() {} void setOn(bool) {} - void print(const char *) {} void doDeepSleep() {} void forceDisplay(bool forceUiUpdate = false) {} void startFirmwareUpdateScreen() {} @@ -320,20 +319,6 @@ class Screen : public concurrency::OSThread /// Stops showing the boot screen. void stopBootScreen() { enqueueCmd(ScreenCmd{.cmd = Cmd::STOP_BOOT_SCREEN}); } - /// Writes a string to the screen. - void print(const char *text) - { - ScreenCmd cmd; - cmd.cmd = Cmd::PRINT; - // TODO(girts): strdup() here is scary, but we can't use std::string as - // FreeRTOS queue is just dumbly copying memory contents. It would be - // nice if we had a queue that could copy objects by value. - cmd.print_text = strdup(text); - if (!enqueueCmd(cmd)) { - free(cmd.print_text); - } - } - /// Overrides the default utf8 character conversion, to replace empty space with question marks static char customFontTableLookup(const uint8_t ch) { @@ -614,7 +599,6 @@ class Screen : public concurrency::OSThread void handleOnPress(); void handleShowNextFrame(); void handleShowPrevFrame(); - void handlePrint(const char *text); void handleStartFirmwareUpdateScreen(); // Info collected by setFrames method. diff --git a/src/input/ButtonThread.cpp b/src/input/ButtonThread.cpp index 21d788b25..4771dbf1e 100644 --- a/src/input/ButtonThread.cpp +++ b/src/input/ButtonThread.cpp @@ -166,13 +166,6 @@ void ButtonThread::sendAdHocPosition() { service->refreshLocalMeshNode(); auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true); - if (screen) { - if (sentPosition) - screen->print("Sent ad-hoc position\n"); - else - screen->print("Sent ad-hoc nodeinfo\n"); - screen->forceDisplay(true); // Force a new UI frame, then force an EInk update - } playComboTune(); } diff --git a/src/main.cpp b/src/main.cpp index c37b88972..40b0d5a02 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -953,9 +953,6 @@ void setup() screen->setup(); #endif #endif - if (screen) { - screen->print("Started...\n"); - } #ifdef PIN_PWR_DELAY_MS // This may be required to give the peripherals time to power up. diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index b68a28082..8cdcc2dd0 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -1804,10 +1804,6 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location, /// Record an error that should be reported via analytics void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, const char *filename) { - // Print error to screen and serial port - String lcd = String("Critical error ") + code + "!\n"; - if (screen) - screen->print(lcd.c_str()); if (filename) { LOG_ERROR("NOTE! Record critical error %d at %s:%lu", code, filename, address); } else { diff --git a/src/modules/RemoteHardwareModule.cpp b/src/modules/RemoteHardwareModule.cpp index c49c57eda..04cfeb651 100644 --- a/src/modules/RemoteHardwareModule.cpp +++ b/src/modules/RemoteHardwareModule.cpp @@ -83,10 +83,6 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r switch (p.type) { case meshtastic_HardwareMessage_Type_WRITE_GPIOS: { - // Print notification to LCD screen - if (screen) - screen->print("Write GPIOs\n"); - pinModes(p.gpio_mask, OUTPUT, availablePins); for (uint8_t i = 0; i < NUM_GPIOS; i++) { uint64_t mask = 1ULL << i; @@ -99,10 +95,6 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r } case meshtastic_HardwareMessage_Type_READ_GPIOS: { - // Print notification to LCD screen - if (screen) - screen->print("Read GPIOs\n"); - uint64_t res = digitalReads(p.gpio_mask, availablePins); // Send the reply diff --git a/src/modules/ReplyModule.cpp b/src/modules/ReplyModule.cpp index 37cbd30d8..8892aaa97 100644 --- a/src/modules/ReplyModule.cpp +++ b/src/modules/ReplyModule.cpp @@ -14,8 +14,6 @@ meshtastic_MeshPacket *ReplyModule::allocReply() // The incoming message is in p.payload LOG_INFO("Received message from=0x%0x, id=%d, msg=%.*s", req.from, req.id, p.payload.size, p.payload.bytes); #endif - if (screen) - screen->print("Send reply\n"); const char *replyStr = "Message Received"; auto reply = allocDataPacket(); // Allocate a packet for sending