Skip to content

Commit 08bc523

Browse files
drc38dependabot[bot]mutesplashjthunJan Thunqvist
authored
Bugfix mc2 (#95)
* add ocpp versions supported (lbbrhzn#1678) * build(deps): bump actions/checkout from 4 to 5 (lbbrhzn#1685) * build(deps): bump pre-commit from 4.2.0 to 4.3.0 (lbbrhzn#1686) * build(deps): bump ruff from 0.12.2 to 0.12.9 (lbbrhzn#1687) * Correct custom component name for debuggging (lbbrhzn#1697) * Support for multiple connectors per charger (lbbrhzn#1689) * Update .gitignore for HA dev. Use symlinks for integration. * Handle multiple connectors, initial framework. * Fix sensor updates and placement on proper devices. * Add test for v2x multi connector. Handle meter values properly. max_current working per connector. * Fix per connector set charge rate. Clean up swenglish comments. * Remove separate connector device breaking change. Fix test race condition. CodeRabbit fixes. * Fix max_current per connector bug. Remove ChargerSession sensors (used for debugging). Fix Charge Control naming when only one connector. More CodeRabbit suggestions. * Fix Connector naming. More CodeRabbit suggestions. * Add more tests. More CodeRabbit suggestions. * Test fixes. CodeRabbit suggestions. * Fix tests. * Split stop transaction test in separate tests. * Change entity id to include charger. Add session sensors to connectors. Clear charger-level entities after connector creation. Add num_connector changes to reload logic. Remove not used functions from chargepoint.py. Revert to original config flow due to automatic discovery of number of connectors. Add more tests. * Change port on test to fix crash. * Add missing sensors. Convert features value in sensor. Add num_connectors to config entry. Migration to config 2.1. --------- Co-authored-by: Jan Thunqvist <[email protected]> Co-authored-by: lbbrhzn <[email protected]> Co-authored-by: drc38 <[email protected]> * build(deps): bump jsonschema from 4.24.0 to 4.25.1 (lbbrhzn#1690) Bumps [jsonschema](https://github.com/python-jsonschema/jsonschema) from 4.24.0 to 4.25.1. - [Release notes](https://github.com/python-jsonschema/jsonschema/releases) - [Changelog](https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst) - [Commits](python-jsonschema/jsonschema@v4.24.0...v4.25.1) --- updated-dependencies: - dependency-name: jsonschema dependency-version: 4.25.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: lbbrhzn <[email protected]> Co-authored-by: drc38 <[email protected]> * Added Rolec EVO to docs (lbbrhzn#1695) * Added Rolec EVO to docs * Update docs/user-guide.md Fix unit of power Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: drc38 <[email protected]> * build(deps): bump ruff from 0.12.9 to 0.12.11 (lbbrhzn#1696) Bumps [ruff](https://github.com/astral-sh/ruff) from 0.12.9 to 0.12.11. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.12.9...0.12.11) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.12.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump actions/stale from 9 to 10 (lbbrhzn#1699) Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v9...v10) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '10' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump actions/setup-python from 5.6.0 to 6.0.0 (lbbrhzn#1700) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.6.0 to 6.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v5.6.0...v6.0.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: drc38 <[email protected]> * fixes for initial release of multiple connector support Co-authored-by: Jan Thunqvist <[email protected]> * Average Current values. Handle cases where meter values bucket contains several EAIR with different contexts (Fixes lbbrhzn#1709). Set energy_session initally to 0 to avoid spike. More tests. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mutesplash <[email protected]> Co-authored-by: Jan <[email protected]> Co-authored-by: Jan Thunqvist <[email protected]> Co-authored-by: lbbrhzn <[email protected]> Co-authored-by: Mark Gibson <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent ee6a66b commit 08bc523

38 files changed

+7072
-1015
lines changed

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out the repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Run Labeler
1818
uses: crazy-max/[email protected]

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
contents: write
1717
steps:
1818
- name: 📥 Checkout the repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
- name: 🛠️ Set up Python
22-
uses: actions/setup-python@v5.6.0
22+
uses: actions/setup-python@v6.0.0
2323
with:
2424
python-version: "3.x"
2525

.github/workflows/publish_docs_to_wiki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
publish_docs_to_wiki:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- name: Pull wiki
2424
run: |

.github/workflows/sphinx-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
docs:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010
- uses: ammaraskar/sphinx-action@master
1111
with:
1212
docs-folder: "docs/"

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/stale@v9
21+
- uses: actions/stale@v10
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-issue-message: 'Stale issue message'

.github/workflows/tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
name: Pre-commit
1818
steps:
1919
- name: Check out the repository
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
23-
uses: actions/setup-python@v5.6.0
23+
uses: actions/setup-python@v6.0.0
2424
with:
2525
python-version: ${{ env.DEFAULT_PYTHON }}
2626

@@ -46,7 +46,7 @@ jobs:
4646
name: HACS
4747
steps:
4848
- name: Check out the repository
49-
uses: "actions/checkout@v4"
49+
uses: "actions/checkout@v5"
5050

5151
- name: HACS validation
5252
uses: "hacs/action@main"
@@ -59,7 +59,7 @@ jobs:
5959
name: Hassfest
6060
steps:
6161
- name: Check out the repository
62-
uses: "actions/checkout@v4"
62+
uses: "actions/checkout@v5"
6363

6464
- name: Hassfest validation
6565
uses: "home-assistant/actions/hassfest@master"
@@ -69,9 +69,9 @@ jobs:
6969
environment: continuous-integration
7070
steps:
7171
- name: Check out code from GitHub
72-
uses: "actions/checkout@v4"
72+
uses: "actions/checkout@v5"
7373
- name: Setup Python ${{ env.DEFAULT_PYTHON }}
74-
uses: "actions/setup-python@v5.6.0"
74+
uses: "actions/setup-python@v6.0.0"
7575
with:
7676
python-version: ${{ env.DEFAULT_PYTHON }}
7777
- name: Install requirements

.github/workflows/update-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Update version in manifest.json and commit
1616
env:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,7 @@ dmypy.json
127127

128128
# Pyre type checker
129129
.pyre/
130+
131+
# HA Development
132+
/config/
133+
.DS_Store

.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@
1010
],
1111
"files.associations": {
1212
"*.yaml": "home-assistant"
13-
}
13+
},
14+
"python.testing.pytestArgs": [
15+
"tests",
16+
"--cov=custom_components",
17+
"--cov-report=term-missing",
18+
"--cov-report=xml:coverage.xml",
19+
"--timeout=30"
20+
],
1421
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
![OCPP](https://github.com/home-assistant/brands/raw/master/custom_integrations/ocpp/icon.png)
77

8-
This is a Home Assistant integration for Electric Vehicle chargers that support the Open Charge Point Protocol.
8+
This is a Home Assistant integration for Electric Vehicle chargers that support the following Open Charge Point Protocols 1.6j, 2.0.1 and 2.1 (experimental).
99

1010
* based on the [Python OCPP Package](https://github.com/mobilityhouse/ocpp).
1111
* HACS compliant repository

0 commit comments

Comments
 (0)