Merge pull request #244 from meshtastic/master

Drag Master to Develop

admin.proto

@@ -200,16 +200,17 @@ message AdminMessage {
      * Set the Canned Message Module messages text.
      */
     string set_canned_message_module_messages = 36;
+
+    /*
+     * Begins an edit transaction for config, module config, owner, and channel settings changes
+     * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)
+     */
+    bool begin_edit_settings = 64;
     
     /*
-     * Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins
+     * Commits an open transaction for any edits made to config, module config, owner, and channel settings
      */
-    bool confirm_set_config = 64;
- 
-    /*
-     * Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins
-     */
-    bool confirm_set_module_config = 65;
+    bool commit_edit_settings = 65;
 
     /*
      * Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again.

mesh.proto

@@ -354,6 +354,16 @@ enum HardwareModel {
    * M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/
    */
   M5STACK = 42;
+
+  /*
+   * New Heltec LoRA32 with ESP32-S3 CPU
+   */
+  HELTEC_V3 = 43;
+
+  /*
+   * New Heltec Wireless Stick Lite with ESP32-S3 CPU
+   */
+  HELTEC_WSL_V3 = 44;
   
   /*
    * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
@@ -720,7 +730,7 @@ message MeshPacket {
   /*
    * The sending node number.
    * Note: Our crypto implementation uses this field as well.
-   * See [crypto](/docs/about/overview/encryption) for details.
+   * See [crypto](/docs/overview/encryption) for details.
    * FIXME - really should be fixed32 instead, this encoding only hurts the ble link though.
    */
   fixed32 from = 1;
@@ -772,7 +782,7 @@ message MeshPacket {
    * needs to be unique for a few minutes (long enough to last for the length of
    * any ACK or the completion of a mesh broadcast flood).
    * Note: Our crypto implementation uses this id as well.
-   * See [crypto](/docs/about/overview/encryption) for details.
+   * See [crypto](/docs/overview/encryption) for details.
    * FIXME - really should be fixed32 instead, this encoding only
    * hurts the ble link though.
    */