Merge pull request #141 from adafruit/fix-fs-issue

WipperSnapper Filesystem refactor, bug-fixes
adafruit · Aug 27, 2021 · 41dc21d · 41dc21d
2 parents 5344016 + 8f3c366
commit 41dc21d
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 111 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ PROJECT_VER_MAJOR     := 1
 PROJECT_VER_MINOR     := 0
 PROJECT_VER_PATCH     := 0
 PROJECT_VER_BUILD     := beta
-PROJECT_VER_BUILD_NUM := 7
+PROJECT_VER_BUILD_NUM := 8
 
 BOARD_PYPORTAL 		:= samd51-pyportal
 BOARD_METRO_AIRLIFT := samd51-metro-airlift

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit WipperSnapper
-version=1.0.0-beta.6
+version=1.0.0-beta.8
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Arduino library to access WipperSnapper

diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h
@@ -31,11 +31,11 @@
 // Wippersnapper API Helpers
 #include "Wippersnapper_Boards.h"
 #include "Wippersnapper_Registration.h"
-#include "Wippersnapper_StatusLED_Colors.h"
+#include "components/statusLED/Wippersnapper_StatusLED_Colors.h"
 
 // Wippersnapper GPIO Components
-#include "components/Wippersnapper_AnalogIO.h"
-#include "components/Wippersnapper_DigitalGPIO.h"
+#include "components/analogIO/Wippersnapper_AnalogIO.h"
+#include "components/digitalIO/Wippersnapper_DigitalGPIO.h"
 
 // External libraries
 #include "Adafruit_MQTT.h" // MQTT Client
@@ -64,7 +64,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-beta.7" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.8" ///< WipperSnapper app. version (semver-formatted)
 
 // Reserved Adafruit IO MQTT topics
 #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

diff --git a/src/components/Wippersnapper_AnalogIO.cpp → ...nents/analogIO/Wippersnapper_AnalogIO.cpp b/src/components/Wippersnapper_AnalogIO.cpp → ...nents/analogIO/Wippersnapper_AnalogIO.cpp
diff --git a/src/components/Wippersnapper_AnalogIO.h → ...ponents/analogIO/Wippersnapper_AnalogIO.h b/src/components/Wippersnapper_AnalogIO.h → ...ponents/analogIO/Wippersnapper_AnalogIO.h
diff --git a/src/components/Wippersnapper_DigitalGPIO.cpp → ...s/digitalIO/Wippersnapper_DigitalGPIO.cpp b/src/components/Wippersnapper_DigitalGPIO.cpp → ...s/digitalIO/Wippersnapper_DigitalGPIO.cpp
diff --git a/src/components/Wippersnapper_DigitalGPIO.h → ...nts/digitalIO/Wippersnapper_DigitalGPIO.h b/src/components/Wippersnapper_DigitalGPIO.h → ...nts/digitalIO/Wippersnapper_DigitalGPIO.h
diff --git a/src/Wippersnapper_StatusLED.cpp → ...nts/statusLED/Wippersnapper_StatusLED.cpp b/src/Wippersnapper_StatusLED.cpp → ...nts/statusLED/Wippersnapper_StatusLED.cpp
@@ -57,7 +57,7 @@ bool Wippersnapper::statusLEDInit() {
   if (WS.lockStatusDotStar == false) {
     statusPixelDotStar->begin();
     statusPixelDotStar->show(); // turn all pixels off
-    statusPixelDotStar->setBrightness(10);
+    statusPixelDotStar->setBrightness(5);
     WS.lockStatusDotStar = true;
     is_success = true;
   }
@@ -151,25 +151,21 @@ void Wippersnapper::statusLEDBlink(ws_led_status_t statusState) {
 
   int blinkNum = 0;
   uint32_t ledBlinkColor;
-  switch (statusState) {
-  case WS_LED_STATUS_KAT:
+  if (statusState == WS_LED_STATUS_KAT) {
     blinkNum = 1;
     ledBlinkColor = LED_CONNECTED;
-    break;
-  case WS_LED_STATUS_ERROR:
+  } else if (statusState == WS_LED_STATUS_ERROR) {
     blinkNum = 2;
     ledBlinkColor = LED_ERROR;
-  case WS_LED_STATUS_CONNECTED:
+  } else if (statusState == WS_LED_STATUS_CONNECTED) {
     blinkNum = 3;
     ledBlinkColor = LED_CONNECTED;
-    break;
-  case WS_LED_STATUS_FS_WRITE:
+  } else if (statusState == WS_LED_STATUS_FS_WRITE) {
     blinkNum = 4;
     ledBlinkColor = YELLOW;
-  default:
+  } else {
     blinkNum = 0;
     ledBlinkColor = BLACK;
-    break;
   }
 
   while (blinkNum > 0) {

diff --git a/src/Wippersnapper_StatusLED_Colors.h → ...tatusLED/Wippersnapper_StatusLED_Colors.h b/src/Wippersnapper_StatusLED_Colors.h → ...tatusLED/Wippersnapper_StatusLED_Colors.h
@@ -22,7 +22,6 @@
 #define BLUE 0x0000FF   ///< Blue (as a uint32)
 
 // colors for each status state
-#define LED_HW_INIT PINK          ///< Initialization state
 #define LED_NET_CONNECT CYAN      ///< Network connection state
 #define LED_IO_CONNECT BLUE       ///< MQTT broker connection state
 #define LED_IO_REGISTER_HW YELLOW ///< Hardware registration state