diff --git a/custom_components/silencescooter/api.py b/custom_components/silencescooter/api.py index 6a6f3f5..d03d7f7 100644 --- a/custom_components/silencescooter/api.py +++ b/custom_components/silencescooter/api.py @@ -119,19 +119,25 @@ def is_running(status): self.result["batteryOut"] = decode_boolean(json_result[0]["batteryOut"]) self.result["charging"] = decode_boolean(json_result[0]["charging"]) + self.result["batteryId"] = json_result[0]["batteryId"] + self.result["batteryId2"] = json_result[0]["batteryId2"] self.result["batterySoc"] = json_result[0]["batterySoc"] + self.result["batterySoc2"] = json_result[0]["batterySoc2"] self.result["odometer"] = json_result[0]["odometer"] self.result["range"] = json_result[0]["range"] self.result["velocity"] = json_result[0]["velocity"] - if is_running(json_result[0]["status"]): - self.result["batteryTemperature"] = json_result[0]["batteryTemperature"] - self.result["motorTemperature"] = json_result[0]["motorTemperature"] - self.result["inverterTemperature"] = json_result[0]["inverterTemperature"] - else: - self.result["batteryTemperature"] = 0 - self.result["motorTemperature"] = 0 - self.result["inverterTemperature"] = 0 +# if is_running(json_result[0]["status"]): + self.result["batteryTemperature"] = json_result[0]["batteryTemperature"] + self.result["batteryTemperature2"] = json_result[0]["batteryTemperature2"] + self.result["motorTemperature"] = json_result[0]["motorTemperature"] + self.result["motorTemperature2"] = json_result[0]["motorTemperature2"] + self.result["inverterTemperature"] = json_result[0]["inverterTemperature"] + self.result["inverterTemperature2"] = json_result[0]["inverterTemperature2"] +# else: +# self.result["batteryTemperature"] = 0 +# self.result["motorTemperature"] = 0 +# self.result["inverterTemperature"] = 0 self.result["location_latitude"] = json_result[0]["lastLocation"]["latitude"] self.result["location_longitude"] = json_result[0]["lastLocation"]["longitude"] diff --git a/custom_components/silencescooter/const.py b/custom_components/silencescooter/const.py index edd6cd6..d091836 100644 --- a/custom_components/silencescooter/const.py +++ b/custom_components/silencescooter/const.py @@ -41,6 +41,18 @@ "", "", ], + "batteryId": [ + "batteryId", + "", + "", + "", + ], + "batteryId2": [ + "batteryId2", + "", + "", + "", + ], "color": [ "color", "", @@ -77,24 +89,48 @@ "battery", "mdi:car-battery", ], + "batterySoc2": [ + "batterySoc2", + "%", + "battery", + "mdi:car-battery", + ], "batteryTemperature": [ "batteryTemperature", "°C", "temperature", "mdi:thermometer", ], + "batteryTemperature2": [ + "batteryTemperature2", + "°C", + "temperature", + "mdi:thermometer", + ], "motorTemperature": [ "motorTemperature", "°C", "temperature", "mdi:thermometer", ], + "motorTemperature2": [ + "motorTemperature2", + "°C", + "temperature", + "mdi:thermometer", + ], "inverterTemperature": [ "inverterTemperature", "°C", "temperature", "mdi:thermometer", ], + "inverterTemperature2": [ + "inverterTemperature2", + "°C", + "temperature", + "mdi:thermometer", + ], "location_longitude": ["location_longitude", "lng", "none", "mdi:map-marker"], "location_latitude": ["location_latitude", "lat", "none", "mdi:map-marker"], "location_altitude": ["location_altitude", "alt", "none", "mdi:map-marker"],