Skip to content

Commit

Permalink
Merge pull request #536 from brentru/upgrade-arduinojson-to-v7
Browse files Browse the repository at this point in the history
Upgrade ArduinoJSON to V7 and refactored JSON handling
  • Loading branch information
brentru authored Jan 15, 2024
2 parents 246c610 + bd0d181 commit 241da6b
Show file tree
Hide file tree
Showing 18 changed files with 434 additions and 440 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/build-clang-doxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
- name: Download and install stable Nanopb
Expand Down Expand Up @@ -118,7 +117,6 @@ jobs:
run: bash ci/actions_install.sh
- name: Install extra Arduino libraries
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
- name: Download and install stable Nanopb
Expand Down Expand Up @@ -214,7 +212,6 @@ jobs:
# manually install Adafruit WiFiNINA library fork
- name: Install extra Arduino libraries
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/adafruit/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
Expand Down Expand Up @@ -266,7 +263,6 @@ jobs:
# manually install OneWireNG/TempControlLib for OneWireNg (RP2040 Supported OneWire w/backwards compat.)
- name: Install extra Arduino libraries
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
- name: Download and install stable Nanopb
Expand Down Expand Up @@ -316,7 +312,6 @@ jobs:
run: bash ci/actions_install.sh
- name: Install extra Arduino libraries
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/arduino-libraries/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA
git clone --quiet https://github.com/arduino-libraries/Servo.git /home/runner/Arduino/libraries/Servo
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
Expand Down Expand Up @@ -357,7 +352,6 @@ jobs:
run: bash ci/actions_install.sh
- name: Install extra Arduino library
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
- name: Download and install stable Nanopb
Expand Down Expand Up @@ -415,7 +409,6 @@ jobs:
run: bash ci/actions_install.sh
- name: Install extra Arduino libraries
run: |
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library
Expand Down Expand Up @@ -482,4 +475,4 @@ jobs:
env:
GH_REPO_TOKEN: ${{ secrets.GH_REPO_TOKEN }}
PRETTYNAME : "Adafruit.io WipperSnapper Library"
run: bash ci/doxy_gen_and_deploy.sh
run: bash ci/doxy_gen_and_deploy.sh
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WipperSnapper
version=1.0.0-beta.74
version=1.0.0-beta.75
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Arduino application for Adafruit.io WipperSnapper
Expand Down
Loading

0 comments on commit 241da6b

Please sign in to comment.