Merge pull request #662 from tyeth/wifi-testvar-fix

Update ConfigJson.cpp - set default password to blank and ssid to unset-ssid
adafruit · Nov 21, 2024 · b75aae3 · b75aae3
2 parents e898d1b + ecc9884
commit b75aae3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit WipperSnapper
-version=1.0.0-beta.93
+version=1.0.0-beta.94
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Arduino application for Adafruit.io WipperSnapper

diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h
@@ -142,7 +142,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-beta.93" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.94" ///< WipperSnapper app. version (semver-formatted)
 
 // Reserved Adafruit IO MQTT topics
 #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

diff --git a/src/provisioning/ConfigJson.cpp b/src/provisioning/ConfigJson.cpp
@@ -22,8 +22,8 @@ void convertToJson(const networkConfig &src, JsonVariant dst) {
 
 // Extracts a network configuration structure from a JSON variant
 void convertFromJson(JsonVariantConst src, networkConfig &dst) {
-  strlcpy(dst.ssid, src["network_ssid"] | "testvar", sizeof(dst.ssid));
-  strlcpy(dst.pass, src["network_password"] | "testvar", sizeof(dst.pass));
+  strlcpy(dst.ssid, src["network_ssid"] | "unset-ssid", sizeof(dst.ssid));
+  strlcpy(dst.pass, src["network_password"] | "", sizeof(dst.pass));
 }
 
 // Converts a secretsConfig structure to a JSON variant
@@ -83,4 +83,4 @@ void convertFromJson(JsonVariantConst src, displayConfig &dst) {
   dst.height = src["height"] | 64;
   dst.rotation = src["rotation"] | 0;
   dst.spiConfig = src["spi_config"];
-}
+}