Merge branch 'main' of https://github.com/RaddedMC/python-roborock

Author: RaddedMC

roborock/data/b01_q7/b01_q7_containers.py

@@ -114,8 +114,7 @@ class B01Props(RoborockBase):
     wind: SCWindMapping | None = None
     water: WaterLevelMapping | None = None
     mode: CleanTypeMapping | None = None
-    quantity: int | None = None
-    battery: int | None = None
+    quantity: int | None = None # The Q7 L5 reports its battery level as 'quantity'
     alarm: int | None = None
     volume: int | None = None
     hypa: int | None = None
@@ -169,6 +168,13 @@ class B01Props(RoborockBase):
     serial_number: str | None = None
     recommend: Recommend | None = None
     add_sweep_status: int | None = None
+    
+    @property
+    def battery(self) -> int | None:
+        """
+        Returns device battery level as a percentage.
+        """
+        return self.quantity
 
     @property
     def main_brush_time_left(self) -> int | None:

roborock/devices/traits/b01/q7/__init__.py

@@ -84,7 +84,7 @@ async def set_clean_path_preference(self, preference: CleanPathPreferenceMapping
     async def set_repeat_state(self, repeat: CleanRepeatMapping) -> None:
         """Set the cleaning repeat state (cycles)."""
         await self.set_prop(RoborockB01Props.REPEAT_STATE, repeat.code)
-        
+
     async def start_clean(self) -> None:
         """Start cleaning."""
         await self.send(

roborock/roborock_message.py

@@ -165,7 +165,6 @@ class RoborockB01Props(StrEnum):
     WATER = "water"
     MODE = "mode"
     QUANTITY = "quantity"
-    BATTERY = "quantity"
     ALARM = "alarm"
     VOLUME = "volume"
     HYPA = "hypa"