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

Bugfix/persistentchecks #3798

Merged
merged 10 commits into from
Mar 9, 2018
Merged

Conversation

tablatronix
Copy link
Contributor

initial test #3641

fixes assumtions that persistent matches current configs, and prevents changes when such conditions exist
@devyte
Copy link
Collaborator

devyte commented Feb 27, 2018

@tablatronix will you be making the requested minor changes?

@tablatronix
Copy link
Contributor Author

Requested minor changes?

wifi_softap_get_config(&conf_current);
if(!softap_config_equal(conf, conf_current)) {
struct softap_config conf_compare;
if(WiFi._persistent) wifi_softap_get_config_default(&conf_compare);
Copy link
Collaborator

Choose a reason for hiding this comment

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

fix indentation

if(sta_config_equal(current_conf, conf)) {
struct station_config conf_compare;
if(WiFi._persistent) wifi_station_get_config_default(&conf_compare);
else wifi_station_get_config(&conf_compare);
Copy link
Collaborator

Choose a reason for hiding this comment

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

fix indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean add brackets, or is it using tabs ?

@devyte
Copy link
Collaborator

devyte commented Feb 27, 2018

Those :p just fix indentation, please. I'd like to have this ready to merge.

@tablatronix
Copy link
Contributor Author

woah that just showed up now, weird.

@devyte
Copy link
Collaborator

devyte commented Feb 27, 2018

Thanks!

@devyte devyte merged commit 0643d6e into esp8266:master Mar 9, 2018
bryceschober pushed a commit to bryceschober/Arduino that referenced this pull request Apr 5, 2018
* persistent check fixes

fixes assumtions that persistent matches current configs, and prevents changes when such conditions exist

* oops

* fix code compliance block scoping

(cherry picked from commit 0643d6e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants