jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add charging switch to BMW Connected Drive (#93737)

Browse Source 
Co-authored-by: rikroe <rikroe@users.noreply.github.com>
This commit is contained in:
rikroe 2023-05-29 23:48:13 +02:00 committed by GitHub
parent 07dd34b04a
commit 1ea202a5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 92 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/bmw_connected_drive/switch.py
View File

@ -7,6 +7,7 @@ from typing import Any
from bimmer_connected.models import MyBMWAPIError from bimmer_connected.models import MyBMWAPIError
from bimmer_connected.vehicle import MyBMWVehicle from bimmer_connected.vehicle import MyBMWVehicle
from bimmer_connected.vehicle.fuel_and_battery import ChargingState
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
@ -38,6 +39,15 @@ class BMWSwitchEntityDescription(SwitchEntityDescription, BMWRequiredKeysMixin):
dynamic_options: Callable[[MyBMWVehicle], list[str]] | None = None dynamic_options: Callable[[MyBMWVehicle], list[str]] | None = None
CHARGING_STATE_ON = {
ChargingState.CHARGING,
ChargingState.COMPLETE,
ChargingState.FULLY_CHARGED,
ChargingState.FINISHED_FULLY_CHARGED,
ChargingState.FINISHED_NOT_FULL,
ChargingState.TARGET_REACHED,
}
NUMBER_TYPES: list[BMWSwitchEntityDescription] = [ NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
BMWSwitchEntityDescription( BMWSwitchEntityDescription(
key="climate", key="climate",
@ -48,6 +58,15 @@ NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
remote_service_off=lambda v: v.remote_services.trigger_remote_air_conditioning_stop(), remote_service_off=lambda v: v.remote_services.trigger_remote_air_conditioning_stop(),
icon="mdi:fan", icon="mdi:fan",
), ),
BMWSwitchEntityDescription(
key="charging",
name="Charging",
is_available=lambda v: v.is_remote_charge_stop_enabled,
value_fn=lambda v: v.fuel_and_battery.charging_status in CHARGING_STATE_ON,
remote_service_on=lambda v: v.remote_services.trigger_charge_start(),
remote_service_off=lambda v: v.remote_services.trigger_charge_stop(),
icon="mdi:ev-station",
),
] ]

10
tests/components/bmw_connected_drive/fixtures/vehicles/G26/bmw-eadrax-vcs_v4_vehicles_state_WBA00000000DEMO02.json
View File

@ -43,7 +43,11 @@
"lights": true, "lights": true,
"lock": true, "lock": true,
"remote360": true, "remote360": true,
"remoteChargingCommands": {}, "remoteChargingCommands": {
"chargingControl": ["START", "STOP"],
"flapControl": ["NOT_SUPPORTED"],
"plugControl": ["NOT_SUPPORTED"]
},
"remoteSoftwareUpgrade": true, "remoteSoftwareUpgrade": true,
"sendPoi": true, "sendPoi": true,
"specialThemeSupport": [], "specialThemeSupport": [],
@ -159,9 +163,9 @@
"electricChargingState": { "electricChargingState": {
"chargingConnectionType": "UNKNOWN", "chargingConnectionType": "UNKNOWN",
"chargingLevelPercent": 80, "chargingLevelPercent": 80,
"chargingStatus": "INVALID", "chargingStatus": "CHARGING",
"chargingTarget": 80, "chargingTarget": 80,
"isChargerConnected": false, "isChargerConnected": true,
"range": 472, "range": 472,
"remainingChargingMinutes": 10 "remainingChargingMinutes": 10
}, },

64
tests/components/bmw_connected_drive/snapshots/test_diagnostics.ambr
View File

@ -289,6 +289,16 @@
'lock': True, 'lock': True,
'remote360': True, 'remote360': True,
'remoteChargingCommands': dict({ 'remoteChargingCommands': dict({
'chargingControl': list([
'START',
'STOP',
]),
'flapControl': list([
'NOT_SUPPORTED',
]),
'plugControl': list([
'NOT_SUPPORTED',
]),
}), }),
'remoteSoftwareUpgrade': True, 'remoteSoftwareUpgrade': True,
'sendPoi': True, 'sendPoi': True,
@ -524,9 +534,9 @@
'electricChargingState': dict({ 'electricChargingState': dict({
'chargingConnectionType': 'UNKNOWN', 'chargingConnectionType': 'UNKNOWN',
'chargingLevelPercent': 80, 'chargingLevelPercent': 80,
'chargingStatus': 'INVALID', 'chargingStatus': 'CHARGING',
'chargingTarget': 80, 'chargingTarget': 80,
'isChargerConnected': False, 'isChargerConnected': True,
'range': 472, 'range': 472,
'remainingChargingMinutes': 10, 'remainingChargingMinutes': 10,
}), }),
@ -778,9 +788,9 @@
'charging_end_time': '2022-07-10T11:10:00+00:00', 'charging_end_time': '2022-07-10T11:10:00+00:00',
'charging_start_time': None, 'charging_start_time': None,
'charging_start_time_no_tz': None, 'charging_start_time_no_tz': None,
'charging_status': 'NOT_CHARGING', 'charging_status': 'CHARGING',
'charging_target': 80, 'charging_target': 80,
'is_charger_connected': False, 'is_charger_connected': True,
'remaining_battery_percent': 80, 'remaining_battery_percent': 80,
'remaining_fuel': list([ 'remaining_fuel': list([
None, None,
@ -804,8 +814,8 @@
'has_electric_drivetrain': True, 'has_electric_drivetrain': True,
'is_charging_plan_supported': True, 'is_charging_plan_supported': True,
'is_lsc_enabled': True, 'is_lsc_enabled': True,
'is_remote_charge_start_enabled': False, 'is_remote_charge_start_enabled': True,
'is_remote_charge_stop_enabled': False, 'is_remote_charge_stop_enabled': True,
'is_remote_climate_start_enabled': True, 'is_remote_climate_start_enabled': True,
'is_remote_climate_stop_enabled': True, 'is_remote_climate_stop_enabled': True,
'is_remote_horn_enabled': True, 'is_remote_horn_enabled': True,
@ -1687,6 +1697,16 @@
'lock': True, 'lock': True,
'remote360': True, 'remote360': True,
'remoteChargingCommands': dict({ 'remoteChargingCommands': dict({
'chargingControl': list([
'START',
'STOP',
]),
'flapControl': list([
'NOT_SUPPORTED',
]),
'plugControl': list([
'NOT_SUPPORTED',
]),
}), }),
'remoteSoftwareUpgrade': True, 'remoteSoftwareUpgrade': True,
'sendPoi': True, 'sendPoi': True,
@ -1812,9 +1832,9 @@
'electricChargingState': dict({ 'electricChargingState': dict({
'chargingConnectionType': 'UNKNOWN', 'chargingConnectionType': 'UNKNOWN',
'chargingLevelPercent': 80, 'chargingLevelPercent': 80,
'chargingStatus': 'INVALID', 'chargingStatus': 'CHARGING',
'chargingTarget': 80, 'chargingTarget': 80,
'isChargerConnected': False, 'isChargerConnected': True,
'range': 472, 'range': 472,
'remainingChargingMinutes': 10, 'remainingChargingMinutes': 10,
}), }),
@ -3191,6 +3211,16 @@
'lock': True, 'lock': True,
'remote360': True, 'remote360': True,
'remoteChargingCommands': dict({ 'remoteChargingCommands': dict({
'chargingControl': list([
'START',
'STOP',
]),
'flapControl': list([
'NOT_SUPPORTED',
]),
'plugControl': list([
'NOT_SUPPORTED',
]),
}), }),
'remoteSoftwareUpgrade': True, 'remoteSoftwareUpgrade': True,
'sendPoi': True, 'sendPoi': True,
@ -3316,9 +3346,9 @@
'electricChargingState': dict({ 'electricChargingState': dict({
'chargingConnectionType': 'UNKNOWN', 'chargingConnectionType': 'UNKNOWN',
'chargingLevelPercent': 80, 'chargingLevelPercent': 80,
'chargingStatus': 'INVALID', 'chargingStatus': 'CHARGING',
'chargingTarget': 80, 'chargingTarget': 80,
'isChargerConnected': False, 'isChargerConnected': True,
'range': 472, 'range': 472,
'remainingChargingMinutes': 10, 'remainingChargingMinutes': 10,
}), }),
@ -4024,6 +4054,16 @@
'lock': True, 'lock': True,
'remote360': True, 'remote360': True,
'remoteChargingCommands': dict({ 'remoteChargingCommands': dict({
'chargingControl': list([
'START',
'STOP',
]),
'flapControl': list([
'NOT_SUPPORTED',
]),
'plugControl': list([
'NOT_SUPPORTED',
]),
}), }),
'remoteSoftwareUpgrade': True, 'remoteSoftwareUpgrade': True,
'sendPoi': True, 'sendPoi': True,
@ -4149,9 +4189,9 @@
'electricChargingState': dict({ 'electricChargingState': dict({
'chargingConnectionType': 'UNKNOWN', 'chargingConnectionType': 'UNKNOWN',
'chargingLevelPercent': 80, 'chargingLevelPercent': 80,
'chargingStatus': 'INVALID', 'chargingStatus': 'CHARGING',
'chargingTarget': 80, 'chargingTarget': 80,
'isChargerConnected': False, 'isChargerConnected': True,
'range': 472, 'range': 472,
'remainingChargingMinutes': 10, 'remainingChargingMinutes': 10,
}), }),

12
tests/components/bmw_connected_drive/snapshots/test_switch.ambr
View File

@ -13,5 +13,17 @@
'last_updated': <ANY>, 'last_updated': <ANY>,
'state': 'off', 'state': 'off',
}), }),
StateSnapshot({
'attributes': ReadOnlyDict({
'attribution': 'Data provided by MyBMW',
'friendly_name': 'i4 eDrive40 Charging',
'icon': 'mdi:ev-station',
}),
'context': <ANY>,
'entity_id': 'switch.i4_edrive40_charging',
'last_changed': <ANY>,
'last_updated': <ANY>,
'state': 'on',
}),
]) ])
# --- # ---

2
tests/components/bmw_connected_drive/test_switch.py
View File

@ -36,6 +36,8 @@ async def test_entity_state_attrs(
[ [
("switch.i4_edrive40_climate", "ON"), ("switch.i4_edrive40_climate", "ON"),
("switch.i4_edrive40_climate", "OFF"), ("switch.i4_edrive40_climate", "OFF"),
("switch.i4_edrive40_charging", "ON"),
("switch.i4_edrive40_charging", "OFF"),
], ],
) )
async def test_update_triggers_success( async def test_update_triggers_success(