pymammotion 0.5.15__tar.gz → 0.5.17__tar.gz

{pymammotion-0.5.15 → pymammotion-0.5.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.15
+Version: 0.5.17
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.5.15 → pymammotion-0.5.17}/pymammotion/data/model/device_info.py

@@ -19,6 +19,11 @@ class DeviceNonWorkingHours(DataClassORJSONMixin):
     start_time: str = ""
     end_time: str = ""
 
+@dataclass
+class LampInfo(DataClassORJSONMixin):
+    lamp_bright: int = 0
+    manual_light: bool = False
+    night_light: bool = False
 
 @dataclass
 class MowerInfo(DataClassORJSONMixin):
@@ -35,6 +40,7 @@ class MowerInfo(DataClassORJSONMixin):
     sub_model_id: str = ""
     ble_mac: str = ""
     wifi_mac: str = ""
+    lamp_info: LampInfo = field(default_factory=LampInfo)
 
 
 @dataclass

{pymammotion-0.5.15 → pymammotion-0.5.17}/pymammotion/data/state_manager.py

@@ -32,7 +32,7 @@ from pymammotion.proto import (
     NavUnableTimeSet,
     SvgMessageAckT,
     TimeCtrlLight,
-    WifiIotStatusReport,
+    WifiIotStatusReport, Getlamprsp,
 )
 
 logger = logging.getLogger(__name__)
@@ -263,7 +263,14 @@ class StateManager:
                 self._device.mower_state.wifi_mac = get_network_info_resp.wifi_mac
 
     def _update_mul_data(self, message) -> None:
-        pass
+        """Media and video states."""
+        mul_msg = betterproto.which_one_of(message.net, "SubMul")
+        match mul_msg[0]:
+            case "Getlamprsp":
+                lamp_resp: Getlamprsp = mul_msg[1]
+                self._device.mower_state.lamp_info.lamp_bright = lamp_resp.lamp_bright
+                self._device.mower_state.lamp_info.night_light = True if lamp_resp.lamp_ctrl.value > 0 else False
+                self._device.mower_state.lamp_info.manual_light = True if lamp_resp.lamp_manual_ctrl.value > 0 else False
 
     def _update_ota_data(self, message) -> None:
         pass

pymammotion-0.5.17/pymammotion/mammotion/commands/messages/basestation.py

@@ -0,0 +1,43 @@
+"""RTK protobuf commands."""
+
+from abc import ABC
+from logging import getLogger
+import time
+
+from pymammotion.mammotion.commands.abstract_message import AbstractMessage
+from pymammotion.proto import (
+    AppToBaseMqttRtkT,
+    BaseStation,
+    LubaMsg,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
+    RequestBasestationInfoT,
+)
+
+logger = getLogger(__name__)
+
+
+class MessageBasestation(AbstractMessage, ABC):
+    def send_order_msg_basestation(self, driver) -> bytes:
+        return LubaMsg(
+            msgtype=MsgCmdType.BASESTATION,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.BASESTATION, MsgDevice.DEV_MAINCTL),
+            msgattr=MsgAttr.REQ,
+            timestamp=round(time.time() * 1000),
+            seqs=self.seqs.increment_and_get() & 255,
+            version=1,
+            subtype=self.user_account,
+            driver=driver,
+        ).SerializeToString()
+
+    def basestation_info(self) -> bytes:
+        """Build and send a request to get basestation info (request_type=1)."""
+        base = BaseStation(to_dev=RequestBasestationInfoT(request_type=1))
+        return self.send_order_msg_basestation(base)
+
+    def set_base_net_rtk_switch(self, rtk_switch: int) -> bytes:
+        """Set RTK switch via app_to_base_mqtt_rtk_t."""
+        base = BaseStation(app_to_base_mqtt_rtk_msg=AppToBaseMqttRtkT(rtk_switch=rtk_switch))
+        return self.send_order_msg_basestation(base)

{pymammotion-0.5.15 → pymammotion-0.5.17}/pymammotion/mammotion/commands/messages/media.py

@@ -81,7 +81,7 @@ class MessageMedia(AbstractMessage, ABC):
         manual off: false, id=1127, power_ctrl=2
         """
         ids = 1125 if manual_ctrl else 1127
-        manual_light_ctrl = LampManualCtrlSta.manual_power_off if manual_ctrl else LampManualCtrlSta.manual_power_on
+        manual_light_ctrl = LampManualCtrlSta.manual_power_on if manual_ctrl else LampManualCtrlSta.manual_power_off
         return self.send_order_msg_media(
             SocMul(set_lamp=SetHeadlamp(set_ids=ids, lamp_power_ctrl=2, lamp_manual_ctrl=manual_light_ctrl))
         )

{pymammotion-0.5.15 → pymammotion-0.5.17}/pymammotion/proto/__init__.py

@@ -235,6 +235,7 @@ class MsgCmdType(betterproto.Enum):
     ESP = 248
     MUL = 249
     PEPT = 250
+    BASESTATION = 251
 
 
 

{pymammotion-0.5.15 → pymammotion-0.5.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.15"
+version     = "0.5.17"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.15"
+current_version = "0.5.17"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true