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

[WiFi] Avoid timeouts when not connected to WiFi #639

Merged
merged 5 commits into from Dec 28, 2017

Conversation

TD-er
Copy link
Member

@TD-er TD-er commented Dec 12, 2017

Based on #629, so that must be merged first.

As discussed in #589
Stil needed to actively disconnect network services when network was disconnected.

As described in letscontrolit#381 letscontrolit#261 and letscontrolit#521
A first attempt to let all controllers use the same logic to connect to external hosts.
As discussed in letscontrolit#589
Stil needed to actively disconnect network services when network was disconnected.
All controllers now stop sending when WiFi disconnected.
Also add NTP update directly after connection was made.

Delay with waiting for unavailable network is now about 30 seconds, then normal boot continues. Every 60 seconds the WiFi will be polled again.
@TD-er
Copy link
Member Author

TD-er commented Dec 13, 2017

@psy0rz :
Ready for review and pull :)

@TD-er TD-er mentioned this pull request Dec 13, 2017
@Grovkillen
Copy link
Member

Hi there, what's the thing with the conflict reported by Travis?

@TD-er
Copy link
Member Author

TD-er commented Dec 14, 2017

I guess it is because I placed it on top of the earlier pull request #629
If that gets merged, the conflicts should be resolved.

@Grovkillen
Copy link
Member

Grovkillen commented Dec 14, 2017 via email

@psy0rz
Copy link
Member

psy0rz commented Dec 18, 2017

at first glance it seems you're trying to merge some changes that also are in #629?

@psy0rz
Copy link
Member

psy0rz commented Dec 18, 2017

yep the getIP() change is also in thie PR. can you untangle it? :)

@psy0rz
Copy link
Member

psy0rz commented Dec 18, 2017

I've just merged the latest v2.0 changes in mega as well, so those two are in sync now. (still have a few more merges todo)

@TD-er
Copy link
Member Author

TD-er commented Dec 18, 2017

@psy0rz Do I still have to "untangle" it? (e.g. merge to my 2.0 branch and create a new pull request)

@psy0rz
Copy link
Member

psy0rz commented Dec 18, 2017

Yeah i dont know what went wrong exactly, but cant merge it like this. I cant tangle it as well, but since you know what you did it might be a lot easier for you. :)

@TD-er
Copy link
Member Author

TD-er commented Dec 18, 2017

OK, will try to either "fix" this pull req. or create a new one.

@TD-er
Copy link
Member Author

TD-er commented Dec 18, 2017

It should be mergable now.

@psy0rz psy0rz added the Type: Bug Considered a bug label Dec 18, 2017
@psy0rz psy0rz added this to the 2.0.0 milestone Dec 18, 2017
@Grovkillen
Copy link
Member

We need to test this asap and close the issue if it is resolved.

@psy0rz
Copy link
Member

psy0rz commented Dec 28, 2017

thanks!

@psy0rz psy0rz merged commit 2b25638 into letscontrolit:v2.0 Dec 28, 2017
@TD-er TD-er deleted the feature/v2.0_WiFi_improvements branch January 10, 2018 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Bug Considered a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants