Merge branch 'master' into 128-redux

Line
2026-06-06 02:18:42 +00:00 · 2026-02-12 17:09:56 +01:00 · 2025-08-20 10:10:19 -05:00 · 2025-08-20 06:01:21 -05:00 · 2025-08-20 06:00:24 -05:00
1 changed files with 8 additions and 5 deletions
@@ -771,16 +771,19 @@ void setup()
    if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
        screen_model = config.display.oled;

-#if defined(USE_SH1107)
-    screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128
-    screen_geometry = GEOMETRY_128_128;
-#endif
-
 #if defined(USE_SH1107_128_64)
    screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
+    screen_geometry = GEOMETRY_128_64;
 #endif
 #endif

+    // if we have one of the fixed overrides in the settings, adjust display type accordingly.
+    if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107) {
+        screen_geometry = GEOMETRY_128_64;
+    } else if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128) {
+        screen_geometry = GEOMETRY_128_128;
+    }
+
 #if !MESHTASTIC_EXCLUDE_I2C
 #if !defined(ARCH_STM32WL)
    if (acc_info.type != ScanI2C::DeviceType::NONE) {
Author	SHA1	Message	Date
Thomas Göttgens	5a3afc756a	Merge branch 'master' into 128-redux	2026-02-12 17:09:56 +01:00
Ben Meadors	9d222c9a55	Merge branch 'master' into 128-redux	2025-08-20 10:10:19 -05:00
Ben Meadors	2dd4ca8c52	Line	2025-08-20 06:01:21 -05:00
Ben Meadors	2a50ae05dd	Account for 128x128 SH1107 displays	2025-08-20 06:00:24 -05:00