Merge branch 'master' of github.com:meshtastic/Meshtastic-protobufs

admin.proto

@@ -147,11 +147,6 @@ message AdminMessage {
      */
     ModuleConfig get_module_config_response = 8;
 
-    /*
-     * Send all channels in the response to this message
-     */
-    bool get_all_channel_request = 9;
-
     /*
      * Get the Canned Message Module messages in the response to this message.
      */
@@ -165,7 +160,7 @@ message AdminMessage {
     /*
      * Request the node to send device metadata (firmware, protobuf version, etc)
      */
-    uint32 get_device_metadata_request = 12;
+    bool get_device_metadata_request = 12;
 
     /*
       * Device metadata response
@@ -224,6 +219,12 @@ message AdminMessage {
      */
     bool confirm_set_radio = 67;
 
+    /*
+     * Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
+     * Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth.
+     */
+    int32 reboot_ota_seconds = 95;
+
     /*
      * This message is only supported for the simulator porduino build.
      * If received the simulator will exit successfully.

config.proto

@@ -536,7 +536,7 @@ message Config {
 
     /*
      * The denominator of the coding rate.
-     * ie for 4/8, the value is 8. 5/8 the value is 5.
+     * ie for 4/5, the value is 5. 4/8 the value is 8.
      */
     uint32 coding_rate = 5;
 

mesh.proto

@@ -4,6 +4,7 @@ option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
+import "channel.proto";
 import "config.proto";
 import "module_config.proto";
 import "portnums.proto";
@@ -1227,11 +1228,15 @@ message FromRadio {
      */
     bool rebooted = 8;
 
-
     /*
      * Include module config
      */
     ModuleConfig moduleConfig = 9;
+
+    /*
+     * One packet is sent for each channel
+     */
+    Channel channel = 10;
   }
 }
 

telemetry.proto

@@ -140,4 +140,15 @@ enum TelemetrySensorType {
   * High accuracy pressure
   */
   LPS22 = 8;
+
+  /*
+  * 3-Axis magnetic sensor
+  */
+  QMC6310 = 9;
+
+  /*
+  * 6-Axis inertial measurement sensor
+  */
+  QMI8658 = 10;
+
 };