From d830439a1e6e45376d7e842a8aa73257c5909d7b Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:26:07 +0100 Subject: [PATCH 1/7] update pinned repos --- .github/workflows/documentation.yml | 2 +- .github/workflows/esp-idf.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 888d9121..a861ed91 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -34,7 +34,7 @@ jobs: with: repository: matth-x/MicroOcppSimulator path: MicroOcppSimulator - ref: 20e8da7b76a3f5f3e50facab018a457ecdbcca59 + ref: 2cb07cdbe53954a694a29336ab31eac2d2b48673 submodules: 'recursive' - name: Clean MicroOcpp submodule run: | diff --git a/.github/workflows/esp-idf.yml b/.github/workflows/esp-idf.yml index 06710dc2..279cd4a8 100644 --- a/.github/workflows/esp-idf.yml +++ b/.github/workflows/esp-idf.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v3 with: repository: matth-x/MicroOcppMongoose - ref: v1.1.0 + ref: v1.2.0 path: examples/ESP-IDF/components/MicroOcppMongoose - name: Checkout ArduinoJson uses: actions/checkout@v3 From ccc91c684287c952c3e9c8d9584b572c7f6f2996 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:38:02 +0100 Subject: [PATCH 2/7] update readme --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 738dd659..db0334ef 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ If you don't have an OCPP server at hand, leave the charge box ID blank and ente ## Benchmarks -*Full report: [MicroOCPP benchmark (esp-idf)](https://github.com/matth-x/MicroOcpp-benchmark)* +*Full report: [MicroOCPP benchmarks](https://matth-x.github.io/MicroOcpp/benchmarks/)* The following measurements were taken on the ESP32 @ 160MHz and represent the optimistic best case scenario for a charger with two physical connectors (i.e. compiled with `-Os`, disabled debug output and logs). @@ -69,7 +69,7 @@ If using the built-in certificate store (to enable, set build flag `MO_ENABLE_MB - [Mbed-TLS/mbedtls](https://github.com/Mbed-TLS/mbedtls) (version `2.28.1`) -In case you use PlatformIO, you can copy all dependencies from `platformio.ini` into your own configuration file. Alternatively, you can install the full library with dependencies by adding `matth-x/MicroOcpp@1.1.0` in the PIO library manager. +In case you use PlatformIO, you can copy all dependencies from `platformio.ini` into your own configuration file. Alternatively, you can install the full library with dependencies by adding `matth-x/MicroOcpp@1.2.0` in the PIO library manager. ## OCPP 2.0.1 and ISO 15118 @@ -77,14 +77,19 @@ The following OCPP 2.0.1 use cases are implemented: | UC | Description | Note | | :--- | :--- | :--- | -| M03 - M05 | Certificate management | Enable Mbed-TLS to use the built-in certificate store | -| B05 - B07 | Variables | | | B01 - B04
B11 - B12 | Provisioning | Ported from OCPP 1.6 | +| B05 - B07 | Variables | | +| C01 - C06 | Authorization options | | +| C15 | Offline Authorization | | | E01 - E12 | Transactions | | -| F01 - F02 | Remote Start/Stop Tx | | +| F01 - F03
F05 - F06 | RemoteControl | | +| G01 - G04 | Availability | | +| J02 | Tx-related MeterValues | persistency not supported yet | +| M03 - M05 | Certificate management | Enable Mbed-TLS to use the built-in certificate store | +| P01 - P02 | Data transfer | | | - | Protocol negotiation | The charger can select the OCPP version at runtime | -The OCPP 2.0.1 features are in an alpha development stage (no persistency yet). By default, they are disabled and excluded from the build, so they have no impact on the firmware size. To enable, set the build flag `MO_ENABLE_V201=1` and initialize the library with the ProtocolVersion parameter `2.0.1` (see [this example](https://github.com/matth-x/MicroOcppSimulator/blob/657e606c3b178d3add242935d413c72624130ff3/src/main.cpp#L43-L47) in the Simulator). +The OCPP 2.0.1 features are in an alpha development stage. By default, they are disabled and excluded from the build, so they have no impact on the firmware size. To enable, set the build flag `MO_ENABLE_V201=1` and initialize the library with the ProtocolVersion parameter `2.0.1` (see [this example](https://github.com/matth-x/MicroOcppSimulator/blob/657e606c3b178d3add242935d413c72624130ff3/src/main.cpp#L43-L47) in the Simulator). An integration of the library for OCPP 1.6 will also be functional with the 2.0.1 upgrade. It works with the same API in MicroOcpp.h. From e6e792619148b17f0bb958c15037298002ed6568 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:38:17 +0100 Subject: [PATCH 3/7] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60d80ac3..04bf0a0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## [1.2.0] - 2024-11-03 ### Changed From 11fc35c2e9610805ea002af2ddc156c72ffd569f Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:38:44 +0100 Subject: [PATCH 4/7] update PIO manifest --- library.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index 6637a297..10eadfe5 100644 --- a/library.json +++ b/library.json @@ -1,8 +1,8 @@ { "name": "MicroOcpp", "version": "1.2.0", - "description": "OCPP 1.6 Client for microcontrollers", - "keywords": "OCPP, 1.6, OCPP 1.6, Smart Energy, Smart Charging, client, ESP8266, ESP32, Arduino, esp-idf, EVSE, Charge Point", + "description": "OCPP 1.6 / 2.0.1 Client for microcontrollers", + "keywords": "OCPP, 1.6, OCPP 1.6, OCPP 2.0.1, Smart Energy, Smart Charging, client, ESP8266, ESP32, Arduino, esp-idf, EVSE, Charge Point", "repository": { "type": "git", From ac0228f88510f288e382c9b010e87a780a135e31 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:42:16 +0100 Subject: [PATCH 5/7] update manifest --- library.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library.json b/library.json index 10eadfe5..ec1b8a1e 100644 --- a/library.json +++ b/library.json @@ -46,8 +46,7 @@ "LICENSE", "mkdocs.yml", "platformio.ini", - "README.md", - "SConscript.py" + "README.md" ] }, From 2584846be0447360cbf636b58cad833d9c0cefd6 Mon Sep 17 00:00:00 2001 From: Matthias Akstaller <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:53:27 +0100 Subject: [PATCH 6/7] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db0334ef..5a2bc020 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ [![Unit tests]( https://github.com/matth-x/MicroOcpp/workflows/Unit%20tests/badge.svg)](https://github.com/matth-x/MicroOcpp/actions) [![codecov](https://codecov.io/github/matth-x/ArduinoOcpp/branch/develop/graph/badge.svg?token=UN6LO96HM7)](https://codecov.io/github/matth-x/ArduinoOcpp) -OCPP 1.6 client for microcontrollers. Portable C/C++. Compatible with Espressif, Arduino, NXP, STM, Linux and more. +OCPP 1.6 / 2.0.1 Client for microcontrollers. Portable C/C++. Compatible with Espressif, Arduino, NXP, STM, Linux and more. :heavy_check_mark: Works with [15+ commercial Central Systems](https://www.micro-ocpp.com/#h.314525e8447cc93c_81) :heavy_check_mark: Eligible for public chargers (Eichrecht-compliant) -:heavy_check_mark: Supports all OCPP 1.6 feature profiles and OCPP 2.0.1 preview +:heavy_check_mark: Supports all OCPP 1.6 feature profiles and the [basic OCPP 2.0.1 UCs](https://github.com/matth-x/MicroOcpp/tree/feature/prepare-release?tab=readme-ov-file#ocpp-201-and-iso-15118) Reference usage: [OpenEVSE](https://github.com/OpenEVSE/ESP32_WiFi_V4.x/blob/master/src/ocpp.cpp) | Technical introduction: [Docs](https://matth-x.github.io/MicroOcpp/intro-tech) | Website: [www.micro-ocpp.com](https://www.micro-ocpp.com) From 6ac71a50ec231aff6a7016d2798882d8d2af36a0 Mon Sep 17 00:00:00 2001 From: Matthias Akstaller <63792403+matth-x@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:57:47 +0100 Subject: [PATCH 7/7] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a2bc020..9434aec7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Unit tests]( https://github.com/matth-x/MicroOcpp/workflows/Unit%20tests/badge.svg)](https://github.com/matth-x/MicroOcpp/actions) [![codecov](https://codecov.io/github/matth-x/ArduinoOcpp/branch/develop/graph/badge.svg?token=UN6LO96HM7)](https://codecov.io/github/matth-x/ArduinoOcpp) -OCPP 1.6 / 2.0.1 Client for microcontrollers. Portable C/C++. Compatible with Espressif, Arduino, NXP, STM, Linux and more. +OCPP 1.6 / 2.0.1 client for microcontrollers. Portable C/C++. Compatible with Espressif, Arduino, NXP, STM, Linux and more. :heavy_check_mark: Works with [15+ commercial Central Systems](https://www.micro-ocpp.com/#h.314525e8447cc93c_81)