From 890357d579b1905889d160e78a5e9948510a6425 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 05:53:20 -0500
Subject: [PATCH 1/3] Update protobufs (#7693)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
protobufs | 2 +-
src/mesh/generated/meshtastic/config.pb.h | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/protobufs b/protobufs
index be5137698..8985852d7 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit be5137698027f9e9fe6e68d5d5d638049f61ba8f
+Subproject commit 8985852d752de3f7210f9a4a3e0923120ec438b3
diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
index 8a68197f0..67d461611 100644
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -207,10 +207,10 @@ typedef enum _meshtastic_Config_DisplayConfig_OledType {
meshtastic_Config_DisplayConfig_OledType_OLED_SSD1306 = 1,
/* Default / Autodetect */
meshtastic_Config_DisplayConfig_OledType_OLED_SH1106 = 2,
- /* Can not be auto detected but set by proto. Used for 128x128 screens */
- meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3,
/* Can not be auto detected but set by proto. Used for 128x64 screens */
- meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64 = 4
+ meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3,
+ /* Can not be auto detected but set by proto. Used for 128x128 screens */
+ meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128 = 4
} meshtastic_Config_DisplayConfig_OledType;
typedef enum _meshtastic_Config_DisplayConfig_DisplayMode {
@@ -682,8 +682,8 @@ extern "C" {
#define _meshtastic_Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayUnits)(meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL+1))
#define _meshtastic_Config_DisplayConfig_OledType_MIN meshtastic_Config_DisplayConfig_OledType_OLED_AUTO
-#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64
-#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64+1))
+#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128
+#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128+1))
#define _meshtastic_Config_DisplayConfig_DisplayMode_MIN meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT
#define _meshtastic_Config_DisplayConfig_DisplayMode_MAX meshtastic_Config_DisplayConfig_DisplayMode_COLOR
From 11309662a98cccc1a03e5c528a4f3258a1ce1ef6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 09:08:14 -0400
Subject: [PATCH 2/3] Update platformio/espressif32 to v6.12.0 (#7523)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
arch/esp32/esp32.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 8990053eb..ffeaaf4cb 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -4,7 +4,7 @@ extends = arduino_base
custom_esp32_kind = esp32
platform =
# renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
- platformio/espressif32@6.11.0
+ platformio/espressif32@6.12.0
build_src_filter =
${arduino_base.build_src_filter} - - - - -
From 57e1725419009a3f10067577de8a14329fd2a5c0 Mon Sep 17 00:00:00 2001
From: Austin
Date: Wed, 20 Aug 2025 10:10:39 -0400
Subject: [PATCH 3/3] Revert "Update platformio/espressif32 to v6.12.0 (#7523)"
(#7695)
This reverts commit 11309662a98cccc1a03e5c528a4f3258a1ce1ef6.
---
arch/esp32/esp32.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index ffeaaf4cb..8990053eb 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -4,7 +4,7 @@ extends = arduino_base
custom_esp32_kind = esp32
platform =
# renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
- platformio/espressif32@6.12.0
+ platformio/espressif32@6.11.0
build_src_filter =
${arduino_base.build_src_filter} - - - - -