Merge pull request #57 from itchannel/1.0.10-Update

1.10 update
itchannel · Dec 12, 2020 · 9965ac2 · 9965ac2
2 parents cf8c3fd + ba0de64
commit 9965ac2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/custom_components/fordpass/device_tracker.py b/custom_components/fordpass/device_tracker.py
@@ -7,12 +7,18 @@
 from . import FordPassEntity
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Add the Entities from the config."""
     entry = hass.data[DOMAIN][config_entry.entry_id]
 
-    async_add_entities([CarTracker(entry, "gps")], True)
+    # Added a check to see if the car supports GPS
+    if entry.data["gps"] != None:
+        async_add_entities([CarTracker(entry, "gps")], True)
+    else:
+        _LOGGER.debug("Vehicle does not support GPS")
 
 
 class CarTracker(FordPassEntity, TrackerEntity):

diff --git a/custom_components/fordpass/sensor.py b/custom_components/fordpass/sensor.py
@@ -48,6 +48,8 @@ def get_value(self, ftype):
             elif self.sensor == "tirePressure":
                 return self.coordinator.data[self.sensor]["value"]
             elif self.sensor == "gps":
+                if self.coordinator.data[self.sensor] == None:
+                    return "Unsupported"
                 return self.coordinator.data[self.sensor]["gpsState"]
             elif self.sensor == "alarm":
                 return self.coordinator.data[self.sensor]["value"]
@@ -64,7 +66,10 @@ def get_value(self, ftype):
                 if self.coordinator.data[self.sensor] == None:
                     return "Unsupported"
                 for key, value in self.coordinator.data[self.sensor].items():
-                    if value["value"] != "Fully_Closed":
+                    if (
+                        value["value"] != "Fully_Closed"
+                        or value["value"] != "Fully_closed_position"
+                    ):
                         return "Open"
                 return "Closed"
             elif self.sensor == "lastRefresh":
@@ -151,6 +156,8 @@ def get_value(self, ftype):
                     }
                 return None
             elif self.sensor == "gps":
+                if self.coordinator.data[self.sensor] == None:
+                    return None
                 return self.coordinator.data[self.sensor].items()
             elif self.sensor == "alarm":
                 return self.coordinator.data[self.sensor].items()

diff --git a/info.md b/info.md
@@ -1,5 +1,10 @@
 
 # **Changelog**
+### Version 1.10
+- Fixed door open bug 2.0 (New position value)
+- Added a check to see if a vehicle supports GPS before adding the entity
+
+
 ### Version 1.09
 - Added individual TMPS Support
 - Fixed door open bug