Merge pull request #2 from idreamshen/develop

add sunroof_open and fuel_amount_level
idreamshen · Sep 21, 2023 · c8246a6 · c8246a6
2 parents c5de8cf + 91da1cb
commit c8246a6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/custom_components/volvooncall_cn/__init__.py b/custom_components/volvooncall_cn/__init__.py
@@ -140,6 +140,12 @@ async def _async_update_data(self):
         "icon": "",
         "unit": "",
     },
+    "sunroof_open": {
+        "name": "Sunroof",
+        "device_class": "window",
+        "icon": "",
+        "unit": "",
+    },
     "engine_running": {
         "name": "Engine",
         "device_class": "power",
@@ -182,6 +188,12 @@ async def _async_update_data(self):
         "icon": "mdi:gas-station",
         "unit": "L",
     },
+    "fuel_amount_level": {
+        "name": "Fuel amount level",
+        "device_class": None,
+        "icon": "mdi:gas-station",
+        "unit": "%",
+    },
     "position": {
         "name": "Position",
         "device_class": None,

diff --git a/custom_components/volvooncall_cn/binary_sensor.py b/custom_components/volvooncall_cn/binary_sensor.py
@@ -41,6 +41,7 @@ async def async_setup_entry(
         entities.append(VolvoSensor(coordinator, idx, "front_right_window_open"))
         entities.append(VolvoSensor(coordinator, idx, "rear_left_window_open"))
         entities.append(VolvoSensor(coordinator, idx, "rear_right_window_open"))
+        entities.append(VolvoSensor(coordinator, idx, "sunroof_open"))
 
     async_add_entities(entities)
 

diff --git a/custom_components/volvooncall_cn/sensor.py b/custom_components/volvooncall_cn/sensor.py
@@ -27,6 +27,7 @@ async def async_setup_entry(
         entities.append(VolvoSensor(coordinator, idx, "distance_to_empty"))
         entities.append(VolvoSensor(coordinator, idx, "odo_meter"))
         entities.append(VolvoSensor(coordinator, idx, "fuel_amount"))
+        entities.append(VolvoSensor(coordinator, idx, "fuel_amount_level"))
 
     async_add_entities(entities)
 

diff --git a/custom_components/volvooncall_cn/volvooncall_cn.py b/custom_components/volvooncall_cn/volvooncall_cn.py
@@ -228,13 +228,15 @@ def __init__(self, vin, api):
         self.front_right_door_open = False
         self.front_left_door_open = False
         self.hood_open = False
+        self.sunroof_open = False
         self.engine_running = False
         self.odo_meter = 0
         self.front_left_window_open = False
         self.front_right_window_open = False
         self.rear_left_window_open = False
         self.rear_right_window_open = False
         self.fuel_amount = 0
+        self.fuel_amount_level = 0
         self.position = {
             "longitude": 0.0,
             "latitude": 0.0
@@ -259,13 +261,15 @@ def toMap(self):
             "front_right_door_open": self.front_right_door_open,
             "front_left_door_open": self.front_left_door_open,
             "hood_open": self.hood_open,
+            "sunroof_open": self.sunroof_open,
             "engine_running": self.engine_running,
             "odo_meter": self.odo_meter,
             "front_left_window_open": self.front_left_window_open,
             "front_right_window_open": self.front_right_window_open,
             "rear_left_window_open": self.rear_left_window_open,
             "rear_right_window_open": self.rear_right_window_open,
             "fuel_amount": self.fuel_amount,
+            "fuel_amount_level": self.fuel_amount_level,
             "position": {
                 "longitude": self.position["longitude"],
                 "latitude": self.position["latitude"],
@@ -294,13 +298,15 @@ async def update(self):
         self.front_right_door_open = data["doors"]["frontRightDoorOpen"]
         self.front_left_door_open = data["doors"]["frontLeftDoorOpen"]
         self.hood_open = data["doors"]["hoodOpen"]
+        self.sunroof_open = data["sunroofOpen"]
         self.engine_running = data["engineRunning"]
         self.odo_meter = int(data["odometer"] / 1000)
         self.front_left_window_open = data["windows"]["frontLeftWindowOpen"]
         self.front_right_window_open = data["windows"]["frontRightWindowOpen"]
         self.rear_left_window_open = data["windows"]["rearLeftWindowOpen"]
         self.rear_right_window_open = data["windows"]["rearRightWindowOpen"]
         self.fuel_amount = data["fuelAmount"]
+        self.fuel_amount_level = data["fuelAmountLevel"]
 
         position_data = await self._api.get_vehicle_position(self.vin)
         self.position = {

diff --git a/hacs.json b/hacs.json
@@ -2,5 +2,6 @@
   "name": "Volvo On Call CN",
   "render_readme": true,
   "zip_release": true,
-  "filename": "volvooncall_cn.zip"
+  "filename": "volvooncall_cn.zip",
+  "render_readme": true,
 }