starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 00:04:28 +01:00
Code Issues 472 Packages Projects Releases 10 Wiki Activity

[PR #438] [MERGED] updated arduinojson to version 7.3.0, enabled comments within json files #3292

New Issue
Closed
opened 2026-03-20 22:08:15 +01:00 by sascha_hemi · 0 comments
sascha_hemi commented 2026-03-20 22:08:15 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/OpenEPaperLink/OpenEPaperLink/pull/438
Author: @nlimper
Created: 2/16/2025
Status: ✅ Merged
Merged: 3/19/2025
Merged by: @nlimper

Base: master ← Head: main

📝 Commits (5)

  • f29a30f updated arduinojson to version 7.3.0, enabled comments within json files
  • 20b0e00 update ESPAsyncWebServer/AsyncTCP to the ESP32Async fork
  • 96fbc64 Arduino 3.x compatibility (while maintaining 2.x compatibility)
  • 9dbf1c8 Update platformio.ini
  • 6df4465 Merge branch 'master' into main

📊 Changes

20 files changed (+171 additions, -154 deletions)

View changed files

📝 ESP32_AP-Flasher/include/SPIFFSEditor.h (+4 -4)
📝 ESP32_AP-Flasher/include/leds.h (+1 -1)
📝 ESP32_AP-Flasher/platformio.ini (+9 -11)
📝 ESP32_AP-Flasher/src/SPIFFSEditor.cpp (+2 -3)
📝 ESP32_AP-Flasher/src/ble_filter.cpp (+5 -0)
📝 ESP32_AP-Flasher/src/contentmanager.cpp (+37 -37)
📝 ESP32_AP-Flasher/src/espflasher.cpp (+1 -1)
📝 ESP32_AP-Flasher/src/flasher.cpp (+6 -5)
📝 ESP32_AP-Flasher/src/ips_display.cpp (+15 -4)
📝 ESP32_AP-Flasher/src/language.cpp (+2 -2)
📝 ESP32_AP-Flasher/src/leds.cpp (+19 -21)
📝 ESP32_AP-Flasher/src/newproto.cpp (+1 -1)
📝 ESP32_AP-Flasher/src/ota.cpp (+4 -4)
📝 ESP32_AP-Flasher/src/powermgt.cpp (+10 -4)
📝 ESP32_AP-Flasher/src/serialap.cpp (+1 -1)
📝 ESP32_AP-Flasher/src/tag_db.cpp (+34 -35)
📝 ESP32_AP-Flasher/src/tagdata.cpp (+1 -1)
📝 ESP32_AP-Flasher/src/web.cpp (+15 -15)
📝 ESP32_AP-Flasher/src/webflasher.cpp (+3 -3)
📝 ESP32_AP-Flasher/src/wifimanager.cpp (+1 -1)

📄 Description

Bringing arduinjson up to date from 6.19.4 to the latest (currently 7.3.0). Applied all code changes needed for that.
Known issue: compiler warnings coming from /ESPAsyncWebServer-esphome/src/AsyncJson.h as that library is not updated yet for arduinojson 7 (but the deprecated commands still work).

If anybody has a good reason not to apply this change, let me know. Else, I will merge it shortly.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/OpenEPaperLink/OpenEPaperLink/pull/438 **Author:** [@nlimper](https://github.com/nlimper) **Created:** 2/16/2025 **Status:** ✅ Merged **Merged:** 3/19/2025 **Merged by:** [@nlimper](https://github.com/nlimper) **Base:** `master` ← **Head:** `main` --- ### 📝 Commits (5) - [`f29a30f`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/f29a30fee49837a809af0f43e02f21aa84d406af) updated arduinojson to version 7.3.0, enabled comments within json files - [`20b0e00`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/20b0e00fa52578bd1086d0290c7376195092a242) update ESPAsyncWebServer/AsyncTCP to the ESP32Async fork - [`96fbc64`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/96fbc64f356147dff6410487129be54af32bbe5c) Arduino 3.x compatibility (while maintaining 2.x compatibility) - [`9dbf1c8`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/9dbf1c8704dc24a348f4d4a4e0f8fa10e3875a3a) Update platformio.ini - [`6df4465`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/6df4465b31cbe34dd86998a533a120b2b0dccb23) Merge branch 'master' into main ### 📊 Changes **20 files changed** (+171 additions, -154 deletions) <details> <summary>View changed files</summary> 📝 `ESP32_AP-Flasher/include/SPIFFSEditor.h` (+4 -4) 📝 `ESP32_AP-Flasher/include/leds.h` (+1 -1) 📝 `ESP32_AP-Flasher/platformio.ini` (+9 -11) 📝 `ESP32_AP-Flasher/src/SPIFFSEditor.cpp` (+2 -3) 📝 `ESP32_AP-Flasher/src/ble_filter.cpp` (+5 -0) 📝 `ESP32_AP-Flasher/src/contentmanager.cpp` (+37 -37) 📝 `ESP32_AP-Flasher/src/espflasher.cpp` (+1 -1) 📝 `ESP32_AP-Flasher/src/flasher.cpp` (+6 -5) 📝 `ESP32_AP-Flasher/src/ips_display.cpp` (+15 -4) 📝 `ESP32_AP-Flasher/src/language.cpp` (+2 -2) 📝 `ESP32_AP-Flasher/src/leds.cpp` (+19 -21) 📝 `ESP32_AP-Flasher/src/newproto.cpp` (+1 -1) 📝 `ESP32_AP-Flasher/src/ota.cpp` (+4 -4) 📝 `ESP32_AP-Flasher/src/powermgt.cpp` (+10 -4) 📝 `ESP32_AP-Flasher/src/serialap.cpp` (+1 -1) 📝 `ESP32_AP-Flasher/src/tag_db.cpp` (+34 -35) 📝 `ESP32_AP-Flasher/src/tagdata.cpp` (+1 -1) 📝 `ESP32_AP-Flasher/src/web.cpp` (+15 -15) 📝 `ESP32_AP-Flasher/src/webflasher.cpp` (+3 -3) 📝 `ESP32_AP-Flasher/src/wifimanager.cpp` (+1 -1) </details> ### 📄 Description Bringing arduinjson up to date from 6.19.4 to the latest (currently 7.3.0). Applied all code changes needed for that. Known issue: compiler warnings coming from `/ESPAsyncWebServer-esphome/src/AsyncJson.h` as that library is not updated yet for arduinojson 7 (but the deprecated commands still work). If anybody has a good reason not to apply this change, let me know. Else, I will merge it shortly. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
sascha_hemi added the pull-request label 2026-03-20 22:08:15 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
88MZ100 FW
ARM Tag FW
ap fw
bug
documentation
enhancement
good first issue
nRF FW
pull-request
Mirrored from GitHub Pull Request
 question
tag fw
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
sascha_hemi
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/OpenEPaperLink#3292
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?