pymammotion 0.4.0a3__py3-none-any.whl → 0.4.0a5__py3-none-any.whl

pymammotion/mqtt/mammotion_mqtt.py

@@ -10,13 +10,13 @@ from logging import getLogger
 from typing import Awaitable, Callable, Optional
 
 import betterproto
-from linkkit.linkkit import LinkKit
 from paho.mqtt.client import MQTTMessage
 
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
 from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
+from pymammotion.mqtt.linkkit.linkkit import LinkKit
 from pymammotion.proto.luba_msg import LubaMsg
 
 logger = getLogger(__name__)

pymammotion/utility/device_config.py

@@ -1,4 +1,21 @@
 from pymammotion.data.model.device_limits import DeviceLimits
+from pymammotion.utility.device_type import DeviceType
+
+default_luba_config = {
+                "cutter_height": {"min": 20, "max": 35},
+                "working_speed": {"min": 0.2, "max": 1.2},
+                "working_path": {"min": 8, "max": 14},
+                "work_area_num_max": 60,
+                "display_image_type": 0,
+            }
+
+default_yuka_config = {
+                "cutter_height": {"min": 0, "max": 0},
+                "working_speed": {"min": 0.2, "max": 0.6},
+                "working_path": {"min": 8, "max": 30},
+                "work_area_num_max": 60,
+                "display_image_type": 0,
+            }
 
 
 class DeviceConfig:
@@ -6,286 +23,11 @@ class DeviceConfig:
         # Dictionary to store all device configurations
 
         # Device mode configurations
-        self.default_list = {
-            "a1ZU6bdGjaM": {
-                "extMod": "LubaAWD1000723",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.4,
-                "work_area_num_max": 3,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "a1nf9kRBWoH": {
-                "extMod": "LubaAWD3000723",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.4,
-                "work_area_num_max": 6,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "a1ae1QnXZGf": {
-                "extMod": "LubaAWD1000743",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.4,
-                "work_area_num_max": 3,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "a1K4Ki2L5rK": {
-                "extMod": "LubaAWD5000723",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1jOhAYOIG8": {
-                "extMod": "LubaAWD5000743LS",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1BmXWlsdbA": {
-                "extMod": "LubaAWD5000743",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1JFpmAV5Ur": {
-                "extMod": "Kumar-10",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1kweSOPylG": {
-                "extMod": "LubaAWD3000723",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 6,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "a1pvCnb3PPu": {
-                "extMod": "LubaAWD1000743",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 3,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "a1x0zHD3Xop": {
-                "extMod": "LubaAWD5000743LS",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1UBFdq6nNz": {
-                "extMod": "LubaAWD5000723",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "a1FbaU4Bqk5": {
-                "extMod": "LubaAWD5000743",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-        }
+            self.default_list = {'a1ZU6bdGjaM': {'extMod': 'LubaAWD1000723', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.4, 'work_area_num_max': 3, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'a1nf9kRBWoH': {'extMod': 'LubaAWD3000723', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.4, 'work_area_num_max': 6, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'a1ae1QnXZGf': {'extMod': 'LubaAWD1000743', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.4, 'work_area_num_max': 3, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'a1K4Ki2L5rK': {'extMod': 'LubaAWD5000723', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1jOhAYOIG8': {'extMod': 'LubaAWD5000743LS', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1BmXWlsdbA': {'extMod': 'LubaAWD5000743', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1JFpmAV5Ur': {'extMod': 'Kumar-10', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1kweSOPylG': {'extMod': 'LubaAWD3000723', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 6, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'a1pvCnb3PPu': {'extMod': 'LubaAWD1000743', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 3, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'a1x0zHD3Xop': {'extMod': 'LubaAWD5000743LS', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1UBFdq6nNz': {'extMod': 'LubaAWD5000723', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'a1FbaU4Bqk5': {'extMod': 'LubaAWD5000743', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}}
+
+
+            self.inner_list = {'HM010060LBAWD10': {'extMod': 'LubaAWD1000', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 3, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'HM030080LBAWD30': {'extMod': 'LubaAWD3000', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 6, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'HM050080LBAWD50': {'extMod': 'LubaAWD5000', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030060LBAWD50OMNI': {'extMod': 'LubaAWD5000', 'cutter_height_min': 30, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 1}, 'HM060100LBAWD50OMNIH': {'extMod': 'LubaAWD5000H', 'cutter_height_min': 60, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LBVAWD10OMNI': {'extMod': 'Luba2AWD1000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LBVAWD10OMNIH': {'extMod': 'Luba2AWD1000H', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 10, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LBVAWD30OMNI': {'extMod': 'Luba2AWD3000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 20, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LBVAWD30OMNIH': {'extMod': 'Luba2AWD3000H', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 20, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LBVAWD50OMNI': {'extMod': 'Luba2AWD5000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 30, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LBVAWD50OMNIH': {'extMod': 'Luba2AWD5000H', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 30, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LBVAWD100OMNI': {'extMod': 'Luba2AWD10000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LBVAWD100OMNIH': {'extMod': 'Luba2AWD10000H', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LB2PAWD30OMNI': {'extMod': 'Luba2ProAWD3000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 0.8, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LB2PAWD30OMNIH': {'extMod': 'Luba2ProAWD3000NA', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.8, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LB2PAWD50OMNI': {'extMod': 'Luba2ProAWD5000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 1.0, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LB2PAWD50OMNIH': {'extMod': 'Luba2ProAWD5000NA', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 1.0, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM030070LB2PAWD100OMNI': {'extMod': 'Luba2ProAWD10000', 'cutter_height_min': 25, 'cutter_height_max': 70, 'working_speed_min': 0.2, 'working_speed_max': 1.0, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM060100LB2PAWD100OMNIH': {'extMod': 'Luba2ProAWD10000NA', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 1.0, 'work_area_num_max': 60, 'working_path_min': 20, 'working_path_max': 35, 'display_image_type': 0}, 'HM020065LB2MINIAWD08OMNI': {'extMod': 'Luba2MiniAWD800', 'cutter_height_min': 20, 'cutter_height_max': 65, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM020065LB2MINIAWD15OMNI': {'extMod': 'Luba2MiniAWD1500', 'cutter_height_min': 20, 'cutter_height_max': 65, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM020065LB2MINIAWD15OMNILD': {'extMod': 'Luba2MiniAWD1500Lidar', 'cutter_height_min': 20, 'cutter_height_max': 65, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM055100LB2MINIAWD08OMNIH': {'extMod': 'Luba2MiniAWD800NA', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM055100LB2MINIAWD15OMNIH': {'extMod': 'Luba2MiniAWD1500NA', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM055100LB2MINIAWD15OMNIHLD': {'extMod': 'Luba2MiniAWD1500NALidar', 'cutter_height_min': 55, 'cutter_height_max': 100, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 5, 'working_path_max': 20, 'display_image_type': 0}, 'HM030070YK06': {'extMod': 'Yuka600', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YK06H': {'extMod': 'Yuka600NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030070YK10': {'extMod': 'Yuka1000', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YK10H': {'extMod': 'Yuka1000NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030070YK15': {'extMod': 'Yuka1500', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YK15H': {'extMod': 'Yuka1500NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM020090YK20': {'extMod': 'Yuka2000', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YK20H': {'extMod': 'Yuka2000NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM020080YKMINI05': {'extMod': 'YukaMini500', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM050090YKMINI05H': {'extMod': 'YukaMini500NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM020080YKMINI08': {'extMod': 'YukaMini800', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM050090YKMINI08H': {'extMod': 'YukaMini800NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM020080YKMINI06': {'extMod': 'YukaMini600', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM020080YKMINI07': {'extMod': 'YukaMini700', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM050090YKMINI06H': {'extMod': 'YukaMini600NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM050090YKMINI07H': {'extMod': 'YukaMini700NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}, 'HM020090YKPLUS15': {'extMod': 'YukaPlus1500', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM020090YKPLUS20': {'extMod': 'YukaPlus2000', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YKPLUS15H': {'extMod': 'YukaPlus1500NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM030100YKPLUS20H': {'extMod': 'YukaPlus2000NA', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 15, 'working_path_max': 30, 'display_image_type': 0}, 'HM020080MN23103': {'extMod': 'MN231_1', 'cutter_height_min': 0, 'cutter_height_max': 0, 'working_speed_min': 0.2, 'working_speed_max': 0.6, 'work_area_num_max': 60, 'working_path_min': 8, 'working_path_max': 14, 'display_image_type': 0}}
 
-        self.inner_list = {
-            "HM010060LBAWD10": {
-                "extMod": "LubaAWD1000",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 3,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "HM030080LBAWD30": {
-                "extMod": "LubaAWD3000",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 6,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "HM050080LBAWD50": {
-                "extMod": "LubaAWD5000",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM030060LBAWD50OMNI": {
-                "extMod": "LubaAWD5000",
-                "cutter_height_min": 30,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 1,
-            },
-            "HM060100LBAWD50OMNIH": {
-                "extMod": "LubaAWD5000H",
-                "cutter_height_min": 60,
-                "cutter_height_max": 100,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM030070LBVAWD10OMNI": {
-                "extMod": "Luba2AWD1000",
-                "cutter_height_min": 25,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM060100LBVAWD10OMNIH": {
-                "extMod": "Luba2AWD1000H",
-                "cutter_height_min": 55,
-                "cutter_height_max": 100,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 10,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM030070LBVAWD30OMNI": {
-                "extMod": "Luba2AWD3000",
-                "cutter_height_min": 25,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 20,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM060100LBVAWD30OMNIH": {
-                "extMod": "Luba2AWD3000H",
-                "cutter_height_min": 55,
-                "cutter_height_max": 100,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 20,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM030070LBVAWD50OMNI": {
-                "extMod": "Luba2AWD5000",
-                "cutter_height_min": 25,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 30,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM060100LBVAWD50OMNIH": {
-                "extMod": "Luba2AWD5000H",
-                "cutter_height_min": 55,
-                "cutter_height_max": 100,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 30,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM030070LBVAWD100OMNI": {
-                "extMod": "Luba2AWD10000",
-                "cutter_height_min": 25,
-                "cutter_height_max": 70,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 60,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-            "HM060100LBVAWD100OMNIH": {
-                "extMod": "Luba2AWD10000H",
-                "cutter_height_min": 55,
-                "cutter_height_max": 100,
-                "working_speed_min": 0.2,
-                "working_speed_max": 0.6,
-                "work_area_num_max": 60,
-                "working_path_min": 20,
-                "working_path_max": 35,
-                "display_imge_type": 0,
-            },
-        }
 
     def get_device_config(self, int_mod_or_key: str) -> dict:
         """Look up device configuration by internal model code
@@ -340,6 +82,23 @@ class DeviceConfig:
             }
         )
 
+    @staticmethod
+    def get_best_default(product_key: str) -> DeviceLimits:
+        """basic fallback if device is offline."""
+
+        if DeviceType.contain_luba_product_key(product_key):
+            return DeviceLimits.from_dict(
+                default_luba_config
+            )
+        if DeviceType.contain_luba_2_product_key(product_key):
+            return DeviceLimits.from_dict(
+                default_luba_config
+            )
+
+        return DeviceLimits.from_dict(default_yuka_config)
+
+
+
 
 # # Usage example:
 # def main():

pymammotion/utility/device_type.py

@@ -1,5 +1,21 @@
 from enum import Enum
 
+LubaProductKey = ["a1UBFdq6nNz", "a1x0zHD3Xop", "a1pvCnb3PPu", "a1kweSOPylG", "a1JFpmAV5Ur", "a1BmXWlsdbA", "a1jOhAYOIG8", "a1K4Ki2L5rK", "a1ae1QnXZGf", "a1nf9kRBWoH", "a1ZU6bdGjaM"]
+
+LubaVProductKey = ["a1iMygIwxFC", "a1LLmy1zc0j", "a1LLmy1zc0j"]
+
+LubaVProProductKey = ["a1mb8v6tnAa", "a1pHsTqyoPR"]
+
+Luba2MiniProductKey = ["a1L5ZfJIxGl", "a1dCWYFLROK"]
+
+YukaProductKey = ["a1kT0TlYEza", "a1IQV0BrnXb"]
+
+YukaPlusProductKey = ["a1lNESu9VST"]
+
+YukaMiniProductKey = ["a1BqmEWMRbX", "a1biqVGvxrE"]
+
+RTKProductKey = ["a1qXkZ5P39W", "a1Nc68bGZzX"]
+
 
 class DeviceType(Enum):
     UNKNOWN = (-1, "UNKNOWN", "Unknown")
@@ -226,7 +242,7 @@ class DeviceType(Enum):
 
         if not product_key:
             return False
-        return product_key in ["a1qXkZ5P39W", "a1Nc68bGZzX"]
+        return product_key in RTKProductKey
 
     @staticmethod
     def contain_luba_product_key(product_key) -> bool:
@@ -242,19 +258,7 @@ class DeviceType(Enum):
 
         if not product_key:
             return False
-        return product_key in [
-            "a1UBFdq6nNz",
-            "a1x0zHD3Xop",
-            "a1pvCnb3PPu",
-            "a1kweSOPylG",
-            "a1JFpmAV5Ur",
-            "a1BmXWlsdbA",
-            "a1jOhAYOIG8",
-            "a1K4Ki2L5rK",
-            "a1ae1QnXZGf",
-            "a1nf9kRBWoH",
-            "a1ZU6bdGjaM",
-        ]
+        return product_key in LubaProductKey
 
     @staticmethod
     def contain_luba_2_product_key(product_key) -> bool:
@@ -270,7 +274,7 @@ class DeviceType(Enum):
 
         if not product_key:
             return False
-        return product_key in ["a1iMygIwxFC", "a1LLmy1zc0j", "a1LLmy1zc0j"]
+        return product_key in LubaVProductKey
 
     @staticmethod
     def contain_yuka_product_key(product_key) -> bool:
@@ -286,7 +290,39 @@ class DeviceType(Enum):
 
         if not product_key:
             return False
-        return product_key in ["a1IQV0BrnXb"]
+        return product_key in YukaProductKey
+
+    @staticmethod
+    def contain_yuka_mini_product_key(product_key) -> bool:
+        """Check if the given product key is present in a predefined list.
+
+        Args:
+            product_key (str): The product key to be checked.
+
+        Returns:
+            bool: True if the product key is in the predefined list, False otherwise.
+
+        """
+
+        if not product_key:
+            return False
+        return product_key in YukaMiniProductKey
+
+    @staticmethod
+    def contain_yuka_plus_product_key(product_key) -> bool:
+        """Check if the given product key is present in a predefined list.
+
+        Args:
+            product_key (str): The product key to be checked.
+
+        Returns:
+            bool: True if the product key is in the predefined list, False otherwise.
+
+        """
+
+        if not product_key:
+            return False
+        return product_key in YukaPlusProductKey
 
     def is_support_video(self):
         return self != DeviceType.LUBA

{pymammotion-0.4.0a3.dist-info → pymammotion-0.4.0a5.dist-info}/METADATA

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a3
+Version: 0.4.0a5
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
 Author-email: michael@jumblesoft.co.nz
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -15,18 +15,17 @@ Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
 Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
 Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
 Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)
-Requires-Dist: aliyun-iot-linkkit (>=1.2.12,<2.0.0)
-Requires-Dist: aliyun-python-sdk-iot (>=8.57.0,<9.0.0)
 Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
 Requires-Dist: betterproto (>=1.2.5,<2.0.0)
 Requires-Dist: bleak (>=0.21.0)
 Requires-Dist: bleak-retry-connector (>=3.5.0,<4.0.0)
+Requires-Dist: crcmod (>=1.7,<2.0)
 Requires-Dist: cryptography (>=43.0.1)
 Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
+Requires-Dist: paho-mqtt (==2.1.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Description-Content-Type: text/markdown

{pymammotion-0.4.0a3.dist-info → pymammotion-0.4.0a5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=u1OHuD8Uj0qCOH4I7Lt5d7T-TPt1R0pY-bv8S6UfVxM,1587
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=bFlVEmKBocxbD8ZxTXFXQZi4GwTDhzxChITJadzX2W0,25877
+pymammotion/aliyun/cloud_gateway.py,sha256=oK2_iZwqnaoE-QZcrEy8uSty5ofR014qxHoWH4ciE5A,25836
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -24,9 +24,9 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=wS8EiV0EinWgpzwaAtJKPQwjrIWuvSxRAXu6KWclrB0,5626
+pymammotion/data/model/device.py,sha256=BXmpDdiJOJU1nenjNlQn_5ShPPjFlxPUMISBduCL11w,6770
 pymammotion/data/model/device_config.py,sha256=wjayKnzoPDmBhqWZKTPDSueNEPCIWCB20tFEDSGIUsM,2602
-pymammotion/data/model/device_info.py,sha256=ahz2xILdSYdX6SIVuVzz8QCfSQLefbQnpXrsiDpBDbY,585
+pymammotion/data/model/device_info.py,sha256=TuM6k0jDsG4x0BRXb1fi3UlpI-8CeKd4RgCfzEeHqqY,897
 pymammotion/data/model/device_limits.py,sha256=saW3iUvGq8WEn6CASn5hS5tVJpSeak4FDy_gnHtYqTQ,1955
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -44,7 +44,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=pEOQcjnv5XKosSPD8UmVAgCAaI8vLuIhGECZcU4xKjk,5055
 pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLGodGSj0,3759
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=W6PjIMXHPObocYay6ZQ7ITju27MA5kK5udFptAydwuE,5382
+pymammotion/data/state_manager.py,sha256=bY8sGj5k_bg_F6PemYZ6Y7P5HFjeDcDU-DIItuTTTBM,5763
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,12 +67,15 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
 pymammotion/mammotion/devices/base.py,sha256=2IKm7CYGmvRLpJaAKp25tL23UhOoSEHJ6On5D0N5TSk,10763
-pymammotion/mammotion/devices/mammotion.py,sha256=7kJXTIdlthnbgUBVPcrc3VnxOtLWvk0d2vFetfjwrg0,12590
+pymammotion/mammotion/devices/mammotion.py,sha256=_4w8dGoA1dcylZWtfMJyr7z-bjp9WcIEnWJ3mPHqOKA,12632
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=HUOKnjYUWTGjksyQDCPKF_u3dWo2ddgrWCBXnJ2VkwA,18963
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=a9fB0ZCYElRxrjnwCM81RXCbxo5kJKhGa-BGck9U3-A,12949
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
+pymammotion/mqtt/linkkit/__init__.py,sha256=8_OX8MeC5UrW_1WLBqlc56hJkumGiBDgwQpwn-jaCTY,79
+pymammotion/mqtt/linkkit/h2client.py,sha256=8W7QJCFT0Fqmg8Tw82Kefq9_rE22_wYHk4m0VXh1IEc,19387
+pymammotion/mqtt/linkkit/linkkit.py,sha256=67nKXuQNQOlL9A1JdgaSBsLOs0hYeBOlq-ZFd7i-tg8,134068
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=LaySave_hf0gU3crUTLqzpdQtxIwK8vu5DM8F8fbU2Y,8748
+pymammotion/mqtt/mammotion_mqtt.py,sha256=px8qPKP87gockm_1UFxVtmNXpCFyMU1_EpIGNZT5L7s,8765
 pymammotion/proto/__init__.py,sha256=v3_P1LOsYRBN9qCAhaWrWMX7GWHrox9XD3hdZQxcPZM,190
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -119,13 +122,13 @@ pymammotion/utility/constant/__init__.py,sha256=tcY0LDeD-qDDHx2LKt55KOyv9ZI0UfCN
 pymammotion/utility/constant/device_constant.py,sha256=RQ0Yi6hQa9hfx4wVXypPaPozahQ8Y4EiU3RWZYDZeOY,7593
 pymammotion/utility/conversions.py,sha256=v3YICy0zZwwBBzrUZgabI7GRfiDBnkiAX2qdtk3NxOY,89
 pymammotion/utility/datatype_converter.py,sha256=SPM_HuaaD_XOawlqEnA8qlRRZXGba3WjA8kGOZgeBlQ,4284
-pymammotion/utility/device_config.py,sha256=XWuMLL8xkyVyZl5HrG6nR3Hz7eKyQcOZfzFHvgRYsZo,13117
-pymammotion/utility/device_type.py,sha256=xOgfIhOkzgcAtoKtlhlB1q8FpiKe1rVVV5BvN7K7zYc,9433
+pymammotion/utility/device_config.py,sha256=rTk2USjOnHeZyKKlpcLINfcDknsH50ok_FRguTSawC8,18232
+pymammotion/utility/device_type.py,sha256=GVJIgaGKZrTFy3qZjBy9v8ddJ2g6qJ0WZAUMSTbx10Y,10537
 pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,2227
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.0a3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.0a3.dist-info/METADATA,sha256=GTbxC8NBsmzqCmEduVLA4YlWETppxH2dxMFYwewpCbM,3964
-pymammotion-0.4.0a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.4.0a3.dist-info/RECORD,,
+pymammotion-0.4.0a5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.0a5.dist-info/METADATA,sha256=KhtqVKiDZloRq32jpBKqi2hbRs8y5pK-9HnswzWgiAc,3879
+pymammotion-0.4.0a5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pymammotion-0.4.0a5.dist-info/RECORD,,

{pymammotion-0.4.0a3.dist-info → pymammotion-0.4.0a5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any