pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 15:02:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'develop' into compumike/fix-nimble-bluetooth

Browse Source
This commit is contained in:
Jonathan Bennett 2025-10-18 17:00:55 -05:00 committed by GitHub
commit c43084fc36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/SharedUIDisplay.cpp
View File

@ -1,6 +1,8 @@
#include "graphics/SharedUIDisplay.h" #include "configuration.h"
#if HAS_SCREEN
#include "RTC.h" #include "RTC.h"
#include "graphics/ScreenFonts.h" #include "graphics/ScreenFonts.h"
#include "graphics/SharedUIDisplay.h"
#include "graphics/draw/UIRenderer.h" #include "graphics/draw/UIRenderer.h"
#include "main.h" #include "main.h"
#include "meshtastic/config.pb.h" #include "meshtastic/config.pb.h"
@ -423,3 +425,4 @@ std::string sanitizeString(const std::string &input)
} }
} // namespace graphics } // namespace graphics
#endif

4
src/graphics/VirtualKeyboard.cpp
View File

@ -1,5 +1,6 @@
#include "VirtualKeyboard.h"
#include "configuration.h" #include "configuration.h"
#if HAS_SCREEN
#include "VirtualKeyboard.h"
#include "graphics/Screen.h" #include "graphics/Screen.h"
#include "graphics/ScreenFonts.h" #include "graphics/ScreenFonts.h"
#include "graphics/SharedUIDisplay.h" #include "graphics/SharedUIDisplay.h"
@ -736,3 +737,4 @@ bool VirtualKeyboard::isTimedOut() const
} }
} // namespace graphics } // namespace graphics
#endif

3
src/graphics/draw/CompassRenderer.cpp
View File

@ -1,3 +1,5 @@
#include "configuration.h"
#if HAS_SCREEN
#include "CompassRenderer.h" #include "CompassRenderer.h"
#include "NodeDB.h" #include "NodeDB.h"
#include "UIRenderer.h" #include "UIRenderer.h"
@ -135,3 +137,4 @@ uint16_t getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)
} // namespace CompassRenderer } // namespace CompassRenderer
} // namespace graphics } // namespace graphics
#endif

3
src/graphics/emotes.cpp
View File

@ -1,3 +1,5 @@
#include "configuration.h"
#if HAS_SCREEN
#include "emotes.h" #include "emotes.h"
namespace graphics namespace graphics
@ -275,3 +277,4 @@ const unsigned char bell_icon[] PROGMEM = {
#endif #endif
} // namespace graphics } // namespace graphics
#endif

2
src/modules/Telemetry/EnvironmentTelemetry.cpp
View File

@ -361,6 +361,7 @@ bool EnvironmentTelemetryModule::wantUIFrame()
return moduleConfig.telemetry.environment_screen_enabled; return moduleConfig.telemetry.environment_screen_enabled;
} }
#if HAS_SCREEN
void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
// === Setup display === // === Setup display ===
@ -510,6 +511,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
currentY += rowHeight; currentY += rowHeight;
} }
} }
#endif
bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t) bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
{ {

2
src/modules/Telemetry/PowerTelemetry.cpp
View File

@ -108,6 +108,7 @@ bool PowerTelemetryModule::wantUIFrame()
return moduleConfig.telemetry.power_screen_enabled; return moduleConfig.telemetry.power_screen_enabled;
} }
#if HAS_SCREEN
void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
display->clear(); display->clear();
@ -165,6 +166,7 @@ void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *s
drawLine("Ch3", m.ch3_voltage, m.ch3_current); drawLine("Ch3", m.ch3_voltage, m.ch3_current);
} }
} }
#endif
bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t) bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
{ {