Merge 55d6f80 into 3d03477

bimmerconnected · Dec 1, 2020 · f073f03 · f073f03
2 parents 3d03477 + 55d6f80
commit f073f03
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 13 deletions.
diff --git a/bimmer_connected/vehicle.py b/bimmer_connected/vehicle.py
@@ -149,14 +149,13 @@ def drive_train_attributes(self) -> List[str]:
         result = ['remaining_range_total', 'remaining_fuel', 'mileage']
         if self.has_hv_battery:
             result += ['charging_time_remaining', 'charging_status', 'max_range_electric', 'charging_level_hv',
-                       'chargingConnectionType', 'chargingInductivePositioning', 'connectionStatus',
-                       'lastChargingEndReason', 'remaining_range_electric', 'lastChargingEndResult']
+                       'chargingConnectionType', 'connectionStatus', 'lastChargingEndReason',
+                       'remaining_range_electric', 'lastChargingEndResult']
         if self.has_internal_combustion_engine:
             result += ['remaining_range_fuel']
         if self.has_hv_battery and self.has_range_extender:
             result += ['maxFuel', 'remaining_range_fuel']
         if self.has_hv_battery and self.has_internal_combustion_engine:
-            result += ['fuelPercent']
             result.remove('max_range_electric')
         return result
 

diff --git a/bimmer_connected/vehicle_status.py b/bimmer_connected/vehicle_status.py
@@ -347,12 +347,6 @@ def charging_level_hv(self) -> int:
         """State of charge of the high voltage battery in percent."""
         return int(self._state.attributes[SERVICE_STATUS]['chargingLevelHv'])
 
-    @property
-    @backend_parameter
-    def fuel_percent(self) -> int:
-        """State of fuel in percent."""
-        return int(self._state.attributes[SERVICE_STATUS]['fuelPercent'])
-
     @property
     @backend_parameter
     def check_control_messages(self) -> List[CheckControlMessage]:

diff --git a/test/responses/G30_PHEV_OS7/status.json b/test/responses/G30_PHEV_OS7/status.json
@@ -23,7 +23,6 @@
 		"remainingRangeElectricMls": 19,
 		"remainingRangeFuel": 484,
 		"remainingRangeFuelMls": 300,
-		"fuelPercent": 92.4,
 		"connectionStatus": "DISCONNECTED",
 		"chargingStatus": "INVALID",
 		"chargingLevelHv": 85,
@@ -38,7 +37,6 @@
 		"internalDataTimeUTC": "2020-07-25T12:27:43+0000",
 		"singleImmediateCharging": false,
 		"chargingConnectionType": "CONDUCTIVE",
-		"chargingInductivePositioning": "NOT_POSITIONED",
 		"vehicleCountry": "DE",
 		"checkControlMessages": [],
 		"cbsData": [

diff --git a/test/responses/I01_NOREX/status.json b/test/responses/I01_NOREX/status.json
@@ -20,7 +20,6 @@
     "updateReason": "VEHICLE_SHUTDOWN_SECURED",
     "rearWindow": "INVALID",
     "DCS_CCH_Activation": "NA",
-    "chargingInductivePositioning": "NOT_POSITIONED",
     "remainingRangeElectric": 53,
     "singleImmediateCharging": false,
     "maxRangeElectric": 103,

diff --git a/test/responses/I01_REX/status.json b/test/responses/I01_REX/status.json
@@ -18,7 +18,6 @@
     "rearWindow" : "INVALID",
     "remainingRangeFuelMls" : 65,
     "DCS_CCH_Activation" : "NA",
-    "chargingInductivePositioning" : "NOT_POSITIONED",
     "remainingRangeElectric" : 48,
     "singleImmediateCharging" : false,
     "maxRangeElectric" : 94,