🚧 WIP, analogio - Add encoder for a raw analogio event

Author: brentru

src/components/analogIO/controller.cpp

@@ -89,7 +89,25 @@ bool AnalogIOController::IsPinTimerExpired(analogioPin *pin, ulong cur_time) {
 }
 
 bool AnalogIOController::EncodePublishPinValue(uint8_t pin, uint16_t value) {
-  // TODO!
+  char c_pin_name[12];
+  sprintf(c_pin_name, "D%d", pin);
+
+  // Encode the DigitalIOEvent message
+  if (!_analogio_model->EncodeAnalogIOEventRaw(c_pin_name, value)) {
+    WS_DEBUG_PRINTLN("ERROR: Unable to encode DigitalIOEvent message!");
+    return false;
+  }
+
+  // Publish the DigitalIOEvent message to the broker
+  if (!WsV2.PublishSignal(
+          wippersnapper_signal_DeviceToBroker_digitalio_event_tag,
+          _analogio_model->GetAnalogIOEvent())) {
+    WS_DEBUG_PRINTLN("ERROR: Unable to publish analogio voltage event message, "
+                     "moving onto the next pin!");
+    return false;
+  }
+  WS_DEBUG_PRINTLN("Published AnalogIOEvent message to broker!")
+
   return true;
 }
 
@@ -98,7 +116,7 @@ bool AnalogIOController::EncodePublishPinVoltage(uint8_t pin, float value) {
   sprintf(c_pin_name, "D%d", pin);
 
   // Encode the DigitalIOEvent message
-  if (!_analogio_model->EncodeAnalogIOVoltageEvent(c_pin_name, value)) {
+  if (!_analogio_model->EncodeAnalogIOEventVoltage(c_pin_name, value)) {
     WS_DEBUG_PRINTLN("ERROR: Unable to encode DigitalIOEvent message!");
     return false;
   }

src/components/analogIO/model.cpp

@@ -54,8 +54,7 @@ wippersnapper_analogio_AnalogIOEvent *AnalogIOModel::GetAnalogIOEvent() {
   return &_msg_AnalogioEvent;
 }
 
-bool AnalogIOModel::EncodeAnalogIOVoltageEvent(char *pin_name,
-                                               float pin_value) {
+bool AnalogIOModel::EncodeAnalogIOEventRaw(char *pin_name, int16_t pin_value) {
   // Initialize the AnalogIOEvent message to default values
   _msg_AnalogioEvent = wippersnapper_analogio_AnalogIOEvent_init_zero;
   // Fill the AnalogIOEvent message's fields
@@ -66,6 +65,34 @@ bool AnalogIOModel::EncodeAnalogIOVoltageEvent(char *pin_name,
       wippersnapper_sensor_SensorType_SENSOR_TYPE_RAW;
   _msg_AnalogioEvent.sensor_event.which_value =
       wippersnapper_sensor_SensorEvent_float_value_tag;
+  _msg_AnalogioEvent.sensor_event.value.float_value = (float)pin_value;
+
+  // Obtain size of an encoded AnalogIOEvent message
+  size_t sz_aio_event_msg;
+  if (!pb_get_encoded_size(&sz_aio_event_msg,
+                           wippersnapper_analogio_AnalogIOEvent_fields,
+                           &_msg_AnalogioEvent))
+    return false;
+
+  // Encode the AnalogIOEvent message
+  uint8_t buf[sz_aio_event_msg];
+  pb_ostream_t msg_stream = pb_ostream_from_buffer(buf, sizeof(buf));
+  return pb_encode(&msg_stream, wippersnapper_analogio_AnalogIOEvent_fields,
+                   &_msg_AnalogioEvent);
+}
+
+bool AnalogIOModel::EncodeAnalogIOEventVoltage(char *pin_name,
+                                               float pin_value) {
+  // Initialize the AnalogIOEvent message to default values
+  _msg_AnalogioEvent = wippersnapper_analogio_AnalogIOEvent_init_zero;
+  // Fill the AnalogIOEvent message's fields
+  strncpy(_msg_AnalogioEvent.pin_name, pin_name,
+          sizeof(_msg_AnalogioEvent.pin_name));
+  _msg_AnalogioEvent.has_sensor_event = true;
+  _msg_AnalogioEvent.sensor_event.type =
+      wippersnapper_sensor_SensorType_SENSOR_TYPE_VOLTAGE;
+  _msg_AnalogioEvent.sensor_event.which_value =
+      wippersnapper_sensor_SensorEvent_float_value_tag;
   _msg_AnalogioEvent.sensor_event.value.float_value = pin_value;
 
   // Obtain size of an encoded AnalogIOEvent message

src/components/analogIO/model.h

@@ -33,8 +33,8 @@ class AnalogIOModel {
   bool DecodeAnalogIORemove(pb_istream_t *stream);
   wippersnapper_analogio_AnalogIORemove *GetAnalogIORemoveMsg();
   // AnalogIOEvent
-  bool EncodeAnalogIOVoltageEvent(char *pin_name, float pin_value);
-  // bool EncodeAnalogIORawEvent(char *pin_name, int16_t pin_value);
+  bool EncodeAnalogIOEventVoltage(char *pin_name, float pin_value);
+  bool EncodeAnalogIOEventRaw(char *pin_name, int16_t pin_value);
   wippersnapper_analogio_AnalogIOEvent *GetAnalogIOEvent();
 
 private: