Merge pull request #142 from adafruit/fix-led-issue-sync

Fix status LED component not re-syncing

Author: brentru

src/Wippersnapper.cpp

@@ -860,7 +860,6 @@ void Wippersnapper::runNetFSM() {
       WS._mqtt->setKeepAliveInterval(WS_KEEPALIVE_INTERVAL);
       mqttRC = WS._mqtt->connect(WS._username, WS._key);
       if (mqttRC == WS_MQTT_CONNECTED) {
-        statusLEDDeinit();
         fsmNetwork = FSM_NET_CHECK_MQTT;
         break;
       }
@@ -933,12 +932,7 @@ void Wippersnapper::pingBroker() {
   }
   // blink status LED every STATUS_LED_KAT_BLINK_TIME millis
   if (millis() > (_prvKATBlink + STATUS_LED_KAT_BLINK_TIME)) {
-    if (WS.lockStatusLED) {
-      WS_DEBUG_PRINTLN("Status-LED in-use by WipperSnapper");
-    } else {
-      statusLEDBlink(WS_LED_STATUS_KAT);
-      statusLEDDeinit();
-    }
+    statusLEDBlink(WS_LED_STATUS_KAT);
     _prvKATBlink = millis();
   }
 }
@@ -1049,7 +1043,6 @@ void Wippersnapper::connect() {
 
   WS_DEBUG_PRINTLN("Registered board with Wippersnapper.");
   statusLEDBlink(WS_LED_STATUS_CONNECTED);
-  statusLEDDeinit();
 
   WS._mqtt->processPackets(1000);
 }

src/Wippersnapper_StatusLED.cpp

@@ -64,12 +64,10 @@ bool Wippersnapper::statusLEDInit() {
 #endif
 
 #ifdef USE_STATUS_LED
-  if (!WS.lockStatusLED) {
-    pinMode(STATUS_LED_PIN, OUTPUT); // Initialize LED
-    digitalWrite(STATUS_LED_PIN, 0); // Turn OFF LED
-    WS.lockStatusLED = true;         // set global pin "lock" flag
-    is_success = true;
-  }
+  pinMode(STATUS_LED_PIN, OUTPUT); // Initialize LED
+  digitalWrite(STATUS_LED_PIN, 0); // Turn OFF LED
+  WS.lockStatusLED = true;         // set global pin "lock" flag
+  is_success = true;
 #endif
   return is_success;
 }
@@ -96,7 +94,7 @@ void Wippersnapper::statusLEDDeinit() {
   digitalWrite(STATUS_LED_PIN, 0); // turn off
   pinMode(STATUS_LED_PIN,
           INPUT);           // "release" for use by setting to input (hi-z)
-  WS.lockStatusLED = false; // release global pin lock flag
+  WS.lockStatusLED = false; // un-set global pin "lock" flag
 #endif
 }
 
@@ -146,6 +144,11 @@ void Wippersnapper::setStatusLEDColor(uint32_t color) {
 */
 /****************************************************************************/
 void Wippersnapper::statusLEDBlink(ws_led_status_t statusState) {
+#ifdef USE_STATUS_LED
+  if (!WS.lockStatusLED)
+    return;
+#endif
+
   int blinkNum = 0;
   uint32_t ledBlinkColor;
   switch (statusState) {

src/components/Wippersnapper_DigitalGPIO.cpp

@@ -61,11 +61,9 @@ void Wippersnapper_DigitalGPIO::initDigitalPin(
       wippersnapper_pin_v1_ConfigurePinRequest_Direction_DIRECTION_OUTPUT) {
 
 #ifdef STATUS_LED_PIN
-    // lock status LED pin for use as a digitalIO component
-    if (pinName == STATUS_LED_PIN) {
-      WS_DEBUG_PRINTLN("* Using status LED as a digital output");
-      WS.lockStatusLED = true;
-    }
+    // deinit status led, use it as a dio component instead
+    if (pinName == STATUS_LED_PIN)
+      WS.statusLEDDeinit();
 #endif
     WS_DEBUG_PRINT("Configured digital output pin on D");
     WS_DEBUG_PRINTLN(pinName);
@@ -131,11 +129,10 @@ void Wippersnapper_DigitalGPIO::deinitDigitalPin(
   itoa(pinName, cstr, 10);
   pinMode(pinName, INPUT); // hi-z
 
+// if prv. in-use by DIO, release pin back to application
 #ifdef STATUS_LED_PIN
-                           // release status LED pin back for signaling
-  if (pinName == STATUS_LED_PIN) {
-    WS.lockStatusLED = false;
-  }
+  if (pinName == STATUS_LED_PIN)
+    WS.statusLEDInit();
 #endif
 }