From 109ea16d17545988cd19e692538cab198f9e5dfa Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Sat, 7 Mar 2026 17:08:37 +0100
Subject: [PATCH 1/6] add LilyGo T-Display S3 Pro

---
 meshtastic/mesh.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index d7f6647..4d17449 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -865,6 +865,11 @@ enum HardwareModel {
    */
   MINI_EPAPER_S3 = 125;
 
+  /*
+   * LilyGo T-Display S3 Pro LR1121
+   */
+  TDISPLAY_S3_PRO  = 126;
+
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------
    * 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.

From 0cc9cb224e38523d794fdc5c6bb5c86f49720057 Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Sat, 7 Mar 2026 17:12:43 +0100
Subject: [PATCH 2/6] fix formatting

---
 meshtastic/mesh.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 4d17449..44888e9 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -868,7 +868,7 @@ enum HardwareModel {
   /*
    * LilyGo T-Display S3 Pro LR1121
    */
-  TDISPLAY_S3_PRO  = 126;
+  TDISPLAY_S3_PRO = 126;
 
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------

From bfbd52b9fcc4f857c61a4220b7385324f114adaf Mon Sep 17 00:00:00 2001
From: oscgonfer <oscgonfer@gmail.com>
Date: Sat, 7 Mar 2026 22:28:17 +0100
Subject: [PATCH 3/6] Add SHTXX TelemetrySensorType

---
 meshtastic/telemetry.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto
index 8889718..2aef8ed 100644
--- a/meshtastic/telemetry.proto
+++ b/meshtastic/telemetry.proto
@@ -866,6 +866,11 @@ enum TelemetrySensorType {
    * SCD30 CO2, humidity, temperature sensor
    */
   SCD30 = 49;
+
+  /*
+   * SHT family of sensors for temperature and humidity
+   */
+  SHTXX = 50;
 }
 
 /*

From a4234ead1d75b5e6ff58d517113cd58ef9451457 Mon Sep 17 00:00:00 2001
From: oscgonfer <oscgonfer@gmail.com>
Date: Sun, 8 Mar 2026 11:23:46 +0100
Subject: [PATCH 4/6] Add TODO - REMOVE on SHT31, SHT4X, SHT21 and SHTC3

---
 meshtastic/telemetry.proto | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto
index 2aef8ed..bd27a7b 100644
--- a/meshtastic/telemetry.proto
+++ b/meshtastic/telemetry.proto
@@ -653,7 +653,7 @@ enum TelemetrySensorType {
   BMP280 = 6;
 
   /*
-   * High accuracy temperature and humidity
+   * TODO - REMOVE High accuracy temperature and humidity
    */
   SHTC3 = 7;
 
@@ -678,7 +678,7 @@ enum TelemetrySensorType {
   QMC5883L = 11;
 
   /*
-   * High accuracy temperature and humidity
+   * TODO - REMOVE High accuracy temperature and humidity
    */
   SHT31 = 12;
 
@@ -703,7 +703,7 @@ enum TelemetrySensorType {
   RCWL9620 = 16;
 
   /*
-   * Sensirion High accuracy temperature and humidity
+   * TODO - REMOVE Sensirion High accuracy temperature and humidity
    */
   SHT4X = 17;
 
@@ -853,7 +853,7 @@ enum TelemetrySensorType {
   HDC1080 = 46;
 
   /*
-   * STH21 Temperature and R. Humidity sensor
+   * TODO - REMOVE STH21 Temperature and R. Humidity sensor
    */
   SHT21 = 47;
 

From 29a82c7b63c7ffb8c2d8d52d4fa959b2b3ba815c Mon Sep 17 00:00:00 2001
From: oscgonfer <oscgonfer@gmail.com>
Date: Sun, 8 Mar 2026 12:37:24 +0100
Subject: [PATCH 5/6] Add admin command for SHT accuracy setting

---
 meshtastic/admin.proto | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 5ecf310..ac29cc8 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -666,6 +666,11 @@ message SensorConfig {
    * SCD30 CO2 Sensor configuration
    */
   SCD30_config scd30_config = 3;
+
+  /*
+   * SHTXX temperature and relative humidity sensor configuration
+   */
+  SHTXX_config shtxx_config = 4;
 }
 
 message SCD4X_config {
@@ -748,3 +753,10 @@ message SCD30_config {
    */
   optional bool soft_reset = 6;
 }
+
+message SHTXX_config {
+  /*
+   * Accuracy mode (0 = low, 1 = medium, 2 = high)
+   */
+  optional uint32 set_accuracy = 1;
+}

From 313b9ee168bcfb08cc542b4de730e3ddefbfac16 Mon Sep 17 00:00:00 2001
From: DasAuryn <46376486+DasAuryn@users.noreply.github.com>
Date: Tue, 17 Mar 2026 09:08:35 +0100
Subject: [PATCH 6/6] Add GroupAlarm app portnum

---
 meshtastic/portnums.proto | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto
index 07c8051..f4d22e2 100644
--- a/meshtastic/portnums.proto
+++ b/meshtastic/portnums.proto
@@ -246,6 +246,13 @@ enum PortNum {
    */
   CAYENNE_APP = 77;
 
+  /*
+   * GroupAlarm integration
+   * Used for transporting GroupAlarm-related messages between Meshtastic nodes
+   * and companion applications/services.
+   */
+  GROUPALARM_APP = 112;
+
   /*
    * Private applications should use portnums >= 256.
    * To simplify initial development and testing you can use "PRIVATE_APP"