close
The Wayback Machine - https://web.archive.org/web/20201124155343/https://github.com/tzapu/WiFiManager/pull/1060
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

Update FS examples to use Arduinojson 6 (Fixes #1059) #1060

Open
wants to merge 2 commits into
base: hotfixes
from

Conversation

@alfo
Copy link

@alfo alfo commented May 22, 2020

Small direct updates to change the AutoConnectWithFSParameters and AutoConnectWithFSParametersAndCustomIP examples to make them compatible with Arduinojson 6

Fixes #1059

@tablatronix
Copy link
Collaborator

@tablatronix tablatronix commented May 22, 2020

I thought this was already done..

@alfo
Copy link
Author

@alfo alfo commented May 22, 2020

There is an open PR but it doesn't cover both example files (and seems to change a lot of unrelated code too...)

@tablatronix
Copy link
Collaborator

@tablatronix tablatronix commented May 22, 2020

It seems to be fixed in hotfixes, not sure if I ever merged into master.

Either way it needs to be fixed in development branch also, not sure if I will be able to merge them without conflicts , ill check also

Let me look into the branches and see whats up, maybe that pr just missed some, ill try to clean them up today, thanks!

@tablatronix tablatronix added the bug label May 22, 2020
@alfo
Copy link
Author

@alfo alfo commented May 22, 2020

No worries! I left the development branch examples alone because it seems like they're not finalised yet

@tablatronix
Copy link
Collaborator

@tablatronix tablatronix commented May 22, 2020

Yup it looks like I never made a release for the hotfixes changes, shoot.

Sorry about that, ill double check which one is better and merge them, thanks

@tablatronix tablatronix changed the base branch from master to hotfixes May 22, 2020
@tablatronix
Copy link
Collaborator

@tablatronix tablatronix commented May 22, 2020

I changed your target to hotfixes, here is the conflicts with what was already committed, I asked that that one be backward compatible, let me know if something is missing, we can probably just skip your PR, sorry to waste your time. I appreciate it.

https://github.com/tzapu/WiFiManager/pull/1060/conflicts

@alfo
Copy link
Author

@alfo alfo commented May 25, 2020

Yeah, that previous PR looks fine to me. The only thing is whether we use Static or Dynamic JSON documents, and what size they are, but ultimately this is example code so it's up to the end user.

@alfo
Copy link
Author

@alfo alfo commented May 25, 2020

Resolved conflicts and slightly tidied up

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.