Multiple connectors (#91)

* 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.

* 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)

* 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.

* Correct custom component name for debuggging (lbbrhzn#1697)

* 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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: lbbrhzn <[email protected]>
Co-authored-by: mutesplash <[email protected]>

Author: 5 people

.github/workflows/labeler.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run Labeler
         uses: crazy-max/[email protected]

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
       contents: write
     steps:
       - name: 📥 Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: 🛠️ Set up Python
         uses: actions/[email protected]

.github/workflows/publish_docs_to_wiki.yml

@@ -18,7 +18,7 @@ jobs:
   publish_docs_to_wiki:
     runs-on: ubuntu-latest
     steps:  
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Pull wiki
       run: |

.github/workflows/sphinx-build.yml

@@ -6,7 +6,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ammaraskar/sphinx-action@master
       with:
         docs-folder: "docs/"

.github/workflows/tests.yaml

@@ -17,7 +17,7 @@ jobs:
     name: Pre-commit
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/[email protected]
@@ -46,7 +46,7 @@ jobs:
     name: HACS
     steps:
       - name: Check out the repository
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: HACS validation
         uses: "hacs/action@main"
@@ -59,7 +59,7 @@ jobs:
     name: Hassfest
     steps:
       - name: Check out the repository
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: Hassfest validation
         uses: "home-assistant/actions/hassfest@master"
@@ -69,7 +69,7 @@ jobs:
     environment: continuous-integration
     steps:
       - name: Check out code from GitHub
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
       - name: Setup Python ${{ env.DEFAULT_PYTHON }}
         uses: "actions/[email protected]"
         with:

.github/workflows/update-version.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Update version in manifest.json and commit
       env:

.gitignore

@@ -127,3 +127,7 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# HA Development
+/config/
+.DS_Store

README.md

@@ -5,7 +5,7 @@
 
 ![OCPP](https://github.com/home-assistant/brands/raw/master/custom_integrations/ocpp/icon.png)
 
-This is a Home Assistant integration for Electric Vehicle chargers that support the Open Charge Point Protocol.
+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).
 
 * based on the [Python OCPP Package](https://github.com/mobilityhouse/ocpp).
 * HACS compliant repository 

config/configuration.yaml

@@ -65,7 +65,7 @@ ocpp:
 logger:
   default: info
   logs:
-    custom_components.cpps: debug
+    custom_components.ocpp: debug
 
 # If you need to debug uncomment the line below (doc: https://www.home-assistant.io/integrations/debugpy/)
 # debugpy:

custom_components/ocpp/__init__.py

@@ -25,6 +25,7 @@
     CONF_METER_INTERVAL,
     CONF_MONITORED_VARIABLES,
     CONF_MONITORED_VARIABLES_AUTOCONFIG,
+    CONF_NUM_CONNECTORS,
     CONF_SKIP_SCHEMA_VALIDATION,
     CONF_FORCE_SMART_CHARGING,
     CONF_HOST,
@@ -44,6 +45,7 @@
     DEFAULT_METER_INTERVAL,
     DEFAULT_MONITORED_VARIABLES,
     DEFAULT_MONITORED_VARIABLES_AUTOCONFIG,
+    DEFAULT_NUM_CONNECTORS,
     DEFAULT_SKIP_SCHEMA_VALIDATION,
     DEFAULT_FORCE_SMART_CHARGING,
     DEFAULT_HOST,
@@ -192,6 +194,36 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry):
             config_entry, data=new_data, minor_version=0, version=2
         )
 
+    if config_entry.version == 2 and config_entry.minor_version == 0:
+        data = {**config_entry.data}
+        cpids = data.get(CONF_CPIDS, [])
+
+        changed = False
+        for idx, cp_map in enumerate(cpids):
+            if not isinstance(cp_map, dict) or not cp_map:
+                continue
+            cp_id, cp_data = next(iter(cp_map.items()))
+            if CONF_NUM_CONNECTORS not in cp_data:
+                cp_data = {**cp_data, CONF_NUM_CONNECTORS: DEFAULT_NUM_CONNECTORS}
+                cpids[idx] = {cp_id: cp_data}
+                changed = True
+
+        if changed:
+            data[CONF_CPIDS] = cpids
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data=data,
+                version=2,
+                minor_version=1,
+            )
+        else:
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data=data,
+                version=2,
+                minor_version=1,
+            )
+
     _LOGGER.info(
         "Migration to configuration version %s.%s successful",
         config_entry.version,