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 forceAP = true);
 XRPConfiguration generateDefaultConfig(std::string defaultAP);

src/config.cpp

@@ -6,11 +6,11 @@
 
 #include "config.h"
 
-NetworkMode configureNetwork(XRPConfiguration config) {
+NetworkMode configureNetwork(XRPConfiguration config, bool forceAP) {
   bool shouldUseAP = false;
   WiFiMulti multi;
 
-  if (config.networkConfig.mode == NetworkMode::AP) {
+  if (config.networkConfig.mode == NetworkMode::AP || forceAP) {
     shouldUseAP = true;
   }
   else if (config.networkConfig.mode == NetworkMode::STA) {

src/main.cpp

@@ -27,6 +27,8 @@ const unsigned char* GetResource_VERSION(size_t* len);
 char chipID[20];
 char DEFAULT_SSID[32];
 
+bool forceAP = true;
+
 XRPConfiguration config;
 NetworkMode netConfigResult;
 
@@ -68,6 +70,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 +248,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 +265,14 @@ void setup() {
 
   delay(2000);
 
+  // SPECIAL FOR XRP PARTY
+  pinMode(XRP_BUILTIN_BUTTON, INPUT_PULLUP);
+  delay(500);
+  if (digitalRead(XRP_BUILTIN_BUTTON) == LOW) {
+    // Allow STA
+    forceAP = false;
+  }
+
   // Read Config
   config = loadConfiguration(DEFAULT_SSID);
 
@@ -283,7 +293,8 @@ void setup() {
   WiFi.setHostname(DEFAULT_SSID);
 
   // Use configuration information
-  netConfigResult = configureNetwork(config);
+  Serial.printf("[NET] ForceAP? %s\n", forceAP ? "true" : "false");
+  netConfigResult = configureNetwork(config, forceAP);
   Serial.printf("[NET] Actual WiFi Mode: %s\n", netConfigResult == NetworkMode::AP ? "AP" : "STA");
 
   // Set up HTTP server routes
@@ -357,6 +368,6 @@ void loop1() {
   if (xrp::rangefinderInitialized()) {
     xrp::rangefinderPeriodic();
   }
-
+  
   delay(50);
 }