From fefd424901763af2c2ec861ed6e875b02a130091 Mon Sep 17 00:00:00 2001
From: BJK <58904384+Bjk8kds@users.noreply.github.com>
Date: Sun, 10 May 2026 00:53:07 +0700
Subject: [PATCH] Fix screen geometry update for SH1107 display (#10444)

Added conditional block to update screen geometry for SH1107 128x128.
---
 src/main.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6f78c0b96..2fb2006d8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -731,8 +731,15 @@ void setup()
 #elif defined(USE_SH1107_128_64)
     screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
 #else
-    if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
+    if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO) {
         screen_model = config.display.oled;
+
+        // Fix: update geometry for SH1107 128x128 selected via menu
+        if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128) {
+            screen_geometry = GEOMETRY_128_128;
+            screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // normalize
+        }
+    }
 #endif
 #endif