pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-25 22:20:27 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix mismatch between Exclude FSM include names (#7107)

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-22 18:48:16 -05:00 committed by GitHub
parent 247e05bb10
commit 0808f5215f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PowerFSM.cpp
View File

@ -26,7 +26,7 @@
#ifndef SLEEP_TIME #ifndef SLEEP_TIME
#define SLEEP_TIME 30 #define SLEEP_TIME 30
#endif #endif
#if EXCLUDE_POWER_FSM #if MESHTASTIC_EXCLUDE_POWER_FSM
FakeFsm powerFSM; FakeFsm powerFSM;
void PowerFSM_setup(){}; void PowerFSM_setup(){};
#else #else

2
src/PowerFSM.h
View File

@ -22,7 +22,7 @@
#define EVENT_SHUTDOWN 16 // force a full shutdown now (not just sleep) #define EVENT_SHUTDOWN 16 // force a full shutdown now (not just sleep)
#define EVENT_INPUT 17 // input broker wants something, we need to wake up and enable screen #define EVENT_INPUT 17 // input broker wants something, we need to wake up and enable screen
#if EXCLUDE_POWER_FSM #if MESHTASTIC_EXCLUDE_POWER_FSM
class FakeFsm class FakeFsm
{ {
public: public:

2
src/PowerFSMThread.h
View File

@ -18,7 +18,7 @@ class PowerFSMThread : public OSThread
protected: protected:
int32_t runOnce() override int32_t runOnce() override
{ {
#if !EXCLUDE_POWER_FSM #if !MESHTASTIC_EXCLUDE_POWER_FSM
powerFSM.run_machine(); powerFSM.run_machine();
/// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake

2
src/modules/AdminModule.cpp
View File

@ -1137,7 +1137,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
#endif #endif
#endif #endif
conn.has_serial = true; // No serial-less devices conn.has_serial = true; // No serial-less devices
#if !EXCLUDE_POWER_FSM #if !MESHTASTIC_EXCLUDE_POWER_FSM
conn.serial.is_connected = powerFSM.getState() == &stateSERIAL; conn.serial.is_connected = powerFSM.getState() == &stateSERIAL;
#else #else
conn.serial.is_connected = powerFSM.getState(); conn.serial.is_connected = powerFSM.getState();