pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-29 07:36:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
HarukiToreda 2025-10-06 01:05:12 -04:00
parent 103f73e7c9
commit b549786bbb
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MessageStore.cpp
View File

@ -1,4 +1,3 @@
#if HAS_SCREEN
#include "MessageStore.h" #include "MessageStore.h"
#include "FSCommon.h" #include "FSCommon.h"
#include "NodeDB.h" #include "NodeDB.h"
@ -393,4 +392,3 @@ void MessageStore::upgradeBootRelativeTimestamps()
// Global definition // Global definition
MessageStore messageStore("default"); MessageStore messageStore("default");
#endif

2
src/MessageStore.h
View File

@ -1,4 +1,3 @@
#if HAS_SCREEN
#pragma once #pragma once
#include "mesh/generated/meshtastic/mesh.pb.h" #include "mesh/generated/meshtastic/mesh.pb.h"
#include <cstdint> #include <cstdint>
@ -102,4 +101,3 @@ class MessageStore
// Global instance (defined in MessageStore.cpp) // Global instance (defined in MessageStore.cpp)
extern MessageStore messageStore; extern MessageStore messageStore;
#endif

3
src/Power.cpp
View File

@ -759,9 +759,8 @@ void Power::shutdown()
#endif #endif
nodeDB->saveToDisk(); nodeDB->saveToDisk();
// === Save live messages before powering off === // === Save live messages before powering off ===
#if HAS_SCREEN
messageStore.saveToFlash(); messageStore.saveToFlash();
#endif
#if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040) #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
#ifdef PIN_LED1 #ifdef PIN_LED1
ledOff(PIN_LED1); ledOff(PIN_LED1);

3
src/graphics/draw/MessageRenderer.h
View File

@ -1,4 +1,3 @@
#if HAS_SCREEN
#pragma once #pragma once
#include "MessageStore.h" // for StoredMessage #include "MessageStore.h" // for StoredMessage
#include "OLEDDisplay.h" #include "OLEDDisplay.h"
@ -61,5 +60,3 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
} // namespace MessageRenderer } // namespace MessageRenderer
} // namespace graphics } // namespace graphics
#endif

2
src/modules/SystemCommandsModule.cpp
View File

@ -78,9 +78,7 @@ int SystemCommandsModule::handleInputEvent(const InputEvent *event)
case INPUT_BROKER_MSG_REBOOT: case INPUT_BROKER_MSG_REBOOT:
IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0)); IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0));
nodeDB->saveToDisk(); nodeDB->saveToDisk();
#if HAS_SCREEN
messageStore.saveToFlash(); messageStore.saveToFlash();
#endif
rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000; rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
// runState = CANNED_MESSAGE_RUN_STATE_INACTIVE; // runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
return true; return true;

4
src/modules/TextMessageModule.cpp
View File

@ -20,10 +20,10 @@ ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp
// We only store/display messages destined for us. // We only store/display messages destined for us.
devicestate.rx_text_message = mp; devicestate.rx_text_message = mp;
devicestate.has_rx_text_message = true; devicestate.has_rx_text_message = true;
#if HAS_SCREEN
// Store in the central message history // Store in the central message history
const StoredMessage &sm = messageStore.addFromPacket(mp); const StoredMessage &sm = messageStore.addFromPacket(mp);
#if HAS_SCREEN
// Pass message to renderer (banner + thread switching + scroll reset) // Pass message to renderer (banner + thread switching + scroll reset)
graphics::MessageRenderer::handleNewMessage(sm, mp); graphics::MessageRenderer::handleNewMessage(sm, mp);
#endif #endif