[PR #993] [MERGED] Fix ArduinoJson (Using ARDUINOJSON_VERSION_MAJOR) #1700

New issue

Closed

opened 2026-02-28 02:12:42 +03:00 by kerem · 0 comments

kerem commented

2026-02-28 02:12:42 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/tzapu/WiFiManager/pull/993
Author: @Ruandv
Created: 1/14/2020
Status: ✅ Merged
Merged: 1/27/2020
Merged by: @tablatronix

Base: hotfixes ← Head: issue654

📝 Commits (10+)

159674b allow user loop while in AP mode
f1e657e Fixed Waiting for connection result with time out issue
493a73c Merge branch 'master' of https://github.com/tzapu/WiFiManager into loop
fd6bf74 separate charset and viewport meta
71f997b Merge branch 'master' of https://github.com/tzapu/WiFiManager into loop
f26638e hotfix: rename internal HTTP_HEAD to HTTP_HEADER
edce3fc Merge pull request #928 from d-a-v/head
ff26ed4 Merge branch 'master' into issuu_#644_utf-8_correct
286e5d1 Merge pull request #772 from dontsovcmc/issuu_#644_utf-8_correct
d1e395e Merge pull request #615 from xnorbi/master

📊 Changes

6 files changed (+72 additions, -54 deletions)

View changed files

📝 WiFiManager.cpp (+20 -21)
📝 WiFiManager.h (+3 -3)
📝 examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino (+24 -12)
📝 examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino (+23 -16)
📝 library.json (+1 -1)
📝 library.properties (+1 -1)

📄 Description

This is relates to the ArduinoJson 5 / 6 changes.
I took what @bigjohnson did in a502456 and just added a #define UseJsonV6 option that can be commented out if you want to use ArduinoJsonV5.
Tested on ArduinoJson V 5.13 and ArduinoJson V 6.13 (Latest as at 14/01/2020)

This also links to #654 and #812

update examples to be compatible with future arduinojson library
Maybe add support in the example in question for both versioons somehow?
Can also Close #945

_{🔄 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/tzapu/WiFiManager/pull/993 **Author:** [@Ruandv](https://github.com/Ruandv) **Created:** 1/14/2020 **Status:** ✅ Merged **Merged:** 1/27/2020 **Merged by:** [@tablatronix](https://github.com/tablatronix) **Base:** `hotfixes` ← **Head:** `issue654` --- ### 📝 Commits (10+) - [`159674b`](https://github.com/tzapu/WiFiManager/commit/159674bbbafa544ef07c08654a34840230b609b1) allow user loop while in AP mode - [`f1e657e`](https://github.com/tzapu/WiFiManager/commit/f1e657e2b82bd90d259efd55cd70b82fde42aefd) Fixed Waiting for connection result with time out issue - [`493a73c`](https://github.com/tzapu/WiFiManager/commit/493a73c2056fc64b6821e40370d6fb2b726bc4d2) Merge branch 'master' of https://github.com/tzapu/WiFiManager into loop - [`fd6bf74`](https://github.com/tzapu/WiFiManager/commit/fd6bf74720dce747344e91ef2fe2ad39eec7457d) separate charset and viewport meta - [`71f997b`](https://github.com/tzapu/WiFiManager/commit/71f997b5c7e5afd578304cd06db0b7507c8b5de4) Merge branch 'master' of https://github.com/tzapu/WiFiManager into loop - [`f26638e`](https://github.com/tzapu/WiFiManager/commit/f26638e38b049ea165bd4a9153c9dad4b382eaea) hotfix: rename internal HTTP_HEAD to HTTP_HEADER - [`edce3fc`](https://github.com/tzapu/WiFiManager/commit/edce3fc84ca9ac5ee570d0594e7969a80f8001c6) Merge pull request #928 from d-a-v/head - [`ff26ed4`](https://github.com/tzapu/WiFiManager/commit/ff26ed4e4c1c34465e182af1cde0eb9e8dda6c4a) Merge branch 'master' into issuu_#644_utf-8_correct - [`286e5d1`](https://github.com/tzapu/WiFiManager/commit/286e5d13d9483bda1eab83fda167837c922352c8) Merge pull request #772 from dontsovcmc/issuu_#644_utf-8_correct - [`d1e395e`](https://github.com/tzapu/WiFiManager/commit/d1e395e78f3411ff12253d143d358f94d1d8f8c1) Merge pull request #615 from xnorbi/master ### 📊 Changes **6 files changed** (+72 additions, -54 deletions) <details> <summary>View changed files</summary> 📝 `WiFiManager.cpp` (+20 -21) 📝 `WiFiManager.h` (+3 -3) 📝 `examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino` (+24 -12) 📝 `examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino` (+23 -16) 📝 `library.json` (+1 -1) 📝 `library.properties` (+1 -1) </details> ### 📄 Description This is relates to the ArduinoJson 5 / 6 changes. I took what @bigjohnson did in a502456 and just added a #define UseJsonV6 option that can be commented out if you want to use ArduinoJsonV5. Tested on ArduinoJson V 5.13 and ArduinoJson V 6.13 (Latest as at 14/01/2020) This also links to #654 and #812 - [x] update examples to be compatible with future arduinojson library - [x] Maybe add support in the example in question for both versioons somehow? - [x] Can also Close #945 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>