SPECIAL: XRP Party Competition Firmware

Author: Zhiquan Yeo

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.0-xrpparty

include/config.h

@@ -24,5 +24,5 @@ class XRPConfiguration {
 };
 
 XRPConfiguration loadConfiguration(std::string defaultAPName);
-NetworkMode configureNetwork(XRPConfiguration config);
+NetworkMode configureNetwork(XRPConfiguration config, bool fmsMode = false);
 XRPConfiguration generateDefaultConfig(std::string defaultAP);

src/config.cpp

@@ -6,28 +6,47 @@
 
 #include "config.h"
 
-NetworkMode configureNetwork(XRPConfiguration config) {
+NetworkMode configureNetwork(XRPConfiguration config, bool fmsMode) {
+  // For XRP Party, we have 2 choices
+  // If we are NOT in FMS mode (default):
+  //   Only set up AP according to the config
+  // If we are in FMS mode
+  //   Attempt connection to the XRP FMS and fallback if necessary
   bool shouldUseAP = false;
   WiFiMulti multi;
 
-  if (config.networkConfig.mode == NetworkMode::AP) {
+  if (!fmsMode) {
     shouldUseAP = true;
   }
-  else if (config.networkConfig.mode == NetworkMode::STA) {
-    Serial.println("[NET] Attempting to start in STA Mode");
-    Serial.println("[NET] Trying the following networks:");
-    for (auto netInfo : config.networkConfig.networkList) {
-      Serial.printf("* %s\n", netInfo.first.c_str());
-      multi.addAP(netInfo.first.c_str(), netInfo.second.c_str());
-    }
+  else {
+    Serial.println("[NET] Attempting to connect to FMS");
+    multi.addAP("XRP-FMS-NET", "xrp-fms-network");
 
-    // Attempt to connect
+    // Attempt connect
     if (multi.run() != WL_CONNECTED) {
-      Serial.println("[NET] Failed to connect to any network on list. Falling back to AP");
+      Serial.println("[NET] FAILED to connect to FMS. Falling back to AP");
       shouldUseAP = true;
     }
   }
 
+  // if (config.networkConfig.mode == NetworkMode::AP || forceAP) {
+  //   shouldUseAP = true;
+  // }
+  // else if (config.networkConfig.mode == NetworkMode::STA) {
+  //   Serial.println("[NET] Attempting to start in STA Mode");
+  //   Serial.println("[NET] Trying the following networks:");
+  //   for (auto netInfo : config.networkConfig.networkList) {
+  //     Serial.printf("* %s\n", netInfo.first.c_str());
+  //     multi.addAP(netInfo.first.c_str(), netInfo.second.c_str());
+  //   }
+
+  //   // Attempt to connect
+  //   if (multi.run() != WL_CONNECTED) {
+  //     Serial.println("[NET] Failed to connect to any network on list. Falling back to AP");
+  //     shouldUseAP = true;
+  //   }
+  // }
+
   if (shouldUseAP) {
     Serial.println("[NET] Attempting to start in AP mode");
     bool result = WiFi.softAP(

src/main.cpp

@@ -27,6 +27,8 @@ const unsigned char* GetResource_VERSION(size_t* len);
 char chipID[20];
 char DEFAULT_SSID[32];
 
+bool useFMSMode = false;
+
 XRPConfiguration config;
 NetworkMode netConfigResult;
 
@@ -57,6 +59,11 @@ void writeStatusToDisk() {
   size_t len;
   std::string versionString{reinterpret_cast<const char*>(GetResource_VERSION(&len)), len};
   f.printf("Version: %s\n", versionString.c_str());
+
+  if (useFMSMode) {
+    f.printf("FMS MODE SELECTED\n\n");
+  }
+
   f.printf("Chip ID: %s\n", chipID);
   f.printf("WiFi Mode: %s\n", netConfigResult == NetworkMode::AP ? "AP" : "STA");
   if (netConfigResult == NetworkMode::AP) {
@@ -68,6 +75,7 @@ void writeStatusToDisk() {
   }
 
   f.printf("IP Address: %s\n", WiFi.localIP().toString().c_str());
+  f.printf("MAC Address: %s\n", WiFi.macAddress().c_str());
   f.close();
 }
 
@@ -245,7 +253,6 @@ void updateLoopTime(unsigned long loopStart) {
   _avgLoopTimeUs = (totalTime + loopTime) / _loopTimeMeasurementCount;
 }
 
-
 void setup() {
   // Generate the default SSID using the flash ID
   pico_unique_board_id_t id_out;
@@ -263,6 +270,14 @@ void setup() {
 
   delay(2000);
 
+  // SPECIAL FOR XRP PARTY
+  // Hold down button until flashing starts to switch into FMS mode
+  pinMode(XRP_BUILTIN_BUTTON, INPUT_PULLUP);
+  delay(500);
+  if (digitalRead(XRP_BUILTIN_BUTTON) == LOW) {
+    useFMSMode = true;
+  }
+
   // Read Config
   config = loadConfiguration(DEFAULT_SSID);
 
@@ -283,7 +298,8 @@ void setup() {
   WiFi.setHostname(DEFAULT_SSID);
 
   // Use configuration information
-  netConfigResult = configureNetwork(config);
+  Serial.printf("[NET] Use FMS Mode? %s\n", useFMSMode ? "true" : "false");
+  netConfigResult = configureNetwork(config, useFMSMode);
   Serial.printf("[NET] Actual WiFi Mode: %s\n", netConfigResult == NetworkMode::AP ? "AP" : "STA");
 
   // Set up HTTP server routes
@@ -357,6 +373,6 @@ void loop1() {
   if (xrp::rangefinderInitialized()) {
     xrp::rangefinderPeriodic();
   }
-
+  
   delay(50);
 }