Make swd / red led configurable

Author: SciLor

BoxConfig.cpp

@@ -75,6 +75,7 @@ String BoxConfig::getAsJson() {
     JsonObject miscDoc = doc.createNestedObject("misc");
     ConfigMisc* miscCfg = &_config.misc;
     miscDoc["autodump"] = miscCfg->autodump;
+    miscDoc["swd"] = miscCfg->swd;
 
     _json = "";
     serializeJson(doc, _json);
@@ -116,6 +117,7 @@ bool BoxConfig::setFromJson(String json) {
     JsonObject miscDoc = doc["misc"];
     ConfigMisc* miscCfg = &_config.misc;
     miscCfg->autodump = miscDoc["autodump"].as<bool>();
+    miscCfg->swd = miscDoc["swd"].as<bool>();
 
     // Convert old config version to latest one.
     if (_config.version != CONFIG_ACTIVE_VERSION) {
@@ -127,6 +129,9 @@ bool BoxConfig::setFromJson(String json) {
         case 3:
             miscCfg->autodump = false;
             _config.version = 4;
+        case 4:
+            miscCfg->swd = false;
+            _config.version = 5;
             write();
             break;
         default:
@@ -167,4 +172,5 @@ void BoxConfig::_initializeConfig() {
 
     ConfigMisc* misc = &_config.misc;
     misc->autodump = false;
+    misc->swd = false;
 }

BoxConfig.h

@@ -6,8 +6,8 @@
 #include "BoxSD.h"
 
 
-#define BOXCONFIG_JSON_SIZE 515
-//{"version":255,"battery":{"voltageFactor":4294967295,"voltageChargerFactor":4294967295,"lowAdc":65535,"criticalAdc":65535,"sleepMinutes":255},"buttonEars":{"longPressMs":65535,"veryLongPressMs":65535},"wifi":{"ssid":"12345678901234567890123456789012","password":"1234567890123456789012345678901234567890123456789012345678901234"},"log":{"sdLog":false},"misc":{"autodump":false}}
+#define BOXCONFIG_JSON_SIZE 528
+//{"version":255,"battery":{"voltageFactor":4294967295,"voltageChargerFactor":4294967295,"lowAdc":65535,"criticalAdc":65535,"sleepMinutes":255},"buttonEars":{"longPressMs":65535,"veryLongPressMs":65535},"wifi":{"ssid":"12345678901234567890123456789012","password":"1234567890123456789012345678901234567890123456789012345678901234"},"log":{"sdLog":false},"misc":{"autodump":false,"swd":false}}
 //Size from https://arduinojson.org/v6/assistant/
 
 class BoxConfig {

BoxLEDs.cpp

@@ -2,9 +2,10 @@
 #include "wiring_private.h"
 #include "Hackiebox.h"
 
-void BoxLEDs::begin() {
-    PWMPrepare(PIN_RED);
-    //disableRedLED(true);
+void BoxLEDs::begin(bool swd) {
+    disableRedLED(swd); //PWMPrepare(PIN_RED);
+    if (swd) 
+        Log.info("Keep red LED inactive to enable SWD");
 
     PWMPrepare(PIN_GREEN);
     PWMPrepare(PIN_BLUE);
@@ -70,13 +71,16 @@ void BoxLEDs::_handleAnimation(ANIMATION* animation) {
 }
 
 void BoxLEDs::disableRedLED(bool disabled) {
-    _redLedDisabled = disabled;
+    if (_redLedDisabled == disabled)
+        return;
+
     if (disabled) {
         MAP_PinModeSet(PIN_19, PIN_MODE_1); //TCK
         MAP_PinModeSet(PIN_20, PIN_MODE_1); //TMS
     } else {
         PWMPrepare(PIN_RED);
     }
+    _redLedDisabled = disabled;
 }
 
 unsigned long BoxLEDs::getDurationByIterations(uint8_t iterations, ANIMATION_TYPE animationType) {

BoxLEDs.h

@@ -198,7 +198,7 @@ class BoxLEDs : public EnhancedThread {
         };
 
         void
-            begin(),
+            begin(bool swd),
             loop();
 
         void testLEDs();
@@ -257,7 +257,7 @@ class BoxLEDs : public EnhancedThread {
         CRGB _wheel(uint8_t wheelPos);
         void _handleAnimation(ANIMATION* animation);
 
-        bool _redLedDisabled;
+        bool _redLedDisabled = true;
 };
 
 #endif

ConfigStructures.h

@@ -1,7 +1,7 @@
 #ifndef ConfigStructures_h
 #define ConfigStructures_h
 
-#define CONFIG_ACTIVE_VERSION 4
+#define CONFIG_ACTIVE_VERSION 5
 
 typedef struct {
   uint32_t voltageFactor;
@@ -41,6 +41,7 @@ typedef struct {
 
 typedef struct {
   bool autodump;
+  bool swd;
 } ConfigMisc;
 
 typedef struct {

Hackiebox.cpp

@@ -64,7 +64,7 @@ void Hackiebox::setup() {
 
     boxPower.begin();
     boxI2C.begin();
-    boxLEDs.begin();
+    boxLEDs.begin(config->misc.swd);
     boxLEDs.setAll(BoxLEDs::CRGB::White);
     boxBattery.begin();
     boxLEDs.setAll(BoxLEDs::CRGB::Orange);