Fix Online state and mowing border state

Sdahl1234 · Mar 12, 2024 · d0871f0 · d0871f0
1 parent 9af647e
commit d0871f0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/custom_components/adano/adano.py b/custom_components/adano/adano.py
@@ -30,7 +30,7 @@ def __init__(self, Devicesn) -> None:
         self.rain_delay_set = 0
         self.rain_delay_left = 0
         self.cur_min = 0
-        self.deviceOnlineFlag = False
+        self.deviceOnlineFlag = ""
         self.zoneOpenFlag = False
         self.mul_en = False
         self.mul_auto = False
@@ -63,7 +63,8 @@ def InitValues(self) -> None:
         self.rain_en = self.devicedata["data"].get("rainFlag")
         self.rain_delay_set = int(self.devicedata["data"].get("rainDelayDuration"))
         self.rain_delay_left = self.devicedata["data"].get("rainDelayLeft")
-        self.deviceOnlineFlag = self.devicedata["data"].get("onlineFlag")
+        if self.devicedata["data"].get("onlineFlag"):
+            self.deviceOnlineFlag = '{"online":"1"}'
         self.zoneOpenFlag = self.settings["data"].get("zoneOpenFlag")
         self.mul_en = self.settings["data"].get("zoneOpenFlag")
         self.mul_auto = self.settings["data"].get("zoneAutomaticFlag")
@@ -523,7 +524,7 @@ def refresh(self, devicesn):
 
     def set_schedule(
         self,
-        ScheduleList: [],
+        ScheduleList,  #: [],
         devicesn,
     ):
         """Set schedule data."""

diff --git a/custom_components/adano/const.py b/custom_components/adano/const.py
@@ -10,6 +10,7 @@
 ADANO_GOING_HOME = "On the way home"
 ADANO_CHARGING = "Charging"
 ADANO_MOWING_BORDER = "Mowing border"
+ADANO_UNKNOWN_4 = "Unknown4"
 ADANO_UNKNOWN = "Unknown"
 
 ADANO_DRY = "Dry"

diff --git a/custom_components/adano/lawn_mower.py b/custom_components/adano/lawn_mower.py
@@ -22,6 +22,7 @@
     ADANO_MOWING_BORDER,
     ADANO_STANDBY,
     ADANO_UNKNOWN,
+    ADANO_UNKNOWN_4,
 )
 from .entity import AdanoEntity
 
@@ -98,9 +99,9 @@ def state(self) -> str | None:
         elif ival == 3:
             val = ADANO_CHARGING
         elif ival == 4:
-            val = ADANO_MOWING_BORDER
+            val = ADANO_UNKNOWN_4
         elif ival == 7:
-            val = ADANO_UNKNOWN
+            val = ADANO_MOWING_BORDER
         else:
             val = ADANO_UNKNOWN
         return val

diff --git a/custom_components/adano/manifest.json b/custom_components/adano/manifest.json
@@ -8,5 +8,5 @@
   "integration_type": "device",
   "iot_class": "cloud_push",
   "config_flow": true,
-  "version": "1.0.5"
+  "version": "1.0.6"
 }
diff --git a/custom_components/adano/sensor.py b/custom_components/adano/sensor.py
@@ -16,6 +16,7 @@
     ADANO_MOWING_BORDER,
     ADANO_STANDBY,
     ADANO_UNKNOWN,
+    ADANO_UNKNOWN_4,
     ADANO_WET,
 )
 from .entity import AdanoEntity
@@ -344,9 +345,9 @@ def state(self):  # noqa: C901
             elif ival == 3:
                 val = ADANO_CHARGING
             elif ival == 4:
-                val = ADANO_MOWING_BORDER
+                val = ADANO_UNKNOWN_4
             elif ival == 7:
-                val = ADANO_UNKNOWN
+                val = ADANO_MOWING_BORDER
             else:
                 val = ADANO_UNKNOWN
         elif self._valuepair == "wifi_lv":

diff --git a/custom_components/adano/text.py b/custom_components/adano/text.py
@@ -106,9 +106,7 @@ async def async_set_value(self, value: str) -> None:
             start = value[0:5]
             stop = value[8:13]
             trim = False
-            if "Trim" in value:
-                trim = True
-            elif "trim" in value:
+            if "Trim" in value or "trim" in value:
                 trim = True
 
             retval2 = {

diff --git a/custom_components/adano/translations/da.json b/custom_components/adano/translations/da.json
@@ -25,11 +25,12 @@
 				"name": "Robot status",
 				"state": {
 					"Standby": "Standby",
-					"Mowing": "Arbejder",
+					"Mowing": "Klipper",
 					"On the way home": "På vej hjem",
 					"Charging": "Oplader",
 					"Mowing border": "Klipper kant",
-					"Unknown": "Ukendt"
+					"Unknown": "Ukendt",
+					"Unknown4":"Mode 4"
 				}
 			},
 			"adano_battery": {
@@ -109,11 +110,12 @@
 			"adano_lawnmower": {
                 "state": {
 					"Standby": "Standby",
-					"Mowing": "Arbejder",
+					"Mowing": "Klipper",
 					"On the way home": "På vej hjem",
 					"Charging": "Oplader",
 					"Mowing border": "Klipper kant",
-					"Unknown": "Ukendt"
+					"Unknown": "Ukendt",
+					"Unknown4": "Mode 4"
 				}
 			}
 		},

diff --git a/custom_components/adano/translations/en.json b/custom_components/adano/translations/en.json
@@ -29,7 +29,8 @@
             "On the way home": "Going home",
             "Charging": "Charging",
             "Mowing border": "Border",
-            "Unknown": "Unknown"
+            "Unknown": "Unknown",
+            "Unknown4": "Mode 4"
           }
         },
         "adano_battery": {
@@ -113,7 +114,8 @@
             "On the way home": "Going home",
             "Charging": "Charging",
             "Mowing border": "Border",
-            "Unknown": "Unknown"
+            "Unknown": "Unknown",
+            "Unknown4": "Mode 4"
           }
         }
       },