Merge pull request #7 from jm-73/develop

Develop
sander1988 · Aug 21, 2019 · 83f2f0d · 83f2f0d
2 parents 61e147e + e67bc6a
commit 83f2f0d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.7.6 2019-08-21
+
+### Changes
+- AlertDescription: Added ID as property.
+
+## 0.7.5 2019-08-20
+
+### Changes
+- FriendlyAlertErrorCode: Added function to get Friendly Description and handle codes that are not known.
+
 ## 0.7.4 2019-08-14
 
 ### Changes

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # API for the Bosch Indego lawnmowers
 
 ## Usage with Home Assistant
-For source files and versin handling: https://github.com/jm-73/pyIndego
+For source files and version handling: https://github.com/jm-73/pyIndego
 
 For PYPI package: https://pypi.org/project/pyIndego/
 

diff --git a/pyIndego/__init__.py b/pyIndego/__init__.py
@@ -177,15 +177,18 @@ def __init__(self, username=None, password=None, serial=None):
         self._firmware_available = None
         self._mowingmode_description = None
         self._battery_percent_adjusted = None
-        self._alert1_error = None
-        self._alert1_time = None
-        self._alert1_friendly_description = None
-        self._alert2_error = None
-        self._alert2_time = None
-        self._alert2_friendly_description = None
-        self._alert3_error = None
-        self._alert3_time = None
-        self._alert3_friendly_description = None
+        self._alert1_id                     = None
+        self._alert1_error                  = None
+        self._alert1_time                   = None
+        self._alert1_friendly_description   = None
+        self._alert2_id                     = None
+        self._alert2_error                  = None
+        self._alert2_time                   = None
+        self._alert2_friendly_description   = None
+        self._alert3_id                     = None
+        self._alert3_error                  = None
+        self._alert3_time                   = None
+        self._alert3_friendly_description   = None
 
         ## Logging in
         self.login()
@@ -811,31 +814,31 @@ def AlertsDescription(self):
             tmp_cnt += 1
             tmp_code = alert['error_code']
             if (tmp_cnt == 1):
+                self._alert1_id    = alert['alert_id']
                 self._alert1_time  = self.ConvertBoschDateTime(alert['date']) 
                 self._alert1_error = alert['error_code']
-                #self._alert1_friendly_description = ALERT_ERROR_CODE[tmp_code]
                 self._alert1_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
+                self._alert2_id    = None
                 self._alert2_time  = None
                 self._alert2_error = None
+                self._alert2_friendly_description = None
+                self._alert3_id    = None
                 self._alert3_name  = None
                 self._alert3_error = None
+                self._alert3_friendly_description = None
             if (tmp_cnt == 2):
+                self._alert2_id  = alert['alert_id']
                 self._alert2_time  = self.ConvertBoschDateTime(alert['date'])
                 self._alert2_error = alert['error_code']
-                #self._alert2_friendly_description = ALERT_ERROR_CODE[tmp_code]
                 self._alert2_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
                 self._alert3_time  = None
                 self._alert3_error = None
+                self._alert3_friendly_description = None
             if (tmp_cnt == 3):
+                self._alert3_id  = alert['alert_id']
                 self._alert3_time  = self.ConvertBoschDateTime(alert['date'])
                 self._alert3_error = alert['error_code']
-                #self._alert3_friendly_description = ALERT_ERROR_CODE[tmp_code]
                 self._alert3_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
-            #print(tmp_cnt, alert['date'], alert['error_code'], alert['headline'])
-            #tmp_code = alert['error_code']
-            #print("Friendly Description: " + ALERT_ERROR_CODE[tmp_code])
-            #ALERT_ERROR_CODE = {
-            #alerts_list.update(date = alert['date'])
         return self._alerts
 
     def FriendlyAlertErrorCode(self, tmp):

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pyIndego",
-    version="0.7.5",
+    version="0.7.6",
     author="jm-73",
     author_email="[email protected]",
     description="API for Bosch Indego mower",