Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ArduinoJson (Using ARDUINOJSON_VERSION_MAJOR) #993

Merged
merged 18 commits into from
Jan 27, 2020
Merged

Fix ArduinoJson (Using ARDUINOJSON_VERSION_MAJOR) #993

merged 18 commits into from
Jan 27, 2020

Conversation

Ruandv
Copy link
Contributor

@Ruandv Ruandv commented Jan 14, 2020

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

@bigjohnson
Copy link

Perfect, but I think is better automate it replacing
#ifdef UseJsonV6
with
#if ARDUINOJSON_VERSION_MAJOR >= 6

@tablatronix tablatronix added the bug Validated BUG label Jan 15, 2020
@Ruandv
Copy link
Contributor Author

Ruandv commented Jan 15, 2020

Ok good suggestion. Thank you I didn't know there is a way to do that. Will update it soon

@Ruandv Ruandv changed the title Fix ArduinoJson (Using #define) Fix ArduinoJson (Using ARDUINOJSON_VERSION_MAJOR) Jan 15, 2020
@Ruandv Ruandv requested review from tablatronix and tzapu January 15, 2020 19:00
@tablatronix tablatronix changed the base branch from master to hotfixes January 22, 2020 15:50
@tablatronix tablatronix merged commit 9967d27 into tzapu:hotfixes Jan 27, 2020
@tablatronix
Copy link
Collaborator

I should have rebased this.. Should be ok

Copy link

@userweb2018 userweb2018 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check the sketch, there is not "}" in void setup!
It is correct?
I am having problems with ondemand config portal WithFSParameters using a push button.

@tablatronix
Copy link
Collaborator

Compiles for me

@userweb2018
Copy link

For me too, but this is strange....
It is not working perfectly everytime!
In which way can I use it with ondemand with pushbuttom and parameters?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Validated BUG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants