From fde27e4ef0fcee967063ba353422ed5f9a1c4790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 18 Jan 2025 13:30:43 +0100
Subject: [PATCH 1/3] add dfrobot gravity rain gauge (#646)

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

diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto
index 688abf7..4b5b3f2 100644
--- a/meshtastic/telemetry.proto
+++ b/meshtastic/telemetry.proto
@@ -134,6 +134,16 @@ message EnvironmentMetrics {
   */
   optional float radiation = 18;
 
+  /*
+  * Rainfall in the last hour in mm
+  */
+  optional float rainfall_1h = 19;
+
+    /*
+  * Rainfall in the last 24 hours in mm
+  */
+  optional float rainfall_24h = 20;
+
 }
 
 /*
@@ -542,6 +552,11 @@ enum TelemetrySensorType {
    */
   INA226 = 34;
 
+  /*
+   * DFRobot Gravity tipping bucket rain gauge
+   */
+  DFROBOT_RAIN = 35;
+
 }
 
 /*

From 7f13df0e5f7cbb07f0e6f3a57c0d86ad448738db Mon Sep 17 00:00:00 2001
From: A_Ponzano <agnese.ponzano@gmail.com>
Date: Sun, 19 Jan 2025 15:07:06 +0100
Subject: [PATCH 2/3] Update mesh.proto with meshlink (#644)

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

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 556295f..502e65a 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -670,6 +670,11 @@ enum HardwareModel {
    */
   MESH_TAB = 86;
 
+  /*
+   * MeshLink board developed by LoraItalia. NRF52840, eByte E22900M22S (Will also come with other frequencies), 25w MPPT solar charger (5v,12v,18v selectable), support for gps, buzzer, oled or e-ink display, 10 gpios, hardware watchdog
+   * https://www.loraitalia.it
+   */
+  MESHLINK = 87;
   
 
   /*

From edc3a7bab55bcad7c32d5a6fc71a76053ef2a00a Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Fri, 31 Jan 2025 20:09:19 -0600
Subject: [PATCH 3/3] Add 12 hour clock device display config

---
 meshtastic/config.proto | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meshtastic/config.proto b/meshtastic/config.proto
index 20334a9..95eb13e 100644
--- a/meshtastic/config.proto
+++ b/meshtastic/config.proto
@@ -743,6 +743,12 @@ message Config {
      * Indicates how to rotate or invert the compass output to accurate display on the display.
      */
     CompassOrientation compass_orientation = 11;
+
+    /*
+     * If false (default), the device will display the time in 24-hour format on screen.
+     * If true, the device will display the time in 12-hour format on screen.
+     */
+    bool use_12h_clock = 12;
   }
 
   /*