🚧 WIP, digitalio - Address TODO for statusled

Author: brentru

platformio.ini

@@ -151,8 +151,9 @@ board_build.filesystem = littlefs
 extends = common:esp32
 board = featheresp32-s2
 build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2 -DBOARD_HAS_PSRAM
-board_build.partitions = tinyuf2-partitions-4MB-noota.csv
-build_type = debug
+;board_build.partitions = tinyuf2-partitions-4MB-noota.csv
+board_build.partitions = tinyuf2-partitions-4MB.csv
+;build_type = debug
 monitor_filters = esp32_exception_decoder
 extra_scripts = pre:rename_usb_config.py
 

src/components/digitalIO/controller.cpp

@@ -48,14 +48,6 @@ void DigitalIOController::SetMaxDigitalPins(uint8_t max_digital_pins) {
   _max_digital_pins = max_digital_pins;
 }
 
-// TODO: This should be within the hardware class
-bool DigitalIOController::IsStatusLEDPin(uint8_t pin_name) {
-#ifdef STATUS_LED_PIN
-  return pin_name == STATUS_LED_PIN;
-#endif
-  return false;
-}
-
 /***********************************************************************/
 /*!
     @brief  Create a new digital pin and add it to the controller's vector
@@ -112,7 +104,7 @@ bool DigitalIOController::AddDigitalIOPin(pb_istream_t *stream) {
   int pin_name = atoi(_dio_model->GetDigitalIOAddMsg()->pin_name + 1);
 
   // Check if the provided pin is also the status LED pin
-  if (IsStatusLEDPin(pin_name))
+  if (_dio_hardware->IsStatusLEDPin(pin_name))
     releaseStatusLED();
 
   // Deinit the pin if it's already in use
@@ -169,8 +161,8 @@ bool DigitalIOController::WriteDigitalIOPin(pb_istream_t *stream) {
   }
 
   // Get the digital pin
-  int pin_idx = GetPinIdx(
-      atoi(_dio_model->GetDigitalIOWriteMsg()->pin_name + 1));
+  int pin_idx =
+      GetPinIdx(atoi(_dio_model->GetDigitalIOWriteMsg()->pin_name + 1));
   // Check if the pin was found and is a valid digital output pin
   if (pin_idx == -1) {
     WS_DEBUG_PRINTLN("ERROR: Unable to find the requested digital output pin!");

src/components/digitalIO/controller.h

@@ -43,18 +43,19 @@ class DigitalIOController {
   void Update();
   bool EncodePublishPinEvent(uint8_t pin_name, bool pin_value);
 
-  void CreateDigitalIOPin(uint8_t name,
+  void
+  CreateDigitalIOPin(uint8_t name,
                      wippersnapper_digitalio_DigitalIODirection direction,
                      wippersnapper_digitalio_DigitalIOSampleMode sample_mode,
                      bool value, long period);
   bool CheckEventPin(DigitalIOPin *pin);
   bool CheckTimerPin(DigitalIOPin *pin);
   bool IsPinTimerExpired(DigitalIOPin *pin, ulong cur_time);
-  bool IsStatusLEDPin(uint8_t pin_name);
 
   void PrintPinValue(DigitalIOPin *pin);
   void SetMaxDigitalPins(uint8_t max_digital_pins);
   int GetPinIdx(uint8_t pin_name);
+
 private:
   std::vector<DigitalIOPin> _digital_io_pins;
   uint8_t _max_digital_pins;

src/components/digitalIO/hardware.cpp

@@ -79,7 +79,11 @@ void DigitalIOHardware::deinit(uint8_t pin_name) {
   // Turn off pin output and reset mode to hi-z floating state
   digitalWrite(pin_name, LOW);
   pinMode(pin_name, INPUT);
-  // TODO: Release status led, if it's a LED, back to the application
+  // Prior to using this pin as a DIO,
+  // was this a status LED pin?
+  if (IsStatusLEDPin(pin_name)) {
+    initStatusLED(); // it was! re-init status led
+  }
 }
 
 /***********************************************************************/
@@ -105,4 +109,19 @@ void DigitalIOHardware::SetValue(uint8_t pin_name, bool pin_value) {
 /***********************************************************************/
 bool DigitalIOHardware::GetValue(uint8_t pin_name) {
   return digitalRead(pin_name);
+}
+
+/***********************************************************************/
+/*!
+    @brief  Checks if a pin is the status LED pin.
+    @param  pin_name
+            The pin's name.
+    @return True if the pin is the status LED pin.
+*/
+/***********************************************************************/
+bool DigitalIOHardware::IsStatusLEDPin(uint8_t pin_name) {
+#ifdef STATUS_LED_PIN
+  return pin_name == STATUS_LED_PIN;
+#endif
+  return false;
 }

src/components/digitalIO/hardware.h

@@ -25,6 +25,7 @@ class DigitalIOHardware {
   void SetValue(uint8_t pin_name, bool pin_value);
   bool GetValue(uint8_t pin_name);
   void deinit(uint8_t pin_name);
+  bool IsStatusLEDPin(uint8_t pin_name);
 
 private:
 };