🚧 WIP, dsx, handle event/remove

Author: brentru

src/Wippersnapper_V2.cpp

@@ -379,6 +379,13 @@ bool cbDecodeBrokerToDevice(pb_istream_t *stream, const pb_field_t *field,
       return false;
     }
     break;
+  case wippersnapper_signal_BrokerToDevice_ds18x20_remove_tag:
+    WS_DEBUG_PRINTLN("-> DS18X20 Remove Message Type");
+    if (!WsV2._ds18x20_controller->Handle_Ds18x20Remove(stream)) {
+      WS_DEBUG_PRINTLN("ERROR: Unable to remove DS18X20 sensor!");
+      return false;
+    }
+    break;
   default:
     WS_DEBUG_PRINTLN("ERROR: BrokerToDevice message type not found!");
     return false;
@@ -895,6 +902,12 @@ bool Wippersnapper_V2::PublishSignal(pb_size_t which_payload, void *payload) {
         wippersnapper_signal_DeviceToBroker_ds18x20_added_tag;
     MsgSignal.payload.ds18x20_added = *(wippersnapper_ds18x20_Ds18x20Added *)payload;
     break;
+  case wippersnapper_signal_DeviceToBroker_ds18x20_event_tag:
+    WS_DEBUG_PRINTLN("DS18X20Event");
+    MsgSignal.which_payload =
+        wippersnapper_signal_DeviceToBroker_ds18x20_event_tag;
+    MsgSignal.payload.ds18x20_event = *(wippersnapper_ds18x20_Ds18x20Event *)payload;
+    break;
   default:
     WS_DEBUG_PRINTLN("ERROR: Invalid signal payload type, bailing out!");
     return false;

src/components/ds18x20/controller.cpp

@@ -118,6 +118,7 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
 */
 /***********************************************************************/
 bool DS18X20Controller::Handle_Ds18x20Remove(pb_istream_t *stream) {
+  WS_DEBUG_PRINT("Removing DS18X20 sensor...");
   // Attempt to decode the stream
   if (!_DS18X20_model->DecodeDS18x20Remove(stream)) {
     WS_DEBUG_PRINTLN("ERROR: Unable to decode Ds18x20Remove message");
@@ -135,8 +136,7 @@ bool DS18X20Controller::Handle_Ds18x20Remove(pb_istream_t *stream) {
       return true;
     }
   }
-  WS_DEBUG_PRINT("Removed OneWire Pin: ");
-  WS_DEBUG_PRINTLN(pin_name);
+  WS_DEBUG_PRINT("Removed!");
   return true;
 }
 
@@ -186,25 +186,34 @@ void DS18X20Controller::update() {
           wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE_FAHRENHEIT,
           temp_f);
     }
-    // Print out the SensorEvent message's contents for debugging
-    // TODO: After debugging, maybe remove this
+    // Get and print out the SensorEvent message's contents
     wippersnapper_ds18x20_Ds18x20Event event_msg =
         *_DS18X20_model->GetDS18x20EventMsg();
-    WS_DEBUG_PRINTLN("SensorEvent message:");
-    WS_DEBUG_PRINT("Sensor OneWire bus pin: ");
-    WS_DEBUG_PRINTLN(event_msg.onewire_pin);
-    WS_DEBUG_PRINT("Sensor events count: ");
-    WS_DEBUG_PRINTLN(event_msg.sensor_events_count);
+    pb_size_t event_count = event_msg.sensor_events_count;
 
-    for (int i = 0;
-         i < _DS18X20_model->GetDS18x20EventMsg()->sensor_events_count; i++) {
-      WS_DEBUG_PRINT("Sensor type: ");
-      WS_DEBUG_PRINTLN(event_msg.sensor_events[i].type);
+    WS_DEBUG_PRINT("Sensor OneWire bus pin: ");
+    WS_DEBUG_PRINT(temp_dsx_driver.GetOneWirePin());
+    WS_DEBUG_PRINT(" got ");
+    WS_DEBUG_PRINT(event_count);
+    WS_DEBUG_PRINTLN(" sensor events");
+    for (int i = 0; i < event_count; i++) {
       WS_DEBUG_PRINT("Sensor value: ");
       WS_DEBUG_PRINTLN(event_msg.sensor_events[i].value.float_value);
-      WS_DEBUG_PRINT("Sensor value type: ");
-      WS_DEBUG_PRINTLN(event_msg.sensor_events[i].which_value);
     }
+
+    // Encode the Ds18x20Event message
+    if (!_DS18X20_model->EncodeDs18x20Event()) {
+      WS_DEBUG_PRINTLN("ERROR: Failed to encode Ds18x20Event message");
+      continue;
+    }
+    // Publish the Ds18x20Event message to the broker
+    WS_DEBUG_PRINT("Publishing Ds18x20Event message to broker...");
+    if (!WsV2.PublishSignal(
+            wippersnapper_signal_DeviceToBroker_ds18x20_event_tag,
+            _DS18X20_model->GetDS18x20EventMsg())) {
+      WS_DEBUG_PRINTLN("ERROR: Failed to publish Ds18x20Event message");
+      continue;
+    }
+    WS_DEBUG_PRINTLN("Published!");
   }
-  // TODO: Encode and publish the Ds18x20Event message to the broker
 }

src/components/ds18x20/model.cpp

@@ -144,22 +144,13 @@ wippersnapper_ds18x20_Ds18x20Event *DS18X20Model::GetDS18x20EventMsg() {
     @return True if the message was successfully encoded, False otherwise.
 */
 /*************************************************************************/
-bool DS18X20Model::EncodeDs18x20Event(
-    char *onewire_pin, pb_size_t sensor_events_count,
-    const wippersnapper_sensor_SensorEvent sensor_events[2]) {
-  // Fill the Ds18x20Event message
-  _msg_DS18x20Event = wippersnapper_ds18x20_Ds18x20Event_init_zero;
-  strcpy(_msg_DS18x20Event.onewire_pin, onewire_pin);
-  _msg_DS18x20Event.sensor_events_count = sensor_events_count;
-  // Fill with sensor_events
-  for (int i = 0; i < _msg_DS18x20Event.sensor_events_count; i++) {
-    _msg_DS18x20Event.sensor_events[i] = sensor_events[i];
-  }
-  // Encode and return the Ds18x20Event message
+bool DS18X20Model::EncodeDs18x20Event() {
+  // take the filled _msg_DS18x20Event we built in the controller and encode it
   size_t sz_msg;
   if (!pb_get_encoded_size(&sz_msg, wippersnapper_ds18x20_Ds18x20Event_fields,
                            &_msg_DS18x20Event))
     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_ds18x20_Ds18x20Event_fields,

src/components/ds18x20/model.h

@@ -36,9 +36,7 @@ class DS18X20Model {
   bool DecodeDS18x20Remove(pb_istream_t *stream);
   wippersnapper_ds18x20_Ds18x20Remove *GetDS18x20RemoveMsg();
   // Ds18x20Event Message
-  bool
-  EncodeDs18x20Event(char *onewire_pin, pb_size_t sensor_events_count,
-                     const wippersnapper_sensor_SensorEvent sensor_events[2]);
+  bool EncodeDs18x20Event();
   wippersnapper_ds18x20_Ds18x20Event *GetDS18x20EventMsg();
   // TODO: move the below to private if we arent using it in controller?
   wippersnapper_ds18x20_Ds18x20Event