Merge pull request #8401 from meshtastic/master

Backmerge Master
2025-10-27 15:02:41 +00:00 · 2025-10-19 07:31:03 -05:00 · 2025-10-19 07:31:03 -05:00 · 6f2241751e
commit 6f2241751e
parent f2a63faddd ffb168be00
3 changed files with 8 additions and 4 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 38638f19f84ad886222b484d6bf5a8459aed8c7e
+Subproject commit bf149bbdcce45ba7cd8643db7cb25e5c8815072b
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@ -282,6 +282,8 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V2 = 113,
    /* LilyGo T-Watch Ultra */
    meshtastic_HardwareModel_T_WATCH_ULTRA = 114,
    /* Elecrow ThinkNode M3 */
    meshtastic_HardwareModel_THINKNODE_M3 = 115,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@ -101,7 +101,9 @@ typedef enum _meshtastic_TelemetrySensorType {
    /* SEN5X PM SENSORS */
    meshtastic_TelemetrySensorType_SEN5X = 43,
    /* TSL2561 light sensor */
-    meshtastic_TelemetrySensorType_TSL2561 = 44
+    meshtastic_TelemetrySensorType_TSL2561 = 44,
    /* BH1750 light sensor */
    meshtastic_TelemetrySensorType_BH1750 = 45
 } meshtastic_TelemetrySensorType;
 /* Struct definitions */
@ -438,8 +440,8 @@ extern "C" {
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_TSL2561
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_BH1750
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_TSL2561+1))
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_BH1750+1))
		`@ -1 +1 @@`
			`Subproject commit 38638f19f84ad886222b484d6bf5a8459aed8c7e`				`Subproject commit bf149bbdcce45ba7cd8643db7cb25e5c8815072b`