🚧 WIP, analogio - publish out to the broker

Author: brentru

src/Wippersnapper_V2.cpp

@@ -862,26 +862,32 @@ bool Wippersnapper_V2::PublishSignal(pb_size_t which_payload, void *payload) {
   WS_DEBUG_PRINT("Signal Payload Type: ");
   switch (which_payload) {
   case wippersnapper_signal_DeviceToBroker_checkin_request_tag:
-    WS_DEBUG_PRINTLN("Checkin Request");
+    WS_DEBUG_PRINTLN("CheckinRequest");
     MsgSignal.which_payload =
         wippersnapper_signal_DeviceToBroker_checkin_request_tag;
     MsgSignal.payload.checkin_request =
         *(wippersnapper_checkin_CheckinRequest *)payload;
     break;
   case wippersnapper_signal_DeviceToBroker_digitalio_event_tag:
-    WS_DEBUG_PRINTLN("DigitalIO Event");
+    WS_DEBUG_PRINTLN("DigitalIOEvent");
     MsgSignal.which_payload =
         wippersnapper_signal_DeviceToBroker_digitalio_event_tag;
     MsgSignal.payload.digitalio_event =
         *(wippersnapper_digitalio_DigitalIOEvent *)payload;
     break;
   case wippersnapper_signal_DeviceToBroker_analogio_event_tag:
-    WS_DEBUG_PRINTLN("AnalogIO Event");
+    WS_DEBUG_PRINTLN("AnalogIOEvent");
     MsgSignal.which_payload =
         wippersnapper_signal_DeviceToBroker_analogio_event_tag;
     MsgSignal.payload.analogio_event =
         *(wippersnapper_analogio_AnalogIOEvent *)payload;
     break;
+  case wippersnapper_signal_DeviceToBroker_ds18x20_added_tag:
+    WS_DEBUG_PRINTLN("DS18X20Added");
+    MsgSignal.which_payload =
+        wippersnapper_signal_DeviceToBroker_ds18x20_added_tag;
+    MsgSignal.payload.ds18x20_added = *(wippersnapper_ds18x20_Ds18x20Added *)payload;
+    break;
   default:
     WS_DEBUG_PRINTLN("ERROR: Invalid signal payload type, bailing out!");
     return false;

src/components/ds18x20/controller.cpp

@@ -35,7 +35,19 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
   // Add the DS18X20Hardware object to the vector of hardware objects
   _DS18X20_pins.push_back(new_dsx_driver);
 
-  // TODO: We should publish back an Added message to the broker
+  // Encode and publish a Ds18x20Added message back to the broker
+  if (!_DS18X20_model->EncodeDS18x20Added(
+          _DS18X20_model->GetDS18x20AddMsg()->onewire_pin, true)) {
+    WS_DEBUG_PRINTLN("ERROR: Unable to encode Ds18x20Added message");
+    return false;
+  }
+
+  // Publish the AnalogIO message to the broker
+  if (!WsV2.PublishSignal(wippersnapper_signal_DeviceToBroker_ds18x20_added_tag,
+                          _DS18X20_model->GetDS18x20AddedMsg())) {
+    WS_DEBUG_PRINTLN("ERROR: Unable to publish Ds18x20Added message");
+    return false;
+  }
 
   return true;
 }

src/components/ds18x20/model.cpp

@@ -32,6 +32,10 @@ wippersnapper_ds18x20_Ds18x20Add *DS18X20Model::GetDS18x20AddMsg() {
   return &_msg_DS18x20Add;
 }
 
+wippersnapper_ds18x20_Ds18x20Added *DS18X20Model::GetDS18x20AddedMsg() {
+  return &_msg_DS18x20Added;
+}
+
 bool DS18X20Model::EncodeDS18x20Added(char *onewire_pin, bool is_init) {
   // Fill the Ds18x20Added message
   _msg_DS18x20Added = wippersnapper_ds18x20_Ds18x20Added_init_zero;
@@ -49,4 +53,4 @@ bool DS18X20Model::EncodeDS18x20Added(char *onewire_pin, bool is_init) {
   pb_ostream_t msg_stream = pb_ostream_from_buffer(buf, sizeof(buf));
   return pb_encode(&msg_stream, wippersnapper_ds18x20_Ds18x20Added_fields,
                    &_msg_DS18x20Added);
-}
+}

src/components/ds18x20/model.h

@@ -31,6 +31,7 @@ class DS18X20Model {
   wippersnapper_ds18x20_Ds18x20Add *GetDS18x20AddMsg();
   // Ds18x20Remove Message
   bool EncodeDS18x20Added(char *onewire_pin, bool is_init);
+  wippersnapper_ds18x20_Ds18x20Added *GetDS18x20AddedMsg();
 
 private:
   wippersnapper_ds18x20_Ds18x20Add