Skip to content

Add stop charge button to renault integration #88003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epenet merged 11 commits into from
Feb 28, 2023
Merged

Add stop charge button to renault integration #88003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84e5b73
Added service to start/stop charge
rodriguestiago0 Feb 13, 2023
561eac0
Remove comment
rodriguestiago0 Feb 13, 2023
473fc96
Fixed service
rodriguestiago0 Feb 13, 2023
74d08ec
removed service for start/stop charge
rodriguestiago0 Feb 13, 2023
142fd14
Remove version
rodriguestiago0 Feb 13, 2023
c1252d6
Format
rodriguestiago0 Feb 13, 2023
3d82028
Revert change
rodriguestiago0 Feb 13, 2023
ed896fb
Fix lint
epenet Feb 14, 2023
86aff2d
Add tests
epenet Feb 14, 2023
b2cc6ab
Merge branch 'dev' into add-stop-charge-renault
rodriguestiago0 Feb 15, 2023
a880a3f
Merge branch 'dev' into add-stop-charge-renault
rodriguestiago0 Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions homeassistant/components/renault/button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,11 @@ async def async_press(self) -> None:
name="Start charge",
requires_electricity=True,
),
RenaultButtonEntityDescription(
async_press=lambda x: x.vehicle.set_charge_stop(),
Copy link
Copy Markdown
Contributor

@epenet epenet Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested this feature?

Feedback on the renault-api library has been inconsistent, and the function doesn't appear to work on all vehicles (does it actually work on yours?)

Copy link
Copy Markdown
Contributor Author

@rodriguestiago0 rodriguestiago0 Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The service worked on my Dacia Spring. I will test the button today.

Copy link
Copy Markdown
Contributor Author

@rodriguestiago0 rodriguestiago0 Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested it and worked with my car.

Dacia spring.

Copy link
Copy Markdown
Contributor

@epenet epenet Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great can you please adjust tests accordingly?

Copy link
Copy Markdown
Contributor Author

@rodriguestiago0 rodriguestiago0 Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we split the renault and dacia integration? For example dacia spring don't allow schedule charge?

Is possible to have a base integration that is common to both and then specific for each brand?

Copy link
Copy Markdown
Contributor

@epenet epenet Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is the same library so I think it's better to have a single integration.
Even some Renault vehicles don't support schedule charge...
It is better to adjust documentation for this

key="stop_charge",
icon="mdi:ev-station",
name="Stop charge",
requires_electricity=True,
),
)
5 changes: 5 additions & 0 deletions homeassistant/components/renault/renault_vehicle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ async def set_charge_start(self) -> models.KamereonVehicleChargingStartActionDat
"""Start vehicle charge."""
return await self._vehicle.set_charge_start()

@with_error_wrapping
async def set_charge_stop(self) -> models.KamereonVehicleChargingStartActionData:
"""Stop vehicle charge."""
return await self._vehicle.set_charge_stop()

@with_error_wrapping
async def set_ac_stop(self) -> models.KamereonVehicleHvacStartActionData:
"""Stop vehicle ac."""
Expand Down
18 changes: 18 additions & 0 deletions tests/components/renault/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777999_start_charge",
},
{
ATTR_ENTITY_ID: "button.reg_number_stop_charge",
ATTR_ICON: "mdi:ev-station",
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777999_stop_charge",
},
],
Platform.DEVICE_TRACKER: [],
Platform.SELECT: [
Expand Down Expand Up @@ -336,6 +342,12 @@
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777999_start_charge",
},
{
ATTR_ENTITY_ID: "button.reg_number_stop_charge",
ATTR_ICON: "mdi:ev-station",
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777999_stop_charge",
},
],
Platform.DEVICE_TRACKER: [
{
Expand Down Expand Up @@ -565,6 +577,12 @@
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777123_start_charge",
},
{
ATTR_ENTITY_ID: "button.reg_number_stop_charge",
ATTR_ICON: "mdi:ev-station",
ATTR_STATE: STATE_UNKNOWN,
ATTR_UNIQUE_ID: "vf1aaaaa555777123_stop_charge",
},
],
Platform.DEVICE_TRACKER: [
{
Expand Down
7 changes: 7 additions & 0 deletions tests/components/renault/fixtures/action.set_charge_stop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"data": {
"type": "ChargingStart",
"id": "guid",
"attributes": { "action": "stop" }
}
}
28 changes: 28 additions & 0 deletions tests/components/renault/test_button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,34 @@ async def test_button_start_charge(
assert mock_action.mock_calls[0][1] == ()


@pytest.mark.usefixtures("fixtures_with_data")
@pytest.mark.parametrize("vehicle_type", ["zoe_40"], indirect=True)
async def test_button_stop_charge(
hass: HomeAssistant, config_entry: ConfigEntry
) -> None:
"""Test that button invokes renault_api with correct data."""
await hass.config_entries.async_setup(config_entry.entry_id)
await hass.async_block_till_done()

data = {
ATTR_ENTITY_ID: "button.reg_number_stop_charge",
}

with patch(
"renault_api.renault_vehicle.RenaultVehicle.set_charge_stop",
return_value=(
schemas.KamereonVehicleChargingStartActionDataSchema.loads(
load_fixture("renault/action.set_charge_stop.json")
)
),
) as mock_action:
await hass.services.async_call(
BUTTON_DOMAIN, SERVICE_PRESS, service_data=data, blocking=True
)
assert len(mock_action.mock_calls) == 1
assert mock_action.mock_calls[0][1] == ()


@pytest.mark.usefixtures("fixtures_with_data")
@pytest.mark.parametrize("vehicle_type", ["zoe_40"], indirect=True)
async def test_button_start_air_conditioner(
Expand Down