Merge branch 'meshtastic:master' into master

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: checkout source
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
 
     - name: run protolint
       uses: plexsystems/protolint-action@v0.2.0

apponly.proto

@@ -5,6 +5,7 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
 import "channel.proto";
+import "config.proto";
 
 option java_outer_classname = "AppOnlyProtos";
 
@@ -18,7 +19,12 @@ option java_outer_classname = "AppOnlyProtos";
 message ChannelSet {
 
   /*
-   * TODO: REPLACE
+   * Channel list with settings
    */
   repeated ChannelSettings settings = 1;
-}
+
+  /*
+   * LoRa config
+   */
+  Config.LoRaConfig lora_config = 2;
+}

config.proto

@@ -560,7 +560,7 @@ message Config {
       /*
        * TODO: REPLACE
        */
-      VLongSlow = 0;
+      LongFast = 0;
 
       /*
        * TODO: REPLACE
@@ -570,7 +570,7 @@ message Config {
       /*
        * TODO: REPLACE
        */
-      LongFast = 2;
+      VLongSlow = 2;
 
       /*
        * TODO: REPLACE
@@ -698,4 +698,4 @@ message Config {
     LoRaConfig lora = 6;
 
   }
-}
+}

deviceonly.proto

@@ -5,13 +5,10 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
 import "channel.proto";
-import "config.proto";
 import "mesh.proto";
-import "module_config.proto";
 
 option java_outer_classname = "DeviceOnly";
 
-
 /*
  * This message is never sent over the wire, but it is used for serializing DB
  * state to flash in the device code
@@ -136,72 +133,3 @@ message OEMStore {
    */
   string oem_text = 5;
 }
-
-message LocalConfig {
-  /*
-   * TODO: REPLACE
-   */
-  Config.DeviceConfig device = 1;
-
-  /*
-   * TODO: REPLACE
-   */
-  Config.PositionConfig position = 2;
-
-  /*
-   * TODO: REPLACE
-   */
-  Config.PowerConfig power = 3;
-
-  /*
-   * TODO: REPLACE
-   */
-  Config.WiFiConfig wifi = 4;
-
-  /*
-   * TODO: REPLACE
-   */
-  Config.DisplayConfig display = 5;
-
-  /*
-   * TODO: REPLACE
-   */
-  Config.LoRaConfig lora = 6;
-}
-
-message LocalModuleConfig {
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.MQTTConfig mqtt = 1;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.SerialConfig serial = 2;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.ExternalNotificationConfig external_notification = 3;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.StoreForwardConfig store_forward = 4;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.RangeTestConfig range_test = 5;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.TelemetryConfig telemetry = 6;
-
-  /*
-   * TODO: REPLACE
-   */
-  ModuleConfig.CannedMessageConfig canned_message = 7;
-}

localonly.proto

@@ -0,0 +1,84 @@
+syntax = "proto3";
+
+option java_package = "com.geeksville.mesh";
+option optimize_for = LITE_RUNTIME;
+option go_package = "github.com/meshtastic/gomeshproto";
+
+import "config.proto";
+import "module_config.proto";
+
+option java_outer_classname = "LocalOnlyProtos";
+
+/*
+ * Protobuf structures common to apponly.proto and deviceonly.proto
+ * This is never sent over the wire, only for local use
+ */
+
+message LocalConfig {
+  /*
+   * TODO: REPLACE
+   */
+  Config.DeviceConfig device = 1;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.PositionConfig position = 2;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.PowerConfig power = 3;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.WiFiConfig wifi = 4;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.DisplayConfig display = 5;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.LoRaConfig lora = 6;
+}
+
+message LocalModuleConfig {
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.MQTTConfig mqtt = 1;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.SerialConfig serial = 2;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.ExternalNotificationConfig external_notification = 3;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.StoreForwardConfig store_forward = 4;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.RangeTestConfig range_test = 5;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.TelemetryConfig telemetry = 6;
+
+  /*
+   * TODO: REPLACE
+   */
+  ModuleConfig.CannedMessageConfig canned_message = 7;
+}