pymammotion 0.1.2__tar.gz → 0.1.3__tar.gz

{pymammotion-0.1.2 → pymammotion-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.1.2
+Version: 0.1.3
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.1.2 → pymammotion-0.1.3}/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-0.1.3/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-0.1.2 → pymammotion-0.1.3}/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 → pymammotion-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.1.2"
+version     = "0.1.3"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -48,7 +48,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.7.1"
 
 [tool.bumpver]
-current_version = "0.1.1"
+current_version = "0.1.3"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true