volkswagencarnet 5.0.0b1__py3-none-any.whl → 5.0.0b3__py3-none-any.whl

volkswagencarnet/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.0b1'
+__version__ = version = '5.0.0b3'
 __version_tuple__ = version_tuple = (5, 0, 0)

volkswagencarnet/vw_dashboard.py

@@ -1351,6 +1351,18 @@ def create_instruments():
             icon="mdi:battery-arrow-up",
             unit="%",
         ),
+        Sensor(
+            attr="hv_battery_min_temperature",
+            name="HV battery min temperature",
+            icon="mdi:thermometer-chevron-down",
+            unit=TEMP_CELSIUS,
+        ),
+        Sensor(
+            attr="hv_battery_max_temperature",
+            name="HV battery max temperature",
+            icon="mdi:thermometer-chevron-up",
+            unit=TEMP_CELSIUS,
+        ),
         Sensor(
             attr="adblue_level",
             name="Adblue level",
@@ -1363,6 +1375,12 @@ def create_instruments():
             icon="mdi:fuel",
             unit="%",
         ),
+        Sensor(
+            attr="gas_level",
+            name="Gas level",
+            icon="mdi:gas-cylinder",
+            unit="%",
+        ),
         Sensor(
             attr="service_inspection",
             name="Service inspection days",
@@ -1421,6 +1439,18 @@ def create_instruments():
             icon="mdi:car",
             unit="km",
         ),
+        Sensor(
+            attr="fuel_range",
+            name="Fuel range",
+            icon="mdi:car",
+            unit="km",
+        ),
+        Sensor(
+            attr="gas_range",
+            name="Gas range",
+            icon="mdi:car",
+            unit="km",
+        ),
         Sensor(
             attr="combined_range",
             name="Combined range",
@@ -1492,6 +1522,13 @@ def create_instruments():
             unit="l/100 km",
             state_class=VWStateClass.MEASUREMENT,
         ),
+        Sensor(
+            attr="trip_last_average_gas_consumption",
+            name="Last trip average gas consumption",
+            icon="mdi:gas-cylinder",
+            unit="m3/100km",
+            state_class=VWStateClass.MEASUREMENT,
+        ),
         Sensor(
             attr="trip_last_duration",
             name="Last trip duration",

volkswagencarnet/vw_vehicle.py

@@ -25,8 +25,14 @@ _LOGGER = logging.getLogger(__name__)
 ENGINE_TYPE_ELECTRIC = "electric"
 ENGINE_TYPE_DIESEL = "diesel"
 ENGINE_TYPE_GASOLINE = "gasoline"
+ENGINE_TYPE_CNG = "cng"
 ENGINE_TYPE_HYBRID = "hybrid"
-ENGINE_TYPE_COMBUSTION = [ENGINE_TYPE_DIESEL, ENGINE_TYPE_GASOLINE]
+ENGINE_TYPE_COMBUSTION = [
+    ENGINE_TYPE_DIESEL,
+    ENGINE_TYPE_GASOLINE,
+    ENGINE_TYPE_CNG,
+]
+ENGINE_TYPE_GAS = [ENGINE_TYPE_CNG]
 DEFAULT_TARGET_TEMP = 24
 
 
@@ -292,28 +298,6 @@ class Vehicle:
 
     # Data set functions
     # Charging (BATTERYCHARGE)
-    async def set_charger_current(self, value):
-        """Set charger current."""
-        if self.is_charging_supported:
-            if 1 <= int(value) <= 255:
-                data = {
-                    "action": {
-                        "settings": {"maxChargeCurrent": int(value)},
-                        "type": "setSettings",
-                    }
-                }
-            else:
-                _LOGGER.error(
-                    "Set charger maximum current to %s is not supported", value
-                )
-                # pylint: disable=broad-exception-raised
-                raise Exception(
-                    f"Set charger maximum current to {value} is not supported."
-                )
-            return await self.set_charger(data)
-        _LOGGER.error("No charger support")
-        raise Exception("No charger support.")  # pylint: disable=broad-exception-raised
-
     async def set_charger(self, action) -> bool:
         """Turn on/off charging."""
         if self.is_charging_supported:
@@ -336,12 +320,24 @@ class Vehicle:
             self.is_charge_max_ac_setting_supported
             or self.is_auto_release_ac_connector_supported
             or self.is_battery_target_charge_level_supported
+            or self.is_charge_max_ac_ampere_supported
         ):
             if setting == "reduced_ac_charging" and value not in ["reduced", "maximum"]:
                 _LOGGER.error('Charging setting "%s" is not supported', value)
                 raise Exception(f'Charging setting "{value}" is not supported.')  # pylint: disable=broad-exception-raised
+            if setting == "max_charge_amperage" and int(value) not in [5, 10, 13, 32]:
+                _LOGGER.error(
+                    "Setting maximum charge amperage to %s is not supported", value
+                )
+                # pylint: disable=broad-exception-raised
+                raise Exception(
+                    f"Setting maximum charge amperage to {value} is not supported."
+                )
             data = {}
-            if self.is_charge_max_ac_setting_supported:
+            if (
+                self.is_charge_max_ac_setting_supported
+                and setting != "max_charge_amperage"
+            ):
                 data["maxChargeCurrentAC"] = (
                     value
                     if setting == "reduced_ac_charging"
@@ -360,6 +356,15 @@ class Vehicle:
                     if setting == "battery_target_charge_level"
                     else self.battery_target_charge_level
                 )
+            if (
+                self.is_charge_max_ac_ampere_supported
+                and setting != "reduced_ac_charging"
+            ):
+                data["maxChargeCurrentAC_A"] = (
+                    int(value)
+                    if setting == "max_charge_amperage"
+                    else self.charge_max_ac_ampere
+                )
             self._requests["latest"] = "Batterycharge"
             response = await self._connection.setChargingSettings(self.vin, data)
             return await self._handle_response(
@@ -887,7 +892,7 @@ class Vehicle:
         for light in lights:
             if light["status"] == "on":
                 lights_on_count = lights_on_count + 1
-        return lights_on_count == 1
+        return lights_on_count == 2
 
     @property
     def parking_light_last_updated(self) -> datetime:
@@ -1239,6 +1244,64 @@ class Vehicle:
             self.attrs, f"{Services.CHARGING}.chargingSettings.value.targetSOC_pct"
         )
 
+    @property
+    def hv_battery_min_temperature(self) -> int:
+        """Return HV battery min temperature."""
+        return (
+            float(
+                find_path(
+                    self.attrs,
+                    f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.temperatureHvBatteryMin_K",
+                )
+            )
+            - 273.15
+        )
+
+    @property
+    def hv_battery_min_temperature_last_updated(self) -> datetime:
+        """Return attribute last updated timestamp."""
+        return find_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.carCapturedTimestamp",
+        )
+
+    @property
+    def is_hv_battery_min_temperature_supported(self) -> bool:
+        """Return true if HV battery min temperature is supported."""
+        return is_valid_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.temperatureHvBatteryMin_K",
+        )
+
+    @property
+    def hv_battery_max_temperature(self) -> int:
+        """Return HV battery max temperature."""
+        return (
+            float(
+                find_path(
+                    self.attrs,
+                    f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.temperatureHvBatteryMax_K",
+                )
+            )
+            - 273.15
+        )
+
+    @property
+    def hv_battery_max_temperature_last_updated(self) -> datetime:
+        """Return attribute last updated timestamp."""
+        return find_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.carCapturedTimestamp",
+        )
+
+    @property
+    def is_hv_battery_max_temperature_supported(self) -> bool:
+        """Return true if HV battery max temperature is supported."""
+        return is_valid_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.temperatureBatteryStatus.value.temperatureHvBatteryMax_K",
+        )
+
     @property
     def charge_max_ac_setting(self) -> str | int:
         """Return charger max ampere setting."""
@@ -1644,6 +1707,10 @@ class Vehicle:
         """
         DIESEL_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.dieselRange"
         GASOLINE_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.gasolineRange"
+        CNG_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.cngRange"
+        TOTAL_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.totalRange_km"
+        if is_valid_path(self.attrs, CNG_RANGE):
+            return find_path(self.attrs, TOTAL_RANGE)
         if is_valid_path(self.attrs, DIESEL_RANGE):
             return find_path(self.attrs, DIESEL_RANGE)
         if is_valid_path(self.attrs, GASOLINE_RANGE):
@@ -1662,6 +1729,46 @@ class Vehicle:
     def is_combustion_range_supported(self) -> bool:
         """Return true if combustion range is supported, i.e. false for EVs.
 
+        :return:
+        """
+        return (
+            is_valid_path(
+                self.attrs, f"{Services.MEASUREMENTS}.rangeStatus.value.dieselRange"
+            )
+            or is_valid_path(
+                self.attrs, f"{Services.MEASUREMENTS}.rangeStatus.value.gasolineRange"
+            )
+            or is_valid_path(
+                self.attrs, f"{Services.MEASUREMENTS}.rangeStatus.value.cngRange"
+            )
+        )
+
+    @property
+    def fuel_range(self) -> int:
+        """Return fuel engine range.
+
+        :return:
+        """
+        DIESEL_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.dieselRange"
+        GASOLINE_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.gasolineRange"
+        if is_valid_path(self.attrs, DIESEL_RANGE):
+            return find_path(self.attrs, DIESEL_RANGE)
+        if is_valid_path(self.attrs, GASOLINE_RANGE):
+            return find_path(self.attrs, GASOLINE_RANGE)
+        return -1
+
+    @property
+    def fuel_range_last_updated(self) -> datetime | None:
+        """Return fuel engine range last updated."""
+        return find_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.rangeStatus.value.carCapturedTimestamp",
+        )
+
+    @property
+    def is_fuel_range_supported(self) -> bool:
+        """Return true if fuel range is supported, i.e. false for EVs.
+
         :return:
         """
         return is_valid_path(
@@ -1670,6 +1777,35 @@ class Vehicle:
             self.attrs, f"{Services.MEASUREMENTS}.rangeStatus.value.gasolineRange"
         )
 
+    @property
+    def gas_range(self) -> int:
+        """Return gas engine range.
+
+        :return:
+        """
+        CNG_RANGE = f"{Services.MEASUREMENTS}.rangeStatus.value.cngRange"
+        if is_valid_path(self.attrs, CNG_RANGE):
+            return find_path(self.attrs, CNG_RANGE)
+        return -1
+
+    @property
+    def gas_range_last_updated(self) -> datetime | None:
+        """Return gas engine range last updated."""
+        return find_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.rangeStatus.value.carCapturedTimestamp",
+        )
+
+    @property
+    def is_gas_range_supported(self) -> bool:
+        """Return true if gas range is supported, i.e. false for EVs.
+
+        :return:
+        """
+        return is_valid_path(
+            self.attrs, f"{Services.MEASUREMENTS}.rangeStatus.value.cngRange"
+        )
+
     @property
     def combined_range(self) -> int:
         """Return combined range.
@@ -1738,9 +1874,12 @@ class Vehicle:
         :return:
         """
         fuel_level_pct = ""
-        if is_valid_path(
-            self.attrs,
-            f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+        if (
+            is_valid_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            )
+            and not self.is_primary_drive_gas()
         ):
             fuel_level_pct = find_path(
                 self.attrs,
@@ -1785,12 +1924,87 @@ class Vehicle:
 
         :return:
         """
-        return is_valid_path(
+        return (
+            is_valid_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            )
+            and not self.is_primary_drive_gas()
+        ) or is_valid_path(
             self.attrs,
             f"{Services.MEASUREMENTS}.fuelLevelStatus.value.currentFuelLevel_pct",
+        )
+
+    @property
+    def gas_level(self) -> int:
+        """Return gas level.
+
+        :return:
+        """
+        gas_level_pct = ""
+        if (
+            is_valid_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            )
+            and self.is_primary_drive_gas()
+        ):
+            gas_level_pct = find_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            )
+
+        if is_valid_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.fuelLevelStatus.value.currentCngLevel_pct",
+        ):
+            gas_level_pct = find_path(
+                self.attrs,
+                f"{Services.MEASUREMENTS}.fuelLevelStatus.value.currentCngLevel_pct",
+            )
+        return gas_level_pct
+
+    @property
+    def gas_level_last_updated(self) -> datetime:
+        """Return gas level last updated."""
+        gas_level_lastupdated = ""
+        if (
+            is_valid_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.carCapturedTimestamp",
+            )
+            and self.is_primary_drive_gas()
+        ):
+            gas_level_lastupdated = find_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.carCapturedTimestamp",
+            )
+
+        if is_valid_path(
+            self.attrs,
+            f"{Services.MEASUREMENTS}.fuelLevelStatus.value.carCapturedTimestamp",
+        ):
+            gas_level_lastupdated = find_path(
+                self.attrs,
+                f"{Services.MEASUREMENTS}.fuelLevelStatus.value.carCapturedTimestamp",
+            )
+        return gas_level_lastupdated
+
+    @property
+    def is_gas_level_supported(self) -> bool:
+        """Return true if gas level reporting is supported.
+
+        :return:
+        """
+        return (
+            is_valid_path(
+                self.attrs,
+                f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            )
+            and self.is_primary_drive_gas()
         ) or is_valid_path(
             self.attrs,
-            f"{Services.FUEL_STATUS}.rangeStatus.value.primaryEngine.currentFuelLevel_pct",
+            f"{Services.MEASUREMENTS}.fuelLevelStatus.value.currentCngLevel_pct",
         )
 
     @property
@@ -3310,6 +3524,33 @@ class Vehicle:
             find_path(self.attrs, f"{Services.TRIP_LAST}.averageFuelConsumption")
         ) in (float, int)
 
+    @property
+    def trip_last_average_gas_consumption(self):
+        """Return last trip average gas consumption.
+
+        :return:
+        """
+        return float(
+            find_path(self.attrs, f"{Services.TRIP_LAST}.averageGasConsumption")
+        )
+
+    @property
+    def trip_last_average_gas_consumption_last_updated(self) -> datetime:
+        """Return last updated timestamp."""
+        return find_path(self.attrs, f"{Services.TRIP_LAST}.tripEndTimestamp")
+
+    @property
+    def is_trip_last_average_gas_consumption_supported(self) -> bool:
+        """Return true if supported.
+
+        :return:
+        """
+        return is_valid_path(
+            self.attrs, f"{Services.TRIP_LAST}.averageGasConsumption"
+        ) and type(
+            find_path(self.attrs, f"{Services.TRIP_LAST}.averageGasConsumption")
+        ) in (float, int)
+
     @property
     def trip_last_average_auxillary_consumption(self):
         """Return last trip average auxiliary consumption.
@@ -3695,6 +3936,28 @@ class Vehicle:
 
         return engine_type in ENGINE_TYPE_COMBUSTION
 
+    def is_primary_drive_gas(self):
+        """Check if primary engine is gas."""
+        if is_valid_path(
+            self.attrs, f"{Services.FUEL_STATUS}.rangeStatus.value.carType"
+        ):
+            return (
+                find_path(
+                    self.attrs, f"{Services.FUEL_STATUS}.rangeStatus.value.carType"
+                )
+                == ENGINE_TYPE_GAS
+            )
+        if is_valid_path(
+            self.attrs, f"{Services.MEASUREMENTS}.fuelLevelStatus.value.carType"
+        ):
+            return (
+                find_path(
+                    self.attrs, f"{Services.MEASUREMENTS}.fuelLevelStatus.value.carType"
+                )
+                == ENGINE_TYPE_GAS
+            )
+        return False
+
     @property
     def is_car_type_electric(self):
         """Check if car type is electric."""

{volkswagencarnet-5.0.0b1.dist-info → volkswagencarnet-5.0.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: volkswagencarnet
-Version: 5.0.0b1
+Version: 5.0.0b3
 Summary: Communicate with Volkswagen Connect
 Home-page: https://github.com/robinostlund/volkswagencarnet
 Author: Robin Ostlund

volkswagencarnet-5.0.0b3.dist-info/RECORD

@@ -0,0 +1,12 @@
+volkswagencarnet/__init__.py,sha256=ndlRBXCUPW7GKbbf-RdChs3xD61yE1c6aNxoYBXDBtQ,39
+volkswagencarnet/version.py,sha256=6sTwzE4MPXepQ3uVOi2FiA6etyIANxEdW0rjjCB9S7U,413
+volkswagencarnet/vw_connection.py,sha256=m4Nu6WW6FZspmdQGlXi_5RDfZdkJkSflJb-yZR23rKk,45931
+volkswagencarnet/vw_const.py,sha256=aE45XXuKpQxQS4_keoUD3kZBGu8jycdhm3E009XLF6c,4002
+volkswagencarnet/vw_dashboard.py,sha256=Os-CK5YRIqmZZ_bsxg9AyA15Z071kudorC0qkJG55A8,50075
+volkswagencarnet/vw_utilities.py,sha256=prdIyuU5yvs4PzSabzgqJOsGL-ApGDnyvIZlJZg7DYY,3559
+volkswagencarnet/vw_vehicle.py,sha256=ReSfyW4s4B1P_RxfexKAsro4t4VA16RVzBNnXcnrEWU,154945
+volkswagencarnet-5.0.0b3.dist-info/LICENSE.txt,sha256=5roVEYR3e-kTlq73yMQgO18VDR4w4JiSKdHejEJnT0s,34876
+volkswagencarnet-5.0.0b3.dist-info/METADATA,sha256=bjr3NnpL35JcUOMjZ-8PSINQ4XkTUrpgmsFYWmRxFck,6458
+volkswagencarnet-5.0.0b3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+volkswagencarnet-5.0.0b3.dist-info/top_level.txt,sha256=tUJNf33PP5Ln_Zc9N86ThKbe8BKJmW60ZKABmfZL_18,17
+volkswagencarnet-5.0.0b3.dist-info/RECORD,,

volkswagencarnet-5.0.0b1.dist-info/RECORD

@@ -1,12 +0,0 @@
-volkswagencarnet/__init__.py,sha256=ndlRBXCUPW7GKbbf-RdChs3xD61yE1c6aNxoYBXDBtQ,39
-volkswagencarnet/version.py,sha256=wQJgMYgonelMpVYUYEG2aNln4UadC6obUksEET0lQiM,413
-volkswagencarnet/vw_connection.py,sha256=m4Nu6WW6FZspmdQGlXi_5RDfZdkJkSflJb-yZR23rKk,45931
-volkswagencarnet/vw_const.py,sha256=aE45XXuKpQxQS4_keoUD3kZBGu8jycdhm3E009XLF6c,4002
-volkswagencarnet/vw_dashboard.py,sha256=AQ1xLvV2xvj6f__z67g8aKMh7CdBz2A8doH_-FHS4ts,49000
-volkswagencarnet/vw_utilities.py,sha256=prdIyuU5yvs4PzSabzgqJOsGL-ApGDnyvIZlJZg7DYY,3559
-volkswagencarnet/vw_vehicle.py,sha256=gLNpvgUaDIKKLE2JsTpTsen-rXoIXjlT8m31XnpdYEc,146387
-volkswagencarnet-5.0.0b1.dist-info/LICENSE.txt,sha256=5roVEYR3e-kTlq73yMQgO18VDR4w4JiSKdHejEJnT0s,34876
-volkswagencarnet-5.0.0b1.dist-info/METADATA,sha256=g6ZzbOuCpWFuWsnJ7KQlP805QNalky5SnU2i52Qo6g4,6458
-volkswagencarnet-5.0.0b1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-volkswagencarnet-5.0.0b1.dist-info/top_level.txt,sha256=tUJNf33PP5Ln_Zc9N86ThKbe8BKJmW60ZKABmfZL_18,17
-volkswagencarnet-5.0.0b1.dist-info/RECORD,,