Skip to content

Commit c1f4f79

Browse files
committed
Revert "128row display (#7511)"
This reverts commit d1f3c3c.
1 parent 7b874cf commit c1f4f79

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/main.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -774,17 +774,8 @@ void setup()
774774

775775
#if defined(USE_SH1107_128_64)
776776
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
777-
screen_geometry = GEOMETRY_128_64;
778777
#endif
779778

780-
// if we have one of the fixed overrides in the settings, adjust display type accordingly.
781-
if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107) {
782-
screen_geometry = GEOMETRY_128_128;
783-
} else if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64) {
784-
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107;
785-
screen_geometry = GEOMETRY_128_64;
786-
}
787-
788779
#if !MESHTASTIC_EXCLUDE_I2C
789780
#if !defined(ARCH_STM32WL)
790781
if (acc_info.type != ScanI2C::DeviceType::NONE) {
@@ -830,7 +821,7 @@ void setup()
830821
#elif !defined(ARCH_ESP32) // ARCH_RP2040
831822
SPI.begin();
832823
#else
833-
// ESP32
824+
// ESP32
834825
#if defined(HW_SPI1_DEVICE)
835826
SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
836827
LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);

0 commit comments

Comments
 (0)