Merge branch 'meshtastic:master' into master

mesh.proto

@@ -933,6 +933,11 @@ message MyNodeInfo {
    */
   uint32 reboot_count = 10;
 
+  /*
+   * Calculated bitrate of the current channel (in Bytes Per Second)
+   */
+  float bitrate = 11;
+
   /*
    * How long before we consider a message abandoned and we can clear our
    * caches of any messages in flight Normally quite large to handle the worst case

radioconfig.proto

@@ -569,6 +569,12 @@ message RadioConfig {
      * Potentially useful for devices without user buttons.
      */
     uint32 auto_screen_carousel_secs = 152;
+
+    /*
+     * If non-zero, the device will fully power off this many seconds after external power is removed.
+     * 
+     */
+    uint32 on_battery_shutdown_after_secs = 153;
   }
 
   UserPreferences preferences = 1;