mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-03 04:15:53 +00:00
Merge 0ab5bf3cca
into 3b6eefa8bb
This commit is contained in:
commit
da3afdd159
@ -761,8 +761,17 @@ void setup()
|
|||||||
|
|
||||||
#if defined(USE_SH1107_128_64)
|
#if defined(USE_SH1107_128_64)
|
||||||
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
|
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_128;
|
||||||
|
} else if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64) {
|
||||||
|
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107;
|
||||||
|
screen_geometry = GEOMETRY_128_64;
|
||||||
|
}
|
||||||
|
|
||||||
#if !MESHTASTIC_EXCLUDE_I2C
|
#if !MESHTASTIC_EXCLUDE_I2C
|
||||||
#if !defined(ARCH_STM32WL)
|
#if !defined(ARCH_STM32WL)
|
||||||
if (acc_info.type != ScanI2C::DeviceType::NONE) {
|
if (acc_info.type != ScanI2C::DeviceType::NONE) {
|
||||||
|
Loading…
Reference in New Issue
Block a user