ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-14 15:31:31 +10:00
Code Releases Activity

replace screens with unique_ptr (#11163)

Browse Source
This commit is contained in:
Jorropo
2026-07-25 11:51:13 +00:00
committed by GitHub
parent abf217c38d
commit 9e529da460
15 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+4 -4
View File
@@ -212,7 +212,7 @@ using namespace concurrency;
volatile static const char slipstreamTZString[] = {USERPREFS_TZ_STRING};
// We always create a screen object, but we only init it if we find the hardware
graphics::Screen *screen = nullptr;
std::unique_ptr<graphics::Screen> screen = nullptr;
// Global power status
meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();
@@ -966,15 +966,15 @@ void setup()
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
#if defined(HAS_SPI_TFT) || defined(USE_EINK) || defined(USE_SPISSD1306)
screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
screen = std::make_unique<graphics::Screen>(screen_found, screen_model, screen_geometry);
#elif defined(ARCH_PORTDUINO)
if ((screen_found.port != ScanI2C::I2CPort::NO_I2C || portduino_config.displayPanel) &&
config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
screen = std::make_unique<graphics::Screen>(screen_found, screen_model, screen_geometry);
}
#else
if (screen_found.port != ScanI2C::I2CPort::NO_I2C)
screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
screen = std::make_unique<graphics::Screen>(screen_found, screen_model, screen_geometry);
#endif
}
#endif // HAS_SCREEN