pymammotion 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

pymammotion/data/model/device.py

@@ -2,9 +2,12 @@
 
 from dataclasses import dataclass
 
+import betterproto
+
 from pymammotion.data.model import HashList
 from pymammotion.data.model.device_config import DeviceLimits
 from pymammotion.data.model.location import Location
+from pymammotion.data.model.report_info import ReportData
 from pymammotion.proto.dev_net import DevNet
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.luba_mul import SocMul
@@ -28,6 +31,7 @@ class MowingDevice:
         self.device = LubaMsg()
         self.map = HashList(area={}, path={}, obstacle={})
         self.location = Location()
+        self.report_data = ReportData()
         self.err_code_list = []
         self.err_code_list_time = []
         self.limits = DeviceLimits(30, 70, 0.2, 0.6)
@@ -85,7 +89,7 @@ class MowingDevice:
                     ]
                 )
 
-    def report_data(self, toapp_report_data: ReportInfoData):
+    def update_report_data(self, toapp_report_data: ReportInfoData):
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         for index, location in enumerate(toapp_report_data.locations):
             if index == 0:
@@ -93,6 +97,8 @@ class MowingDevice:
                 self.location.orientation = location.real_toward / 10000
                 self.location.device = coordinate_converter.enu_to_lla(location.real_pos_y, location.real_pos_x)
 
+        self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
+
 
 
     def mow_info(self, toapp_mow_info: MowToAppInfoT):

pymammotion/data/model/report_info.py

@@ -0,0 +1,121 @@
+from dataclasses import dataclass, field
+
+@dataclass
+class ConnectData:
+    connect_type: int = 0
+    ble_rssi: int = 0
+    wifi_rssi: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            connect_type=data.get('connect_type', 0),
+            ble_rssi=data.get('ble_rssi', 0),
+            wifi_rssi=data.get('wifi_rssi', 0)
+        )
+
+@dataclass
+class DeviceData:
+    sys_status: int = 0
+    charge_state: int = 0
+    battery_val: int = 0
+    sensor_status: int = 0
+    last_status: int = 0
+    sys_time_stamp: str = ""
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            sys_status=data.get('sys_status', 0),
+            charge_state=data.get('charge_state', 0),
+            battery_val=data.get('battery_val', 0),
+            sensor_status=data.get('sensor_status', 0),
+            last_status=data.get('last_status', 0),
+            sys_time_stamp=data.get('sys_time_stamp', "")
+        )
+
+@dataclass
+class RTKData:
+    status: int = 0
+    pos_level: int = 0
+    gps_stars: int = 0
+    dis_status: str = ""
+    co_view_stars: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            status=data.get('status', 0),
+            pos_level=data.get('pos_level', 0),
+            gps_stars=data.get('gps_stars', 0),
+            dis_status=data.get('dis_status', ""),
+            co_view_stars=data.get('co_view_stars', 0)
+        )
+
+@dataclass
+class LocationData:
+    real_pos_x: int = 0
+    real_pos_y: int = 0
+    real_toward: int = 0
+    pos_type: int = 0
+    bol_hash: str = ""
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            real_pos_x=data.get('real_pos_x', 0),
+            real_pos_y=data.get('real_pos_y', 0),
+            real_toward=data.get('real_toward', 0),
+            pos_type=data.get('pos_type', 0),
+            bol_hash=data.get('bol_hash', "")
+        )
+
+@dataclass
+class WorkData:
+    path_hash: str = ""
+    progress: int = 0
+    area: int = 0
+    bp_info: int = 0
+    bp_hash: str = ""
+    bp_pos_x: int = 0
+    bp_pos_y: int = 0
+    real_path_num: str = ""
+    ub_zone_hash: str = ""
+    init_cfg_hash: str = ""
+    ub_ecode_hash: str = ""
+    knife_height: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            path_hash=data.get('path_hash', ""),
+            progress=data.get('progress', 0),
+            area=data.get('area', 0),
+            bp_info=data.get('bp_info', 0),
+            bp_hash=data.get('bp_hash', ""),
+            bp_pos_x=data.get('bp_pos_x', 0),
+            bp_pos_y=data.get('bp_pos_y', 0),
+            real_path_num=data.get('real_path_num', ""),
+            ub_zone_hash=data.get('ub_zone_hash', ""),
+            init_cfg_hash=data.get('init_cfg_hash', ""),
+            ub_ecode_hash=data.get('ub_ecode_hash', ""),
+            knife_height=data.get('knife_height', 0)
+        )
+
+@dataclass
+class ReportData:
+    connect: ConnectData = field(default_factory=ConnectData)
+    dev: DeviceData = field(default_factory=DeviceData)
+    rtk: RTKData = field(default_factory=RTKData)
+    locations: list[LocationData] = field(default_factory=list)
+    work: WorkData = field(default_factory=WorkData)
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            connect=ConnectData.from_dict(data.get('connect', {})),
+            dev=DeviceData.from_dict(data.get('dev', {})),
+            rtk=RTKData.from_dict(data.get('rtk', {})),
+            locations=[LocationData.from_dict(loc) for loc in data.get('locations', [])],
+            work=WorkData.from_dict(data.get('work', {}))
+        )

pymammotion/data/state_manager.py

@@ -68,7 +68,7 @@ class StateManager:
             case "system_update_buf":
                 self._device.buffer(sys_msg[1])
             case "toapp_report_data":
-                self._device.report_data(sys_msg[1])
+                self._device.update_report_data(sys_msg[1])
             case "mow_to_app_info":
                 self._device.mow_info(sys_msg[1])
 

{pymammotion-0.1.2.dist-info → pymammotion-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.1.2
+Version: 0.1.4
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur
@@ -23,7 +23,7 @@ Requires-Dist: bleak-retry-connector (>=3.5.0,<4.0.0)
 Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
-Requires-Dist: numpy (>=2.0.1,<3.0.0)
+Requires-Dist: numpy (>=1.26.0,<2.0.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
 Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
 Requires-Dist: protobuf (>=4.23.1)

{pymammotion-0.1.2.dist-info → pymammotion-0.1.4.dist-info}/RECORD

@@ -20,7 +20,7 @@ pymammotion/bluetooth/data/notifydata.py,sha256=N1bphpueWUWbsWUcpZmMGt2CyCgLcKAF
 pymammotion/const.py,sha256=3plR6t5sFVhx3LoUbW5PE2gqIANoD-fSm-T0q8uIwIU,336
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=d8FlIgCcWqoH3jJSpnm-IY-25RM-l2nbRwLtWjSHo74,222
-pymammotion/data/model/device.py,sha256=iW7EK36A6ndAmfJlMNjxcB2PxjRXhg5slI4ITGzfi_k,9911
+pymammotion/data/model/device.py,sha256=tvwxuodX54CIYVIs9XqZLX0k546SJqAx5hsVi7n9A-A,10151
 pymammotion/data/model/device_config.py,sha256=6BcyVbMyw6vA1jANof8_mnG-jizGsF96pbKeHP4t8G4,179
 pymammotion/data/model/enums.py,sha256=tD_vYsxstOV_lUkYF9uWkrjVOgAJPNnGevy_xmiu3WE,1558
 pymammotion/data/model/excute_boarder_params.py,sha256=kadSth4y-VXlXIZ6R-Ng-kDvBbM-3YRr8bmR86qR0U0,1355
@@ -32,11 +32,12 @@ pymammotion/data/model/mowing_modes.py,sha256=121zhvouPKRbF7mynJIc7tJ0zO9bS-Nq4C
 pymammotion/data/model/plan.py,sha256=7JvqAo0a9Yg1Vtifd4J3Dx3StEppxrMOfmq2-877kYg,2891
 pymammotion/data/model/rapid_state.py,sha256=_e9M-65AbkvIqXyMYzLKBxbNvpso42qD8R-JSt66THY,986
 pymammotion/data/model/region_data.py,sha256=75xOTM1qeRbSROp53eIczw3yCmYM9DgMjMh8qE9xkKo,2880
+pymammotion/data/model/report_info.py,sha256=ISk_ZT-GoL9Os-2FmxuTnXr2-28DiDhQVo6YEaGhJrg,3639
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=kEilMLmwZG2nbokLw7X28KF3b-te8G-MfNARYm4LG6I,2170
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=bi_ThLe65n-kjhVq8lfW1P1a4GUp4czs_86hbXj4URs,2798
+pymammotion/data/state_manager.py,sha256=ItihtkmJCeIdXOYD3YRBp241cP29oMABbSISyC5A7tw,2805
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Fy5-I1p92AO_D67VW4eHQqA4pOt7MZsrP--tVfIVUz8,1820
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -108,7 +109,7 @@ pymammotion/utility/device_type.py,sha256=KYawu2glZMVlPmxRbA4kVFujXz3miHp3rJiOWR
 pymammotion/utility/map.py,sha256=CRW-CjkLBp8R9UcobH2cQ9x4qNxHSLlI2u0jAiKyB8A,2271
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.1.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.1.2.dist-info/METADATA,sha256=sGPlxMHLYdo5F5dNcJOQiQVPCMBZGPX-7B15TN51K2A,3921
-pymammotion-0.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.1.2.dist-info/RECORD,,
+pymammotion-0.1.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.1.4.dist-info/METADATA,sha256=3HWIpIIRvA-gnH-SZ3qJH7mdieIwKy3hNEPLJ9eszA4,3922
+pymammotion-0.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.1.4.dist-info/RECORD,,