Group together the network settings

LeeLeahy2 · LeeLeahy2 · commit e444adb21778 · 2023-07-16T11:16:02.000-10:00
diff --git a/Firmware/RTK_Surveyor/settings.h b/Firmware/RTK_Surveyor/settings.h
@@ -786,28 +786,6 @@ typedef struct
     int maxLogLength_minutes = 60 * 24; // Default to 24 hours
     char profileName[50] = "";
 
-    // NTRIP Server
-    bool enableNtripServer = false;
-    bool ntripServer_StartAtSurveyIn = false;       // true = Start WiFi instead of Bluetooth at Survey-In
-    char ntripServer_CasterHost[50] = "rtk2go.com"; // It's free...
-    uint16_t ntripServer_CasterPort = 2101;
-    char ntripServer_CasterUser[50] =
-        "test@test.com"; // Some free casters require auth. User must provide their own email address to use RTK2Go
-    char ntripServer_CasterUserPW[50] = "";
-    char ntripServer_MountPoint[50] = "bldr_dwntwn2"; // NTRIP Server
-    char ntripServer_MountPointPW[50] = "WR5wRo4H";
-
-    // NTRIP Client
-    bool enableNtripClient = false;
-    char ntripClient_CasterHost[50] = "rtk2go.com"; // It's free...
-    uint16_t ntripClient_CasterPort = 2101;
-    char ntripClient_CasterUser[50] =
-        "test@test.com"; // Some free casters require auth. User must provide their own email address to use RTK2Go
-    char ntripClient_CasterUserPW[50] = "";
-    char ntripClient_MountPoint[50] = "bldr_SparkFun1";
-    char ntripClient_MountPointPW[50] = "";
-    bool ntripClient_TransmitGGA = true;
-
     int16_t serialTimeoutGNSS = 1; // In ms - used during SerialGNSS.begin. Number of ms to pass of no data before
                                    // hardware serial reports data available.
 
@@ -836,11 +814,7 @@ typedef struct
     int8_t timeZoneSeconds = 0;
 
     // Debug settings
-    bool enablePrintWifiIpAddress = true;
     bool enablePrintState = false;
-    bool enablePrintWifiState = false;
-    bool enablePrintNtripClientState = false;
-    bool enablePrintNtripServerState = false;
     bool enablePrintPosition = false;
     bool enablePrintIdleTime = false;
     bool enablePrintBatteryMessages = true;
@@ -849,22 +823,15 @@ typedef struct
     bool enablePrintLogFileMessages = false;
     bool enablePrintLogFileStatus = true;
     bool enablePrintRingBufferOffsets = false;
-    bool enablePrintNtripServerRtcm = false;
-    bool enablePrintNtripClientRtcm = false;
     bool enablePrintStates = true;
     bool enablePrintDuplicateStates = false;
     bool enablePrintRtcSync = false;
-    bool enablePrintNTPDiag = false;
-    bool enablePrintEthernetDiag = false;
     RadioType_e radioType = RADIO_EXTERNAL;
     uint8_t espnowPeers[5][6]; // Max of 5 peers. Contains the MAC addresses (6 bytes) of paired units
     uint8_t espnowPeerCount = 0;
     bool enableRtcmMessageChecking = false;
     BluetoothRadioType_e bluetoothRadioType = BLUETOOTH_RADIO_SPP;
     bool runLogTest = false; // When set to true, device will create a series of test logs
-    bool enableTcpClient = false;
-    bool enableTcpServer = false;
-    bool enablePrintTcpStatus = false;
     bool espnowBroadcast = true;       // When true, overrides peers and sends all data via broadcast
     int16_t antennaHeight = 0;         // in mm
     float antennaReferencePoint = 0.0; // in mm
@@ -877,16 +844,6 @@ typedef struct
     bool enablePrintSDBuffers = false;
     bool forceResetOnSDFail = false; // Set to true to reset system if SD is detected but fails to start.
 
-    WiFiNetwork wifiNetworks[MAX_WIFI_NETWORKS] = {
-        {"", ""},
-        {"", ""},
-        {"", ""},
-        {"", ""},
-    };
-
-    bool wifiConfigOverAP = true; // Configure device over Access Point or have it connect to WiFi
-    uint16_t wifiTcpPort =
-        2947; // TCP port to use in Client/Server mode. 2947 is GPS Daemon: http://tcp-udp-ports.com/port-2947.htm
     uint8_t minElev = 10; // Minimum elevation (in deg) for a GNSS satellite to be used in NAV
     uint8_t ubxMessageRatesBase[MAX_UBX_MSG_RTCM] = {
         254}; // Mark first record with key so defaults will be applied. Int value for each supported message - Report
@@ -900,21 +857,52 @@ typedef struct
     // CFG-SFIMU-AUTO_MNTALG_ENA 0 = autoIMUmountAlignment
     bool sfUseSpeed = false; // CFG-SFODO-USE_SPEED
 
+    CoordinateInputType coordinateInputType = COORDINATE_INPUT_TYPE_DD; // Default DD.ddddddddd
+    uint16_t lbandFixTimeout_seconds = 180; // Number of seconds of no L-Band fix before resetting ZED
+    int16_t minCNO_F9P = 6;                 // Minimum satellite signal level for navigation. ZED-F9P default is 6 dBHz
+    int16_t minCNO_F9R = 20;                // Minimum satellite signal level for navigation. ZED-F9R default is 20 dBHz
+    uint16_t serialGNSSRxFullThreshold = 50; // RX FIFO full interrupt. Max of ~128. See pinUART2Task().
+    uint8_t btReadTaskPriority = 1; // Read from BT SPP and Write to GNSS. 3 being the highest, and 0 being the lowest
+    uint8_t gnssReadTaskPriority =
+        1; // Read from ZED-F9x and Write to circular buffer (SD, TCP, BT). 3 being the highest, and 0 being the lowest
+    uint8_t handleGnssDataTaskPriority = 1; // Read from the cicular buffer and dole out to end points (SD, TCP, BT).
+    uint8_t btReadTaskCore = 1;             // Core where task should run, 0=core, 1=Arduino
+    uint8_t gnssReadTaskCore = 1;           // Core where task should run, 0=core, 1=Arduino
+    uint8_t handleGnssDataTaskCore = 1;     // Core where task should run, 0=core, 1=Arduino
+    uint8_t gnssUartInterruptsCore =
+        1;                         // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
+    uint8_t bluetoothInterruptsCore = 1;  // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
+    uint8_t i2cInterruptsCore = 1; // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
+
     // Ethernet
+    bool enablePrintEthernetDiag = false;
+    bool ethernetDHCP = true;
     IPAddress ethernetIP = {192, 168, 0, 123};
     IPAddress ethernetDNS = {194, 168, 4, 100};
     IPAddress ethernetGateway = {192, 168, 0, 1};
     IPAddress ethernetSubnet = {255, 255, 255, 0};
     uint16_t ethernetHttpPort = 80;
-    uint16_t ethernetNtpPort = 123;
-    bool ethernetDHCP = true;
-    bool enableNTPFile = false; // Log NTP requests to file
-    bool enableTcpClientEthernet = false;
-    uint16_t ethernetTcpPort =
-        2947; // TCP port to use in Client mode. 2947 is GPS Daemon: http://tcp-udp-ports.com/port-2947.htm
-    char hostForTCPClient[50] = "";
+
+    // WiFi
+    bool enablePrintWifiIpAddress = true;
+    bool enablePrintWifiState = false;
+    bool wifiConfigOverAP = true; // Configure device over Access Point or have it connect to WiFi
+    uint16_t wifiTcpPort =
+        2947; // TCP port to use in Client/Server mode. 2947 is GPS Daemon: http://tcp-udp-ports.com/port-2947.htm
+    WiFiNetwork wifiNetworks[MAX_WIFI_NETWORKS] = {
+        {"", ""},
+        {"", ""},
+        {"", ""},
+        {"", ""},
+    };
+
+    // Multicast DNS Server
+    bool mdnsEnable = true;      // Allows locating of device from browser address 'rtk.local'
 
     // NTP
+    uint16_t ethernetNtpPort = 123;
+    bool enableNTPFile = false;  // Log NTP requests to file
+    bool enablePrintNTPDiag = false;
     uint8_t ntpPollExponent = 6; // NTPpacket::defaultPollExponent 2^6 = 64 seconds
     int8_t ntpPrecision = -20;   // NTPpacket::defaultPrecision 2^-20 = 0.95us
     uint32_t ntpRootDelay = 0;   // NTPpacket::defaultRootDelay = 0. ntpRootDelay is defined in microseconds.
@@ -925,24 +913,42 @@ typedef struct
     char ntpReferenceId[5] = {'G', 'P', 'S', 0,
                               0}; // NTPpacket::defaultReferenceId. Ref ID is 4 chars. Add one extra for a NULL.
 
-    CoordinateInputType coordinateInputType = COORDINATE_INPUT_TYPE_DD; // Default DD.ddddddddd
-    uint16_t lbandFixTimeout_seconds = 180; // Number of seconds of no L-Band fix before resetting ZED
-    int16_t minCNO_F9P = 6;                 // Minimum satellite signal level for navigation. ZED-F9P default is 6 dBHz
-    int16_t minCNO_F9R = 20;                // Minimum satellite signal level for navigation. ZED-F9R default is 20 dBHz
-    bool mdnsEnable = true;                // Allows locating of device from browser address 'rtk.local'
-    uint16_t serialGNSSRxFullThreshold = 50; // RX FIFO full interrupt. Max of ~128. See pinUART2Task().
-    uint8_t btReadTaskPriority = 1; // Read from BT SPP and Write to GNSS. 3 being the highest, and 0 being the lowest
-    uint8_t gnssReadTaskPriority =
-        1; // Read from ZED-F9x and Write to circular buffer (SD, TCP, BT). 3 being the highest, and 0 being the lowest
-    uint8_t handleGnssDataTaskPriority = 1; // Read from the cicular buffer and dole out to end points (SD, TCP, BT).
-    uint8_t btReadTaskCore = 1;             // Core where task should run, 0=core, 1=Arduino
-    uint8_t gnssReadTaskCore = 1;           // Core where task should run, 0=core, 1=Arduino
-    uint8_t handleGnssDataTaskCore = 1;     // Core where task should run, 0=core, 1=Arduino
-    uint8_t gnssUartInterruptsCore =
-        1;                         // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
-    uint8_t bluetoothInterruptsCore = 1;  // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
-    uint8_t i2cInterruptsCore = 1; // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
+    // NTRIP Client
+    bool enablePrintNtripClientRtcm = false;
+    bool enablePrintNtripClientState = false;
+    bool enableNtripClient = false;
+    char ntripClient_CasterHost[50] = "rtk2go.com"; // It's free...
+    uint16_t ntripClient_CasterPort = 2101;
+    char ntripClient_CasterUser[50] =
+        "test@test.com"; // Some free casters require auth. User must provide their own email address to use RTK2Go
+    char ntripClient_CasterUserPW[50] = "";
+    char ntripClient_MountPoint[50] = "bldr_SparkFun1";
+    char ntripClient_MountPointPW[50] = "";
+    bool ntripClient_TransmitGGA = true;
 
+    // NTRIP Server
+    bool enablePrintNtripServerRtcm = false;
+    bool enablePrintNtripServerState = false;
+    bool enableNtripServer = false;
+    bool ntripServer_StartAtSurveyIn = false;       // true = Start WiFi instead of Bluetooth at Survey-In
+    char ntripServer_CasterHost[50] = "rtk2go.com"; // It's free...
+    uint16_t ntripServer_CasterPort = 2101;
+    char ntripServer_CasterUser[50] =
+        "test@test.com"; // Some free casters require auth. User must provide their own email address to use RTK2Go
+    char ntripServer_CasterUserPW[50] = "";
+    char ntripServer_MountPoint[50] = "bldr_dwntwn2"; // NTRIP Server
+    char ntripServer_MountPointPW[50] = "WR5wRo4H";
+
+    // TCP Client
+    bool enablePrintTcpStatus = false;
+    bool enableTcpClient = false;
+    bool enableTcpClientEthernet = false;
+    uint16_t ethernetTcpPort =
+        2947; // TCP port to use in Client mode. 2947 is GPS Daemon: http://tcp-udp-ports.com/port-2947.htm
+    char hostForTCPClient[50] = "";
+
+    // TCP Server
+    bool enableTcpServer = false;
 } Settings;
 Settings settings;
 
