From 8d90c496d0b8793354fb3f04ee0f634e8bfa000b Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Fri, 31 May 2024 07:14:33 -0500
Subject: [PATCH 1/3] Don't send potentially bogus timestamps with fixed
 location (#4001)

---
 src/modules/PositionModule.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
index f3a70f4c5..002111171 100644
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -211,11 +211,11 @@ meshtastic_MeshPacket *PositionModule::allocReply()
     // Strip out any time information before sending packets to other nodes - to keep the wire size small (and because other
     // nodes shouldn't trust it anyways) Note: we allow a device with a local GPS to include the time, so that gpsless
     // devices can get time.
-    if (getRTCQuality() < RTCQualityDevice) {
+    if (getRTCQuality() < RTCQualityGPS) {
         LOG_INFO("Stripping time %u from position send\n", p.time);
         p.time = 0;
     } else {
-        p.time = getValidTime(RTCQualityDevice);
+        p.time = getValidTime(RTCQualityGPS);
         LOG_INFO("Providing time to mesh %u\n", p.time);
     }
 
@@ -454,4 +454,4 @@ void PositionModule::handleNewPosition()
     }
 }
 
-#endif
\ No newline at end of file
+#endif

From 54bccb898e4b8a1f4bdcb3670a94869ff5b9c4fb Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Fri, 31 May 2024 07:15:16 -0500
Subject: [PATCH 2/3] Run tzset() and localtime() in getTZOffset() to ensure
 proper timezone offset (#3999)

* Run tzset() and localtime() in getTZOffset() to ensure proper timezone offset

* Try #2 to fix timezone/DST
---
 src/gps/RTC.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gps/RTC.cpp b/src/gps/RTC.cpp
index 864b246a3..d60e3825c 100644
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -222,9 +222,8 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
  */
 int32_t getTZOffset()
 {
-    time_t now;
+    time_t now = getTime(false);
     struct tm *gmt;
-    now = time(NULL);
     gmt = gmtime(&now);
     gmt->tm_isdst = -1;
     return (int32_t)difftime(now, mktime(gmt));
@@ -265,4 +264,4 @@ time_t gm_mktime(struct tm *tm)
         setenv("TZ", "UTC0", 1);
     }
     return res;
-}
+}
\ No newline at end of file

From c88278724cfaae38e1876880539b6a9b4cb6146d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 07:15:41 -0500
Subject: [PATCH 3/3] [create-pull-request] automated change (#4003)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                                    | 2 +-
 src/mesh/generated/meshtastic/telemetry.pb.h | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/protobufs b/protobufs
index 9e61b8233..a45a6154d 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 9e61b8233181715363aba2aa6c91e85a2d61fc73
+Subproject commit a45a6154d0721027bf63f85cfc5abd9f6fab2422
diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h
index 7748dd6b3..f0ff9bed0 100644
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -57,7 +57,9 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* Lite On LTR-390UV-01 UV Light Sensor */
     meshtastic_TelemetrySensorType_LTR390UV = 21,
     /* AMS TSL25911FN RGB Light Sensor */
-    meshtastic_TelemetrySensorType_TSL25911FN = 22
+    meshtastic_TelemetrySensorType_TSL25911FN = 22,
+    /* AHT10 Integrated temperature and humidity sensor */
+    meshtastic_TelemetrySensorType_AHT10 = 23
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -168,8 +170,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_TSL25911FN
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_TSL25911FN+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_AHT10
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_AHT10+1))