Code fixes and cleanup for roomba integration

homeassistant/components/roomba/binary_sensor.py

@@ -18,7 +18,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     status = roomba_reported_state(roomba).get("bin", {})
     if "full" in status:
         roomba_vac = RoombaBinStatus(roomba, blid)
-        roomba_vac.register_callback()
         async_add_entities([roomba_vac], True)
 
 
@@ -45,8 +44,4 @@ def icon(self):
     @property
     def state(self):
         """Return the state of the sensor."""
-        bin_status = (
-            roomba_reported_state(self.vacuum).get("bin", {}).get("full", False)
-        )
-        _LOGGER.debug("Update Full Bin status from the vacuum: %s", bin_status)
-        return bin_status
+        return roomba_reported_state(self.vacuum).get("bin", {}).get("full", False)

homeassistant/components/roomba/irobot_base.py

@@ -95,7 +95,7 @@ def device_info(self):
             "model": self._sku,
         }
 
-    def register_callback(self):
+    async def async_added_to_hass(self):
         """Register callback function."""
         self.vacuum.register_on_message_callback(self.on_message)
 
@@ -207,9 +207,7 @@ def device_state_attributes(self):
     def on_message(self, json_data):
         """Update state on message change."""
         _LOGGER.debug("Got new state from the vacuum: %s", json_data)
-        self.vacuum_state = self.vacuum.master_state.get("state", {}).get(
-            "reported", {}
-        )
+        self.vacuum_state = roomba_reported_state(self.vacuum)
         self.schedule_update_ha_state()
 
     async def async_start(self):
@@ -247,4 +245,3 @@ async def async_send_command(self, command, params=None, **kwargs):
         await self.hass.async_add_executor_job(
             self.vacuum.send_command, command, params
         )
-        return True

homeassistant/components/roomba/sensor.py

@@ -16,7 +16,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     roomba = domain_data[ROOMBA_SESSION]
     blid = domain_data[BLID]
     roomba_vac = RoombaBattery(roomba, blid)
-    roomba_vac.register_callback()
     async_add_entities([roomba_vac], True)
 
 
@@ -46,6 +45,4 @@ def unit_of_measurement(self):
     @property
     def state(self):
         """Return the state of the sensor."""
-        battery_level = roomba_reported_state(self.vacuum).get("batPct")
-        _LOGGER.debug("Update battery level status from the vacuum: %s", battery_level)
-        return battery_level
+        return roomba_reported_state(self.vacuum).get("batPct")

homeassistant/components/roomba/vacuum.py

@@ -28,5 +28,4 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         constructor = RoombaVacuum
 
     roomba_vac = constructor(roomba, blid)
-    roomba_vac.register_callback()
     async_add_entities([roomba_vac], True)