From 9d18b49e91fa2141f28e98a93c427069fca7d788 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Sat, 7 May 2022 19:11:01 +1000
Subject: [PATCH] rename wifi properties & remove nested config prefix

---
 config.options      |  4 ++--
 config.proto        | 22 +++++++++++-----------
 module_config.proto | 14 +++++++-------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config.options b/config.options
index 3691aba..f094822 100644
--- a/config.options
+++ b/config.options
@@ -1,5 +1,5 @@
-*WiFiConfig.wifi_ssid max_size:33
-*WiFiConfig.wifi_password max_size:64
+*WiFiConfig.ssid max_size:33
+*WiFiConfig.psk max_size:64
 
 # Max of three ignored nodes for our testing
 *LoRaConfig.ignore_incoming max_count:3
\ No newline at end of file
diff --git a/config.proto b/config.proto
index 3cff060..e577fed 100644
--- a/config.proto
+++ b/config.proto
@@ -391,18 +391,18 @@ message Config {
      * If set, this node will try to join the specified wifi network and
      * acquire an address via DHCP
      */
-    string wifi_ssid = 1;
+    string ssid = 1;
 
     /*
      * If set, will be use to authenticate to the named wifi
      */
-    string wifi_password = 2;
+    string psk = 2;
  
     /*
      * If set, the node will operate as an AP (and DHCP server), otherwise it
      * will be a station
     */
-    bool wifi_ap_mode = 3;
+    bool ap_mode = 3;
   }
 
   /*
@@ -556,7 +556,7 @@ message Config {
      * Standard predefined channel settings
      * Note: these mappings must match ModemConfigChoice in the device code.
      */
-    enum ModemConfig {
+    enum ModemPreset {
 
       /*
        * TODO: REPLACE
@@ -610,7 +610,7 @@ message Config {
      * This value is replaced by bandwidth/spread_factor/coding_rate.
      * If you'd like to experiment with other options add them to MeshRadio.cpp in the device code.
      */
-    ModemConfig modem_config = 2;
+    ModemPreset modem_config = 2;
 
     /*
      * Bandwidth in MHz
@@ -671,32 +671,32 @@ message Config {
     /*
      * TODO: REPLACE
      */
-    DeviceConfig device_config = 1;
+    DeviceConfig device = 1;
 
     /*
      * TODO: REPLACE
      */
-    PositionConfig position_config = 2;
+    PositionConfig position = 2;
  
     /*
      * TODO: REPLACE
      */
-    PowerConfig power_config = 3;
+    PowerConfig power = 3;
 
     /*
      * TODO: REPLACE
      */
-    WiFiConfig wifi_config = 4;
+    WiFiConfig wifi = 4;
 
     /*
      * TODO: REPLACE
      */
-    DisplayConfig display_config = 5;
+    DisplayConfig display = 5;
     
     /*
      * TODO: REPLACE
      */
-    LoRaConfig lora_config = 6;
+    LoRaConfig lora = 6;
 
   }
 }
\ No newline at end of file
diff --git a/module_config.proto b/module_config.proto
index a14d7e2..15dc92e 100644
--- a/module_config.proto
+++ b/module_config.proto
@@ -395,37 +395,37 @@ message ModuleConfig {
     /*
      * TODO: REPLACE
      */
-    MQTTConfig mqtt_config = 1;
+    MQTTConfig mqtt = 1;
 
     /*
      * TODO: REPLACE
      */
-    SerialConfig serial_config = 2;
+    SerialConfig serial = 2;
 
     /*
      * TODO: REPLACE
      */
-    ExternalNotificationConfig external_notification_config = 3;
+    ExternalNotificationConfig external_notification = 3;
 
     /*
      * TODO: REPLACE
      */
-    StoreForwardConfig store_forward_config = 4;
+    StoreForwardConfig store_forward = 4;
 
     /*
      * TODO: REPLACE
      */
-    RangeTestConfig range_test_config = 5;
+    RangeTestConfig range_test = 5;
 
     /*
      * TODO: REPLACE
      */
-    TelemetryConfig telemetry_config = 6;
+    TelemetryConfig telemetry = 6;
 
     /*
      * TODO: REPLACE
      */
-    CannedMessageConfig canned_message_config = 7;
+    CannedMessageConfig canned_message = 7;
 
   }
 }
\ No newline at end of file