More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot #432

timpur · 2017-11-20T00:43:40Z

Main changes are:

Small fix to String issue on config mode for older SDK versions (Unable to compile (Wifi plug firmware) #429)
Major Refactoring
Deep Sleep Function
Prevent WiFi Reconnect when reboot

…boots to use

timpur · 2017-11-20T01:02:51Z

not sure if this is correct... its showing its going to pull previous commits that have already been merged?

#380]

luebbe · 2017-11-27T09:45:13Z

src/Homie.cpp

@@ -19,6 +19,7 @@ HomieClass::HomieClass()
  Interface::get().reset.triggerTime = DEFAULT_RESET_TIME;
  Interface::get().reset.resetFlag = false;
  Interface::get().flaggedForSleep = false;
+  Interface::get().flaggedForSleep = false;


Any particular reason to do this twice?

It was a copy error. Fixed in the typo commit. Soz

Just kidding, thx :)

timpur · 2017-11-29T10:46:22Z

@marvinroger Ready for review. Want to push this through before working on more enhancements.
Going to also rebase my fork after this pull request.

Whats Next:

Add incremental config updates via config mode (Web UI and API) (Feature Request +Config Mode can also edit current config #433).
Add ability to remove settings via incremental updates.
Fix incremental update trying to add settings when previously no settings object exists.
Better event buss handler for internal events and external. Hopefully this will make long async possesses that occur in homie more readable, like the prep for deep sleep procedure.
Better Task Manger for single shot async tasks + ongoing loop async tasks that occur throughout homie. Might also expose this for external use for the user to register tasks and loops. It will be something like the TickerScheduler but custom to fit homie's needs.
More refactoring.
Possibly Upload Firmware via config mode (Web UI and API).

marvinroger · 2017-11-30T14:16:26Z

@timpur thanks a lot! Can you please do a tiny commit to trigger a CircleCI build? I just reenabled it for PR. 😃

Update Fork

…o develop

timpur · 2017-11-30T21:44:22Z

@marvinroger dont know what to do about the other checks ? Think these need fixing. Also not sure about lint....

marvinroger · 2017-11-30T22:27:09Z

I fixed the generate_docs step (I guess, it can only be tested on forks).

The linter is not happy because you do blocks that way:

if (1 + 1 == 2) {
}
else {
}

Whereas the Google style is:

if (1 + 1 == 2) {
} else {
}

Also, even though it might seem weird, we should not indent what's immediately inside a namespace "block". But don't worry, I'll take care of formatting the code. 👍

Thanks!

timpur · 2017-11-30T22:38:37Z

@marvinroger no i also want to get the code style correct so we need to fix this in the .editorconfig so auto format follows these styles. I'll look into the google style c++.

Looks like .editorconfig might not do what we want. Thus ill look into other solutions.

marvinroger · 2017-11-30T23:01:19Z

@timpur editorconfig indeed only defines line endings, tabs/spaces, not much more. I am not sure there's a tool for that.

Just check out the changes I made: e41bb9c...93a00e9

timpur · 2017-11-30T23:15:01Z

@marvinroger looks good. What are you then using for auto formatting?

Also might want to update the latest release, since this also fixes a String issue with previous Arduino esp SDK

marvinroger · 2017-11-30T23:26:54Z

I don’t use any tools, I code that way. But that’d be an interesting addition. Clang might be suitable. Le ven. 1 déc. 2017 à 00:15, timpur <notifications@github.com> a écrit :

…

@marvinroger <https://github.com/marvinroger> looks good. What are you then using for auto formatting? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#432 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA8eNcYHClZbaB84-cbRXuhLbgzdqxFAks5s7zb2gaJpZM4QjndU> .

timpur · 2017-12-03T05:12:39Z

@marvinroger do you want to release beta 3 since this fixes an issue with beta 2.

#429

bertmelis · 2017-12-03T06:30:29Z

FYI, in VSCode and Atom you've got a cpplint extension. Eclipse also has one.

tripflex · 2018-01-19T23:58:28Z

@bertmelis yeah that's what I use, VSCode with PlatformIO 😛

…omieiot#432) * Initial AsyncWebServer * Fixed Proccessing Body Requests (JSON) * Doc Fixes + typo * Added Missing Method in Timer.cpp * Lots of Refactoring + Moved Reset Button to its own helper class for boots to use * Lots of Refactoring. * Refactored ResetHandler + More Refactoring + Testing * Added deep sleep function + Prevent Wifi reconnect before reboot (homieiot#380)[homieiot#380] * Small typo fixes * Small Rearange of code in BootConfig + Minor Refactor of function names * Minior Commit to Triger a Github Action * circleci build fix

* 🔥 Remove hardcoded keepalive - fix homieiot#301 (homieiot#314) Remove hardcoded KeepAlive for MQTT connection. Default value of 15sec is already present in AsyncMQTT library * 🐎 Improve uptime accuracy (homieiot#315) improve uptime accuracy by storing milliseconds and only rounding when publishing value drawback: less time before rollover, but still long enough * 🐛 Fix truncated IP (homieiot#318) published IP is truncated. * 🎨 Fix warning with parenthesis * 🐛 Fix pio library.json bad dependency name * ✨ Add support for static IP and BSSID/MAC, channel of AP (homieiot#327) * Support for static IP and BSSID/MAC, Channel of AP - added parameters to config.json which allow to define static ip, mask, gateway, dns - added parameters to config.json which allow to define BSSID and channel of AP To run device with defined static IP you have to define ip, mask and gateway together. To point device to connect to specific BSSID and channel you haveto define bssid and channel together. ``` { "name": "The kitchen light", "device_id": "kitchen-light", "wifi": { "ssid": "Network_1", "password": "I'm a Wi-Fi password!", "bssid": "DE:AD:BE:EF:BA:BE", "channel": 1, "ip": "192.168.1.5", "mask": "255.255.255.0", "gw": "192.168.1.1" }, "mqtt": { "host": "192.168.1.10", "port": 1883, "base_topic": "devices/", "auth": true, "username": "user", "password": "pass" i }, "ota": { "enabled": true }, "settings": { "param1": 55, "param2": "abcdefghijklm", "param3": true, "param4": false, "param5": 2147483647, "param6": -2147483647, "param7": 55, "param8": "abcdefghijklm", "param9": true, "param10": false } } ``` * Addjustments for travis * Another addjustments for travis * Fix problem with prepareToSleep * 🐎 Pass all callbacks by reference Still store it by value * 🐎 Make isActive const * 🎨 Add custom settings value to initial log * ✨ Abort if default setting value does not pass validator function Fix homieiot#324 * 📝 Clarify ISSUE_TEMPLATE docs location for homieiot#331 * 📝 Implement new versioned Git docs (homieiot#341) * ✨ Add versionned in-repo docs * 🐛 Attempt to fix encrypted key * 🐛 Fix permission issue on python exec * 🐛 Add mission import * 🐛 Fix relative path * 🐛 Add missing commit * ✨ Add index * 🎨 Change index design * 📝 Update all URLs to new docs * 🎨 Fix broken doc link in README * 📝 Add edit link to docs * 📝 Move firmware_parser.py to scripts folder * 🐛 Fix out of limits abort message not showing * 👕 Be less strict on whitespace in comments * 📝 Add dummy OTA updater script (TODO) * 🎨 🐎 Use CircleCi instead of Travis CI (homieiot#348) * ✨ Add Circle CI build * 🐛 Add working_directory * 🐛 Attempt to fix perm issue * ✨ Generate docs from CircleCI * 🐛 Fix path * 🐛 Fix chmod permission * 🐛 Try to run sudo * 🐛 Attempt to use remote docker * 🐛 Change bad directories * 🐛 Remove dependency on Docker * 🐛 Fix perm problem * 🐛 Chamge tmp folder * 🐎 Use CircleCI instead of Travis CI * 🎨 Add SonoffDualShutters example * 🐛 Install current lib to platformio * 🐛 Actually ignore gh-pages in CI * 🐛 Add missing SonoffDual dep * 🐛 Fix ArduinoJSON 5.11.0 (homieiot#363) * ⬆️ Update pio dependencies * 🎨 Cleanup code a bit * 🐛 Make sure every announcements packet are sent - closes homieiot#345 * 🎨 Refactor code and implement new OTA system Closes homieiot#346 * 👕 Fix lint * ✅ Use new workflow feature from Circle * ✅ Ignore gh-pages at workflow level * ✨ Add OTA_PROGRESS event * 📝 Update docs for new OTA system * ⬆️ Upgrade AsyncMqttClient dependency to 0.8.0 * 🐛 IHomieSetting::settings first, HomieNode-settings second! (homieiot#335) * IHomieSetting::settings first, HomieNode-settings second! Set initialization priority of IHomieSetting::settings to value of highest allowed priority (101). This allows other static variables to be of type HomieSetting<T>. See https://github.com/euphi/HomieNodeCollection/blob/master/src/RGBWNode.cpp for example. Note: As shown in the example it makes sense to have a static HomieSetting member, if you have a class that may be instantiated multiple times. (e.g. two LED Strips connected to the same ESP8266, as shown in https://github.com/euphi/ESP-LEDCtrl). * Removed extra whitespaces * Removed another whitespace * 🐛 Fix not returning a value in setConfigurationApPassword (homieiot#378) `HomieClass& HomieClass::setConfigurationApPassword(const char* password)` did not returned a reference to the Homie instance. This PR fixes this. * 🐛 Fix crash when starting up without any defined node (homieiot#379) * Fix crash when starting up without any defined node Skip node publication if HomieNode::nodes.size() == 0 * Update BootNormal.cpp * 🐛 Fix topic check for OTA upload (homieiot#375) * Change topic check for OTA upload * Change firmware topics to remove the 's' * 🐛 Rename last OTA topic instance * ✨ Add OTA updater script (homieiot#384) * 🐍Add python ota updater script * 💼 Update documentation of ota update script * 😑 Add comments to ota updater script * 🔮 Use 127.0.0.1:1883 as default broker setting For the ota updater script * 📝 Add details on how to interact with range property (homieiot#393) Add hint to help people figure out how to interact with range properties. Especially document the `_` separator. * 📝 Add warning to input-handlers.md about concurrency (homieiot#400) * 🐛 Interpret firmware file as an bytearray (homieiot#403) Fix homieiot#397 * 📝 Update input-handlers.md (homieiot#401) * Update input-handlers.md Sorry, it seems that I used the `!!! warning` block in a wrong way. * Update input-handlers.md * Update input-handlers.md * ✨ Use AsyncWebServer + Refactoring (homieiot#425) * Initial AsyncWebServer * Fixed Proccessing Body Requests (JSON) * Doc Fixes + typo * Added Missing Method in Timer.cpp * Lots of Refactoring + Moved Reset Button to its own helper class for boots to use * 🎨 Update BootNormal.cpp (homieiot#426) Solve "else" errors from https://circleci.com/gh/marvinroger/homie-esp8266/136#tests/containers/0 * ⬆️ Update dependency to "ESP Async WebServer" (homieiot#434) * 📝 Add instruction for @platformio (homieiot#435) * Instruction for @platformio * Explain how to used tagged version with @platformio * Explain how to use tagged version with @platformio * 🐛 Use v2.0.0-beta.2 as a working tagged example for @platformio (homieiot#437) * 🎨 Simplify CI with @platformio (homieiot#438) * 🐛 Install library via @platformio with all dependencies (homieiot#439) * 💚 CI: Install staging version of Arduino Core for ESP8266 & @platformio (homieiot#440) * 🐛 Pin Shutters dep version * 🔥 Don't fail on CI docs step when testing a fork * 🎨 More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot (homieiot#432) * Initial AsyncWebServer * Fixed Proccessing Body Requests (JSON) * Doc Fixes + typo * Added Missing Method in Timer.cpp * Lots of Refactoring + Moved Reset Button to its own helper class for boots to use * Lots of Refactoring. * Refactored ResetHandler + More Refactoring + Testing * Added deep sleep function + Prevent Wifi reconnect before reboot (homieiot#380)[homieiot#380] * Small typo fixes * Small Rearange of code in BootConfig + Minor Refactor of function names * Minior Commit to Triger a Github Action * circleci build fix * 🎨 First pass to fix linting * 🎨 Second pass of lint * 🎨 Final lint fix * 📝 Update docs deps * 📝 🎨 Update docs manifest * 📝 🎨 Adjust HTTP JSON API doc * 📝 Add configurators on website * 📝 Update links to configurator * Fix links under Features (homieiot#452) * Set Device Stats Interval (homieiot#451) (homieiot#455) * Add last step to uibundle README (homieiot#460) * Add last step to uibundle README * Added Arduino Support for doc * Update updater script addressing quirks (homieiot#461) * Update API for /wifi/connect from GET to PUT (homieiot#468) Docs show `/wifi/connect` as `GET` when it should actually be `PUT` * Proposal to optionally run HomieNode::loop() also in disconnected state * Show Homie version * Fix homieiot#446 homieiot#477 (homieiot#501) * Fix homieiot#446 CORS Issue * Fix for homieiot#477 * Fix Lint * Fix Safari not displaying the config bundle HTML page (Fix homieiot#476) (homieiot#502) * Fix Safari not displaying the config bundle HTML page Safari cannot deal with gzip files that have a "*.gz" file extension. Simply faking the filename solves the problem though. * Update Readme Homie Version * Fix Warnings (homieiot#503) * Update Readme - Homie Convention * Update to Homie Convention v2.0.1 (homieiot#507)

timpur added 6 commits November 13, 2017 14:42

Initial AsyncWebServer

4f2400b

Fixed Proccessing Body Requests (JSON)

1370881

Doc Fixes + typo

3e2fa98

Added Missing Method in Timer.cpp

084e683

Lots of Refactoring + Moved Reset Button to its own helper class for …

26a2172

…boots to use

Lots of Refactoring.

eec285d

timpur closed this Nov 20, 2017

merge upstreem

e9aa018

timpur reopened this Nov 20, 2017

timpur closed this Nov 20, 2017

timpur reopened this Nov 20, 2017

timpur and others added 3 commits November 20, 2017 22:49

Refactored ResetHandler + More Refactoring + Testing

37976d3

Added deep sleep function + Prevent Wifi reconnect before reboot (#380)[

9bb0f76

#380]

Small typo fixes

c0879ce

luebbe reviewed Nov 27, 2017

View reviewed changes

timpur changed the title ~~More Refactoring - not yet ready~~ More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot Nov 29, 2017

Small Rearange of code in BootConfig + Minor Refactor of function names

6694331

timpur mentioned this pull request Nov 29, 2017

Feature Request +Config Mode can also edit current config #433

Open

timpur mentioned this pull request Nov 30, 2017

Unable to compile (Wifi plug firmware) #429

Closed

timpur added 4 commits December 1, 2017 08:24

Minior Commit to Triger a Github Action

a3519dd

Merge pull request #2 from marvinroger/develop

c423018

Update Fork

circleci build fix

6dec98b

Merge branch 'develop' of https://github.com/timpur/homie-esp8266 int…

5f0ab1c

…o develop

marvinroger merged commit e41bb9c into homieiot:develop Nov 30, 2017

timpur mentioned this pull request Dec 10, 2017

Prevent Wifi reconnect before reboot #380

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot #432

More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot #432

timpur commented Nov 20, 2017 •

edited

timpur commented Nov 20, 2017

luebbe Nov 27, 2017

timpur Nov 27, 2017 •

edited

luebbe Nov 27, 2017

timpur commented Nov 29, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017 •

edited

marvinroger commented Nov 30, 2017 via email

timpur commented Dec 3, 2017 •

edited

bertmelis commented Dec 3, 2017 •

edited

tripflex commented Jan 19, 2018

More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot #432

More Refactoring + Deep Sleep + Prevent WiFi Reconnect when reboot #432

Conversation

timpur commented Nov 20, 2017 • edited

timpur commented Nov 20, 2017

luebbe Nov 27, 2017

Choose a reason for hiding this comment

timpur Nov 27, 2017 • edited

Choose a reason for hiding this comment

luebbe Nov 27, 2017

Choose a reason for hiding this comment

timpur commented Nov 29, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017

marvinroger commented Nov 30, 2017

timpur commented Nov 30, 2017 • edited

marvinroger commented Nov 30, 2017 via email

timpur commented Dec 3, 2017 • edited

bertmelis commented Dec 3, 2017 • edited

tripflex commented Jan 19, 2018

timpur commented Nov 20, 2017 •

edited

timpur Nov 27, 2017 •

edited

timpur commented Nov 30, 2017 •

edited

timpur commented Dec 3, 2017 •

edited

bertmelis commented Dec 3, 2017 •

edited