Update lib_deps; tidy preprocessor logic

meshtastic · Sep 20, 2024 · cceee51 · cceee51
1 parent c340168
commit cceee51
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
@@ -1670,11 +1670,9 @@ void Screen::setup()
     static_cast<SH1106Wire *>(dispdev)->setSubtype(7);
 #endif
 
-#ifdef USE_ST7789
-// Heltec T114 and T190: honor a custom text color, if defined in variant.h
-#ifdef TFT_MESH
+#if defined(USE_ST7789) && defined(TFT_MESH)
+    // Heltec T114 and T190: honor a custom text color, if defined in variant.h
     static_cast<ST7789Spi *>(dispdev)->setRGB(TFT_MESH);
-#endif
 #endif
 
     // Initialising the UI will init the display too.

diff --git a/variants/heltec_mesh_node_t114/platformio.ini b/variants/heltec_mesh_node_t114/platformio.ini
@@ -14,4 +14,4 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/todd-herbert/meshtastic-st7789-heltec#flip-and-color
+  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini
@@ -9,5 +9,5 @@ build_flags =
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/todd-herbert/meshtastic-st7789-heltec#flip-and-color
+  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
 upload_speed = 921600