Fix - Remove PWMWriteDutyCycle_Multi (Unused), fix logical bug in Write Freq handler

Author: brentru

src/components/pwm/controller.cpp

@@ -52,7 +52,7 @@ bool PWMController::Handle_PWM_Add(pb_istream_t *stream) {
   WS_DEBUG_PRINT(msg_add.pin);
   did_attach = _pwm_hardware[_active_pwm_pins]->AttachPin(
       pin, (uint32_t)msg_add.frequency, (uint32_t)msg_add.resolution);
-  if (! did_attach) {
+  if (!did_attach) {
     WS_DEBUG_PRINTLN("[pwm] Failed to attach pin!");
     delete _pwm_hardware[_active_pwm_pins];
   } else {
@@ -172,17 +172,6 @@ bool PWMController::Handle_PWM_Write_DutyCycle(pb_istream_t *stream) {
   return true;
 }
 
-/**************************************************************************/
-/*!
-    @brief  Handles the PWM_Write_DutyCycle_Multi message.
-    @param  stream The stream containing the message data.
-    @return True if the message was handled successfully, false otherwise.
-*/
-/**************************************************************************/
-bool PWMController::Handle_PWM_Write_DutyCycle_Multi(pb_istream_t *stream) {
-  return false;
-}
-
 /**************************************************************************/
 /*!
     @brief  Handles the PWM_Write_Frequency message.
@@ -206,7 +195,7 @@ bool PWMController::Handle_PWM_Write_Frequency(pb_istream_t *stream) {
     return false;
   }
 
-  if (!_pwm_hardware[pin_idx]->WriteTone(msg_write_frequency.frequency) ==
+  if (_pwm_hardware[pin_idx]->WriteTone(msg_write_frequency.frequency) !=
       msg_write_frequency.frequency) {
     WS_DEBUG_PRINTLN("[pwm] Error: Failed to write frequency!");
     return false;

src/components/pwm/controller.h

@@ -36,7 +36,6 @@ class PWMController {
   ~PWMController();
   bool Handle_PWM_Add(pb_istream_t *stream);
   bool Handle_PWM_Write_DutyCycle(pb_istream_t *stream);
-  bool Handle_PWM_Write_DutyCycle_Multi(pb_istream_t *stream);
   bool Handle_PWM_Write_Frequency(pb_istream_t *stream);
   bool Handle_PWM_Remove(pb_istream_t *stream);
   int GetPWMHardwareIdx(uint8_t pin);

src/components/pwm/hardware.cpp

@@ -19,9 +19,7 @@
     @brief  Ctor for PWMHardware
 */
 /**************************************************************************/
-PWMHardware::PWMHardware() {
-_is_attached = false;
-}
+PWMHardware::PWMHardware() { _is_attached = false; }
 
 /**************************************************************************/
 /*!
@@ -42,21 +40,22 @@ PWMHardware::~PWMHardware() {
     @return true if the pin was successfully attached, false otherwise
 */
 /**************************************************************************/
-bool PWMHardware::AttachPin(uint8_t pin, uint32_t frequency, uint32_t resolution) {
+bool PWMHardware::AttachPin(uint8_t pin, uint32_t frequency,
+                            uint32_t resolution) {
 #ifdef ARDUINO_ARCH_ESP32
   _is_attached = ledcAttach(pin, frequency, resolution);
 #else
   _is_attached = true;
 #endif
 
-if (_is_attached) {
-  _pin = pin;
-  _frequency = frequency;
-  _resolution = resolution;
-  _duty_cycle = 0;
-}
+  if (_is_attached) {
+    _pin = pin;
+    _frequency = frequency;
+    _resolution = resolution;
+    _duty_cycle = 0;
+  }
 
-return _is_attached;
+  return _is_attached;
 }
 
 /**************************************************************************/
@@ -66,20 +65,20 @@ return _is_attached;
 */
 /**************************************************************************/
 bool PWMHardware::DetachPin() {
-    if (! _is_attached) {
-        WS_DEBUG_PRINTLN("[pwm] Pin not attached!");
-        return false;
-    }
-    bool did_detach = false;
-    #ifdef ARDUINO_ARCH_ESP32
-    did_detach = ledcDetach(_pin);
-    #else
-    digitalWrite(_pin, LOW); // "Disable" the pin's output
-    did_detach = true;
-    #endif
-
-    _is_attached = false; // always mark as false, for tracking
-    return did_detach;
+  if (!_is_attached) {
+    WS_DEBUG_PRINTLN("[pwm] Pin not attached!");
+    return false;
+  }
+  bool did_detach = false;
+#ifdef ARDUINO_ARCH_ESP32
+  did_detach = ledcDetach(_pin);
+#else
+  digitalWrite(_pin, LOW); // "Disable" the pin's output
+  did_detach = true;
+#endif
+
+  _is_attached = false; // always mark as false, for tracking
+  return did_detach;
 }
 
 /**************************************************************************/
@@ -91,18 +90,18 @@ bool PWMHardware::DetachPin() {
 */
 /**************************************************************************/
 bool PWMHardware::WriteDutyCycle(uint32_t duty) {
-  if (! _is_attached) {
+  if (!_is_attached) {
     WS_DEBUG_PRINTLN("[pwm] Pin not attached!");
     return false;
   }
   bool did_write = false;
-  #if defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH) && defined(STATUS_LED_PIN)
+#if defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH) && defined(STATUS_LED_PIN)
   // Adafruit Feather ESP8266's analogWrite() gets inverted since the builtin
   // LED is reverse-wired
   _duty_cycle = 255 - duty;
-  #else
+#else
   _duty_cycle = duty;
-  #endif
+#endif
 
 #ifdef ARDUINO_ARCH_ESP32
   did_write = analogWrite(_duty_cycle);
@@ -122,18 +121,18 @@ bool PWMHardware::WriteDutyCycle(uint32_t duty) {
 */
 /**************************************************************************/
 uint32_t PWMHardware::WriteTone(uint32_t freq) {
-  if (! _is_attached) {
+  if (!_is_attached) {
     WS_DEBUG_PRINTLN("[pwm] Pin not attached!");
     return false;
   }
 
   uint32_t rc = 0;
-  #ifdef ARDUINO_ARCH_ESP32
+#ifdef ARDUINO_ARCH_ESP32
   rc = ledcWriteTone(_pin, freq);
-  #else
+#else
   tone(_pin, freq);
   rc = freq;
-  #endif
+#endif
 
   return rc;
 }
@@ -144,9 +143,7 @@ uint32_t PWMHardware::WriteTone(uint32_t freq) {
     @return The logical pin number of the PWM pin
 */
 /**************************************************************************/
-uint8_t PWMHardware::GetPin() {
-    return _pin;
-}
+uint8_t PWMHardware::GetPin() { return _pin; }
 
 // LEDC API Wrappers
 #ifdef ARDUINO_ARCH_ESP32

src/components/pwm/model.cpp

@@ -141,27 +141,6 @@ wippersnapper_pwm_PWMWriteDutyCycle *PWMModel::GetPWMWriteDutyCycleMsg() {
   return &_msg_pwm_write_duty_cycle;
 }
 
-/**************************************************************************/
-/*! 
-    @brief  Decodes a PWMWriteDutyCycleMulti message from an input stream.
-    @param  stream  The stream to decode from.
-    @return true if successful, false otherwise.
-*/
-/**************************************************************************/
-bool PWMModel::DecodePWMWriteDutyCycleMulti(pb_istream_t *stream) {
-  return false;
-}
-
-/**************************************************************************/
-/*! 
-    @brief  Returns a pointer to the PWMWriteDutyCycleMulti message.
-    @return Pointer to the PWMWriteDutyCycleMulti message.
-*/
-/**************************************************************************/
-wippersnapper_pwm_PWMWriteDutyCycleMulti *PWMModel::GetPWMWriteDutyCycleMultiMsg() {
-    return &_msg_pwm_write_duty_cycle_multi;
-}
-
 /**************************************************************************/
 /*! 
     @brief  Decodes a PWMWriteFrequency message from an input stream.

src/components/pwm/model.h

@@ -34,16 +34,13 @@ class PWMModel {
   wippersnapper_pwm_PWMRemove *GetPWMRemoveMsg();
   bool DecodePWMWriteDutyCycle(pb_istream_t *stream);
   wippersnapper_pwm_PWMWriteDutyCycle *GetPWMWriteDutyCycleMsg();
-  bool DecodePWMWriteDutyCycleMulti(pb_istream_t *stream);
-  wippersnapper_pwm_PWMWriteDutyCycleMulti *GetPWMWriteDutyCycleMultiMsg();
   bool DecodePWMWriteFrequency(pb_istream_t *stream);
   wippersnapper_pwm_PWMWriteFrequency *GetPWMWriteFrequencyMsg();
 private:
   wippersnapper_pwm_PWMAdd _msg_pwm_add; ///< PWMAdd message object
   wippersnapper_pwm_PWMAdded _msg_pwm_added; ///< PWMAdded message object
   wippersnapper_pwm_PWMRemove _msg_pwm_remove; ///< PWMRemove message object
   wippersnapper_pwm_PWMWriteDutyCycle _msg_pwm_write_duty_cycle; ///< PWMWriteDutyCycle message object
-  wippersnapper_pwm_PWMWriteDutyCycleMulti _msg_pwm_write_duty_cycle_multi; ///< PWMWriteDutyCycleMulti message object
   wippersnapper_pwm_PWMWriteFrequency _msg_pwm_write_frequency; ///< PWMWriteFrequency message object
 };
 #endif // WS_PWM_MODEL_H