logging/fixes

switchbot/devices/bot.py

@@ -38,7 +38,9 @@ class Switchbot(SwitchbotDevice):
             return True
 
         if result[0] == 5:
-            _LOGGER.debug("Bot is in press mode and doesn't have on state")
+            _LOGGER.debug(
+                "%s: Bot is in press mode and doesn't have on state", self.name
+            )
             return True
 
         return False
@@ -50,7 +52,9 @@ class Switchbot(SwitchbotDevice):
             return True
 
         if result[0] == 5:
-            _LOGGER.debug("Bot is in press mode and doesn't have off state")
+            _LOGGER.debug(
+                "%s: Bot is in press mode and doesn't have off state", self.name
+            )
             return True
 
         return False
@@ -62,7 +66,7 @@ class Switchbot(SwitchbotDevice):
             return True
 
         if result[0] == 5:
-            _LOGGER.debug("Bot is in press mode")
+            _LOGGER.debug("%s: Bot is in press mode", self.name)
             return True
 
         return False
@@ -74,7 +78,7 @@ class Switchbot(SwitchbotDevice):
             return True
 
         if result[0] == 5:
-            _LOGGER.debug("Bot is in press mode")
+            _LOGGER.debug("%s: Bot is in press mode", self.name)
             return True
 
         return False
@@ -86,7 +90,7 @@ class Switchbot(SwitchbotDevice):
             return True
 
         if result[0] == 5:
-            _LOGGER.debug("Bot is in switch mode")
+            _LOGGER.debug("%s: Bot is in switch mode", self.name)
             return True
 
         return False

switchbot/devices/curtain.py

@@ -112,7 +112,7 @@ class SwitchbotCurtain(SwitchbotDevice):
         )
 
         if _data in (b"\x07", b"\x00"):
-            _LOGGER.error("Unsuccessful, please try again")
+            _LOGGER.error("%s: Unsuccessful, please try again", self.name)
             return None
 
         self.ext_info_sum["device0"] = {
@@ -145,7 +145,7 @@ class SwitchbotCurtain(SwitchbotDevice):
         )
 
         if _data in (b"\x07", b"\x00"):
-            _LOGGER.error("Unsuccessful, please try again")
+            _LOGGER.error("%s: Unsuccessful, please try again", self.name)
             return None
 
         _state_of_charge = [

switchbot/devices/plug.py

@@ -13,11 +13,6 @@ PLUG_OFF_KEY = "570f50010100"
 class SwitchbotPlugMini(SwitchbotDevice):
     """Representation of a Switchbot plug mini."""
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        """Switchbot plug mini constructor."""
-        super().__init__(*args, **kwargs)
-        self._settings: dict[str, Any] = {}
-
     async def update(self, interface: int | None = None) -> None:
         """Update state of device."""
         await self.get_device_data(retry=self._retry_count, interface=interface)
@@ -35,7 +30,4 @@ class SwitchbotPlugMini(SwitchbotDevice):
     def is_on(self) -> Any:
         """Return switch state from cache."""
         # To get actual position call update() first.
-        value = self._get_adv_value("isOn")
-        if value is None:
-            return None
-        return value
+        return self._get_adv_value("isOn")