Implement Handler for PWMAdd Message

Author: brentru

src/components/ds18x20/model.cpp

@@ -24,7 +24,6 @@ DS18X20Model::DS18X20Model() {
   memset(&_msg_DS18x20Added, 0, sizeof(_msg_DS18x20Added));
   memset(&_msg_DS18x20Remove, 0, sizeof(_msg_DS18x20Remove));
   memset(&_msg_DS18x20Event, 0, sizeof(_msg_DS18x20Event));
-  // no-op
 }
 
 /***********************************************************************/

src/components/pwm/controller.cpp

@@ -16,15 +16,45 @@
 
 PWMController::PWMController() {
   _pwm_model = new PWMModel();
-  _pwm_hardware = new PWMHardware();
+  _active_pwm_pins = 0;
 }
 
-PWMController::~PWMController() {
-  delete _pwm_model;
-  delete _pwm_hardware;
-}
+PWMController::~PWMController() { delete _pwm_model; }
+
+bool PWMController::Handle_PWM_Add(pb_istream_t *stream) {
+  bool did_attach;
+  if (!_pwm_model->DecodePWMAdd(stream)) {
+    WS_DEBUG_PRINTLN("[pwm] Failed to decode PWMAdd message!");
+    return false;
+  }
+  wippersnapper_pwm_PWMAdd msg_add = *_pwm_model->GetPWMAddMsg();
+  uint8_t pin = atoi(msg_add.pin + 1);
+  _pwm_hardware[_active_pwm_pins] = new PWMHardware();
 
-bool PWMController::Handle_PWM_Add(pb_istream_t *stream) { return false; }
+  did_attach = _pwm_hardware[_active_pwm_pins]->AttachPin(
+      pin, (uint32_t)msg_add.frequency, (uint32_t)msg_add.resolution);
+  if (!did_attach) {
+    WS_DEBUG_PRINTLN("[pwm] Failed to attach pin!");
+    // TODO: Test init. failure to see if the below line crashes?
+    // TODO: if it doesn't, we should probably implement this
+    // delete in the pixel controller class to avoid memory leaks
+    delete _pwm_hardware[_active_pwm_pins];
+  } else {
+    _active_pwm_pins++;
+  }
+
+  // Publish PixelsAdded message to the broker
+  if (!_pwm_model->EncodePWMAdded(msg_add.pin, did_attach)) {
+    WS_DEBUG_PRINTLN("[pwm]: Failed to encode PWMAdded message!");
+    return false;
+  }
+  if (!WsV2.PublishSignal(wippersnapper_signal_DeviceToBroker_pwm_added_tag,
+                          _pwm_model->GetPWMAddedMsg())) {
+    WS_DEBUG_PRINTLN("[PWM]: Unable to publish PWMAdded message!");
+    return false;
+  }
+  return true;
+}
 
 bool PWMController::Handle_PWM_Write_DutyCycle(pb_istream_t *stream) {
   return false;

src/components/pwm/controller.h

@@ -17,6 +17,7 @@
 #include "Wippersnapper_V2.h"
 #include "hardware.h"
 #include "model.h"
+#define MAX_PWM_PINS 25 ///< Maximum number of PWM pins supported
 
 class Wippersnapper_V2; // Forward declaration
 class PWMModel;         // Forward declaration
@@ -33,7 +34,6 @@ class PWMController {
 public:
   PWMController();
   ~PWMController();
-  // Called by the cbDecodeBrokerToDevice router function
   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);
@@ -42,7 +42,8 @@ class PWMController {
 
 private:
   PWMModel *_pwm_model;
-  PWMHardware *_pwm_hardware;
+  PWMHardware *_pwm_hardware[MAX_PWM_PINS] = {nullptr};
+  int _active_pwm_pins;
 };
 extern Wippersnapper_V2 WsV2; ///< Wippersnapper V2 instance
 #endif                        // WS_PWM_CONTROLLER_H

src/components/pwm/model.cpp

@@ -14,22 +14,88 @@
  */
 #include "model.h"
 
-PWMModel::PWMModel() {}
+/**************************************************************************/
+/*! 
+    @brief  Ctor for PWMModel.
+*/
+/**************************************************************************/
+PWMModel::PWMModel() {
+    memset(&_msg_pwm_add, 0, sizeof(_msg_pwm_add));
+    memset(&_msg_pwm_added, 0, sizeof(_msg_pwm_added));
+    memset(&_msg_pwm_remove, 0, sizeof(_msg_pwm_remove));
+    memset(&_msg_pwm_write_duty_cycle, 0, sizeof(_msg_pwm_write_duty_cycle));
+    memset(&_msg_pwm_write_duty_cycle_multi, 0, sizeof(_msg_pwm_write_duty_cycle_multi));
+    memset(&_msg_pwm_write_frequency, 0, sizeof(_msg_pwm_write_frequency));
+}
 
-PWMModel::~PWMModel() {}
+/**************************************************************************/
+/*! 
+    @brief  Dtor for PWMModel.
+*/
+/**************************************************************************/
+PWMModel::~PWMModel() {
+    memset(&_msg_pwm_add, 0, sizeof(_msg_pwm_add));
+    memset(&_msg_pwm_added, 0, sizeof(_msg_pwm_added));
+    memset(&_msg_pwm_remove, 0, sizeof(_msg_pwm_remove));
+    memset(&_msg_pwm_write_duty_cycle, 0, sizeof(_msg_pwm_write_duty_cycle));
+    memset(&_msg_pwm_write_duty_cycle_multi, 0, sizeof(_msg_pwm_write_duty_cycle_multi));
+    memset(&_msg_pwm_write_frequency, 0, sizeof(_msg_pwm_write_frequency));
+}
 
+/**************************************************************************/
+/*! 
+    @brief  Decodes a PWMAdd message from an input stream.
+    @param  stream  The stream to decode from.
+    @return true if successful, false otherwise.
+*/
+/**************************************************************************/
 bool PWMModel::DecodePWMAdd(pb_istream_t *stream) {
-  return false;
+  memset(&_msg_pwm_add, 0, sizeof(_msg_pwm_add));
+  // Attempt to decode the stream into a pwm_PWMAdd message
+  return pb_decode(stream, wippersnapper_pwm_PWMAdd_fields, &_msg_pwm_add);
 }
 
+/**************************************************************************/
+/*! 
+    @brief  Returns a pointer to the PWMAdd message.
+    @return Pointer to the PWMAdd message.
+*/
+/**************************************************************************/
 wippersnapper_pwm_PWMAdd *PWMModel::GetPWMAddMsg() {
+  return &_msg_pwm_add;
 }
 
+/**************************************************************************/
+/*! 
+    @brief  Encodes a PWMAdded message with the given pin name and attach status.
+    @param  pin_name  The name of the pin.
+    @param  did_attach  True if the pin was successfully attached, false otherwise.
+    @return true if successful, false otherwise.
+*/
+/**************************************************************************/
 bool PWMModel::EncodePWMAdded(char *pin_name, bool did_attach) {
-  return false;
+  // Fill the message
+  memset(&_msg_pwm_added, 0, sizeof(_msg_pwm_added));
+  _msg_pwm_added.did_attach = did_attach;
+  strncpy(_msg_pwm_added.pin, pin_name, sizeof(_msg_pwm_added.pin));
+  // Encode it!
+  size_t sz_msg;
+  if (!pb_get_encoded_size(&sz_msg, wippersnapper_pwm_PWMAdded_fields,
+                           &_msg_pwm_added))
+    return false;
+  uint8_t buf[sz_msg];
+  pb_ostream_t msg_stream = pb_ostream_from_buffer(buf, sizeof(buf));
+  return pb_encode(&msg_stream, wippersnapper_pwm_PWMAdded_fields, &_msg_pwm_added);
 }
 
+/**************************************************************************/
+/*! 
+    @brief  Returns a pointer to the PWMAdded message.
+    @return Pointer to the PWMAdded message.
+*/
+/**************************************************************************/
 wippersnapper_pwm_PWMAdded *PWMModel::GetPWMAddedMsg() {
+  return &_msg_pwm_added;
 }
 
 bool PWMModel::DecodePWMRemove(pb_istream_t *stream) {