Skip to content

Commit 12d4868

Browse files
committed
pin ArduinoJson to v6.x (fixes #245)
1 parent 735efa2 commit 12d4868

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

.github/workflows/esp-idf.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
uses: actions/checkout@v3
4141
with:
4242
repository: bblanchon/ArduinoJson
43+
ref: 3e1be980d93e47b2a0073efeeb9a9396fd7a83be
4344
path: examples/ESP-IDF/components/ArduinoJson
4445
- name: esp-idf build
4546
uses: espressif/esp-idf-ci-action@v1

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Allow `nullptr` as parameter for `mocpp_set_console_out` ([#224](https://github.com/matth-x/MicroOcpp/issues/224))
88
- Fix `mocpp_tick_ms()` on esp-idf roll-over after 12 hours
9+
- Pin ArduinoJson to v6.21 ([#245](https://github.com/matth-x/MicroOcpp/issues/245))
910

1011
## [1.0.0] - 2023-10-22
1112

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Please take `examples/ESP/main.cpp` as the starting point for the first project.
6161

6262
Mandatory:
6363

64-
- [bblanchon/ArduinoJSON](https://github.com/bblanchon/ArduinoJson)
64+
- [bblanchon/ArduinoJSON](https://github.com/bblanchon/ArduinoJson) (version `6.21`)
6565

6666
If compiled with the Arduino integration:
6767

examples/ESP-IDF/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Please clone the following repositories into the respective components-directori
1111
- [MicroOcpp](https://github.com/matth-x/MicroOcpp) into `components/MicroOcpp`
1212
- [Mongoose (ESP-IDF integration)](https://github.com/cesanta/mongoose-esp-idf) into `components/mongoose`
1313
- [Mongoose adapter for MicroOcpp](https://github.com/matth-x/MicroOcppMongoose) into `components/MicroOcppMongoose`
14-
- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) into `components/ArduinoJson`
14+
- [ArduinoJson (v6.21)](https://github.com/bblanchon/ArduinoJson) into `components/ArduinoJson`
1515

1616
For setup, the following commands could come handy (change to the root directory of the ESP-IDF project first):
1717

@@ -24,6 +24,8 @@ git clone https://github.com/matth-x/MicroOcpp components/MicroOcpp
2424
git clone --recurse-submodules https://github.com/cesanta/mongoose-esp-idf.git components/mongoose
2525
git clone https://github.com/matth-x/MicroOcppMongoose components/MicroOcppMongoose
2626
git clone https://github.com/bblanchon/ArduinoJson components/ArduinoJson
27+
cd components/ArduinoJson
28+
git checkout 3e1be980d93e47b2a0073efeeb9a9396fd7a83be
2729
```
2830

2931
The setup is done if the following include statements work:

examples/ESP-IDF/components/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ The ESP-IDF integration requires at least the following components:
55
- [MicroOcpp](https://github.com/matth-x/MicroOcpp)
66
- [Mongoose (ESP-IDF integration)](https://github.com/cesanta/mongoose-esp-idf)
77
- [Mongoose adapter for MicroOcpp](https://github.com/matth-x/MicroOcppMongoose)
8-
- [ArduinoJson](https://github.com/bblanchon/ArduinoJson)
8+
- [ArduinoJson (v6.21)](https://github.com/bblanchon/ArduinoJson)
99

1010
This example only provides the folder structure. You need to clone every project into it in order to run the example.

0 commit comments

Comments
 (0)