🚧 Remove the onewire bus from the pin and vec erase

Author: brentru

src/components/ds18x20/controller.cpp

@@ -81,6 +81,29 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
   return true;
 }
 
+bool DS18X20Controller::Handle_Ds18x20Remove(pb_istream_t *stream) {
+  // Attempt to decode the stream
+  if (!_DS18X20_model->DecodeDS18x20Remove(stream)) {
+    WS_DEBUG_PRINTLN("ERROR: Unable to decode Ds18x20Remove message");
+    return false;
+  }
+  // Create a temp. instance of the Ds18x20Remove message
+  wippersnapper_ds18x20_Ds18x20Remove *msg_remove =
+      _DS18X20_model->GetDS18x20RemoveMsg();
+  uint8_t pin_name = atoi(msg_remove->onewire_pin + 1);
+  // Destroy the DS18X20Hardware object, remove it from the vector, and release
+  // it for other uses
+  for (uint8_t i = 0; i < _DS18X20_pins.size(); i++) {
+    if (_DS18X20_pins[i].GetOneWirePin() == pin_name) {
+      _DS18X20_pins.erase(_DS18X20_pins.begin() + i);
+      break;
+    }
+  }
+  WS_DEBUG_PRINT("Removed OneWire Pin: ");
+  WS_DEBUG_PRINTLN(pin_name);
+  return true;
+}
+
 void DS18X20Controller::update() {
   // Bail out if there are no OneWire pins to poll
   if (_DS18X20_pins.empty())

src/components/ds18x20/controller.h

@@ -33,7 +33,7 @@ class DS18X20Controller {
   ~DS18X20Controller();
   // Routing
   bool Handle_Ds18x20Add(pb_istream_t *stream);
-  // TODO: Implement Handle DS18x20 Remove message!
+  bool Handle_Ds18x20Remove(pb_istream_t *stream);
   // Polling
   void update();
 

src/components/ds18x20/hardware.cpp

@@ -33,6 +33,8 @@ bool DS18X20Hardware::GetSensor() {
   return ec == OneWireNg::EC_SUCCESS;
 }
 
+uint8_t DS18X20Hardware::GetOneWirePin() { return _onewire_pin; }
+
 void DS18X20Hardware::SetResolution(int resolution) {
   // Set the resolution of the DS18X20 sensor driver
   switch (resolution) {

src/components/ds18x20/hardware.h

@@ -34,6 +34,7 @@ class DS18X20Hardware {
   void SetPeriod(float period);
   bool IsTimerExpired();
   bool GetSensor();
+  uint8_t GetOneWirePin();
   bool ReadTemperatureC();
   bool ReadTemperatureF();
   float GetTemperatureC();

src/components/ds18x20/model.cpp

@@ -54,6 +54,16 @@ bool DS18X20Model::EncodeDS18x20Added(char *onewire_pin, bool is_init) {
                    &_msg_DS18x20Added);
 }
 
+bool DS18X20Model::DecodeDS18x20Remove(pb_istream_t *stream) {
+  _msg_DS18x20Remove = wippersnapper_ds18x20_Ds18x20Remove_init_zero;
+  return pb_decode(stream, wippersnapper_ds18x20_Ds18x20Remove_fields,
+                   &_msg_DS18x20Remove);
+}
+
+wippersnapper_ds18x20_Ds18x20Remove *DS18X20Model::GetDS18x20RemoveMsg() {
+  return &_msg_DS18x20Remove;
+}
+
 wippersnapper_ds18x20_Ds18x20Event *DS18X20Model::GetDS18x20EventMsg() {
   return &_msg_DS18x20Event;
 }

src/components/ds18x20/model.h

@@ -29,9 +29,12 @@ class DS18X20Model {
   // Ds18x20Add Message
   bool DecodeDS18x20Add(pb_istream_t *stream);
   wippersnapper_ds18x20_Ds18x20Add *GetDS18x20AddMsg();
-  // Ds18x20Remove Message
+  // DS18x20Added Message
   bool EncodeDS18x20Added(char *onewire_pin, bool is_init);
   wippersnapper_ds18x20_Ds18x20Added *GetDS18x20AddedMsg();
+  // Ds18x20Remove Message
+  bool DecodeDS18x20Remove(pb_istream_t *stream);
+  wippersnapper_ds18x20_Ds18x20Remove *GetDS18x20RemoveMsg();
   // Ds18x20Event Message
   bool
   EncodeDs18x20Event(char *onewire_pin, pb_size_t sensor_events_count,
@@ -49,8 +52,6 @@ class DS18X20Model {
       _msg_DS18x20Add; ///< wippersnapper_ds18x20_Ds18x20Add message
   wippersnapper_ds18x20_Ds18x20Added
       _msg_DS18x20Added; ///< wippersnapper_ds18x20_Ds18x20Added message
-  wippersnapper_ds18x20_Ds18x20Event
-      _msg_DS18x20Event; ///< wippersnapper_ds18x20_Ds18x20Event message
   wippersnapper_ds18x20_Ds18x20Remove
       _msg_DS18x20Remove; ///< wippersnapper_ds18x20_Ds18x20Remove message
 };