Merge remote-tracking branch 'origin/master' into 2.6

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;
   }
 
   /*

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;
   
 
   /*

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;
+
 }
 
 /*