Ariya fixes (#90)

Author: dan-r

custom_components/nissan_connect/kamereon/kamereon.py

@@ -272,6 +272,7 @@ def __init__(self, data, user_id):
             ChargingSpeed.FAST: None,
             ChargingSpeed.NORMAL: None,
             ChargingSpeed.SLOW: None,
+            ChargingSpeed.ADAPTIVE: None
         }
         self.range_hvac_off = None
         self.range_hvac_on = None
@@ -640,10 +641,9 @@ def refresh_battery_status(self):
         return body
 
     def fetch_battery_status(self):
+        self.fetch_battery_status_leaf()
         if self.model_name == "Ariya":
-            return self.fetch_battery_status_ariya()
-        
-        return self.fetch_battery_status_leaf()
+            self.fetch_battery_status_ariya()
 
     def fetch_battery_status_leaf(self):
         """The battery-status endpoint isn't just for EV's. ICE Nissans publish the range under this!
@@ -671,6 +671,7 @@ def fetch_battery_status_leaf(self):
             ChargingSpeed.FAST: battery_data.get('timeRequiredToFullFast'),
             ChargingSpeed.NORMAL: battery_data.get('timeRequiredToFullNormal'),
             ChargingSpeed.SLOW: battery_data.get('timeRequiredToFullSlow'),
+            ChargingSpeed.ADAPTIVE: None
         }
         self.range_hvac_off = battery_data.get('rangeHvacOff')
         self.range_hvac_on = battery_data.get('rangeHvacOn')
@@ -703,30 +704,19 @@ def fetch_battery_status_ariya(self):
 
         battery_data = body['data']['attributes']
 
-        self.battery_capacity = battery_data.get('batteryCapacity')  # kWh
-        self.battery_level = battery_data.get('batteryLevel')  # %
-        self.battery_temperature = battery_data.get('batteryTemperature')  # Fahrenheit?
-        # same meaning as battery level, different scale. 240 = 100%
-        self.battery_bar_level = battery_data.get('batteryBarLevel')
-        self.instantaneous_power = battery_data.get('instantaneousPower')  # kW
+        self.range_hvac_off = None
+        self.range_hvac_on = battery_data.get('batteryAutonomy') or self.range_hvac_on
+
         self.charging_speed = ChargingSpeed(None)
         self.charge_time_required_to_full = {
-            ChargingSpeed.FAST: battery_data.get('chargingRemainingTime'),
-            ChargingSpeed.NORMAL: battery_data.get('chargingRemainingTime'),
-            ChargingSpeed.SLOW: battery_data.get('chargingRemainingTime'),
+            ChargingSpeed.FAST: None,
+            ChargingSpeed.NORMAL: None,
+            ChargingSpeed.SLOW: None,
+            ChargingSpeed.ADAPTIVE: battery_data.get('chargingRemainingTime') or self.charge_time_required_to_full[ChargingSpeed.NORMAL]
         }
-        self.range_hvac_off = battery_data.get('batteryAutonomy')
-        self.range_hvac_on = battery_data.get('batteryAutonomy')
-        
-        # For ICE vehicles, we should get the range at least. If not, dont bother again
-        if self.range_hvac_on is None and Feature.BATTERY_STATUS not in self.features:
-            self.battery_supported = False
-            return
 
         self.plugged_in = PluggedStatus(battery_data.get('plugStatus', 0))
-        if self.plugged_in == PluggedStatus(1):
-            self.charging =  ChargingStatus(battery_data.get('chargeStatus', 0))
-        
+                
         if 'vehiclePlugTimestamp' in battery_data:
             self.plugged_in_time = datetime.datetime.fromisoformat(battery_data['vehiclePlugTimestamp'].replace('Z','+00:00'))
         if 'vehicleUnplugTimestamp' in battery_data:

custom_components/nissan_connect/kamereon/kamereon_const.py

@@ -64,6 +64,7 @@ class ChargingSpeed(enum.Enum):
     NORMAL = 2
     FAST = 3
     FASTEST = 4
+    ADAPTIVE = 5
 
 
 class ChargingStatus(enum.Enum):

custom_components/nissan_connect/sensor.py

@@ -32,10 +32,14 @@ async def async_setup_entry(hass, config, async_add_entities):
             entities += [RangeSensor(coordinator, data[vehicle], True, imperial_distance),
                          TimestampSensor(coordinator, data[vehicle], 'battery_status_last_updated', 'last_updated', 'mdi:clock-time-eleven-outline')]
         if Feature.BATTERY_STATUS in data[vehicle].features:
-            entities += [BatteryLevelSensor(coordinator, data[vehicle]),
-                         RangeSensor(coordinator, data[vehicle], False, imperial_distance),
-                         ChargeTimeRequiredSensor(coordinator, data[vehicle], ChargingSpeed.NORMAL),
+            entities.append(BatteryLevelSensor(coordinator, data[vehicle]))
+        if data[vehicle].charge_time_required_to_full[ChargingSpeed.NORMAL] is not None:
+            entities += [ChargeTimeRequiredSensor(coordinator, data[vehicle], ChargingSpeed.NORMAL),
                          ChargeTimeRequiredSensor(coordinator, data[vehicle], ChargingSpeed.FAST)]
+        if data[vehicle].charge_time_required_to_full[ChargingSpeed.ADAPTIVE] is not None:
+            entities.append(ChargeTimeRequiredSensor(coordinator, data[vehicle], ChargingSpeed.ADAPTIVE))
+        if data[vehicle].range_hvac_off is not None:
+            entities.append(RangeSensor(coordinator, data[vehicle], False, imperial_distance))
         if data[vehicle].internal_temperature is not None:
             entities.append(InternalTemperatureSensor(coordinator, data[vehicle]))
         if data[vehicle].external_temperature is not None:
@@ -266,6 +270,7 @@ class ChargeTimeRequiredSensor(KamereonEntity, SensorEntity):
         ChargingSpeed.FAST: '6kw',
         ChargingSpeed.NORMAL: '3kw',
         ChargingSpeed.SLOW: '1kw',
+        ChargingSpeed.ADAPTIVE: 'adaptive'
     }
 
     def __init__(self, coordinator, vehicle, charging_speed):

custom_components/nissan_connect/translations/en.json

@@ -113,6 +113,9 @@
         "charge_time_6kw": {
           "name": "Charge Time (6kW)"
         },
+        "charge_time_adaptive": {
+          "name": "Charge Time (adaptive)"
+        },
         "last_updated": {
           "name": "Last Updated"
         },

tests/test_sensor.py

@@ -30,7 +30,7 @@ def mock_hass():
                         range_hvac_on=100,
                         range_hvac_off=120,
                         total_mileage=5000,
-                        charge_time_required_to_full={ChargingSpeed.NORMAL: 60, ChargingSpeed.FAST: 30},
+                        charge_time_required_to_full={ChargingSpeed.NORMAL: 60, ChargingSpeed.FAST: 30, ChargingSpeed.ADAPTIVE: None},
                         features=[Feature.BATTERY_STATUS, Feature.DRIVING_JOURNEY_HISTORY]
                     )
                 },