From 6056f9cf593d846ebf6005cd9ae441eda2eb9a10 Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Fri, 10 Jun 2016 15:46:40 +0200 Subject: [PATCH 1/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 160151cb..3fd5ffe7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ All contributions (PRs) have to be done towards _develop_ branch. If a feature or bugfix is a major change please contact me to prepare feature specific handling. -__master__: Branch that contains latest production (stable) release. No PRs other than Final Release updates will be merged into __master__. +__master__: Branch that contains latest production (stable) release. No PRs other than firmware releases will be merged into __master__. __develop__: Main development branch: contains latest features and fixes. This will mean that __all contributors__ will have to submit a PR to _develop_ , it will be tested and then merged to __develop__ for automated integration testing (via TravisCI), as well as manual testing on a real device. @@ -17,4 +17,4 @@ __Project Contributing flow__: - Work with other contributors to test your feature and get it merged to _develop_ This is the most common approach for a git-flow: -http://nvie.com/posts/a-successful-git-branching-model/ \ No newline at end of file +http://nvie.com/posts/a-successful-git-branching-model/ From 120855ae7487fd1ee22e1afd09f87dd1e1725914 Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Fri, 10 Jun 2016 15:46:58 +0200 Subject: [PATCH 2/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3fd5ffe7..5dce9b07 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ All contributions (PRs) have to be done towards _develop_ branch. If a feature or bugfix is a major change please contact me to prepare feature specific handling. -__master__: Branch that contains latest production (stable) release. No PRs other than firmware releases will be merged into __master__. +__master__: Branch that contains latest production (stable) release. No PRs other than firmware releases will be merged into __master__. __develop__: Main development branch: contains latest features and fixes. This will mean that __all contributors__ will have to submit a PR to _develop_ , it will be tested and then merged to __develop__ for automated integration testing (via TravisCI), as well as manual testing on a real device. From f123fdf9e95447ece1dbb2c09182713f908b44f2 Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Wed, 29 Jun 2016 19:29:34 +0200 Subject: [PATCH 3/5] v 0.3.1 --- CHANGELOG | 9 ++++++++- VERSION | 2 +- include/RGBWWCtrl.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 39bce6bf..6b285439 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,13 @@ ## Changelog -0.3.0 (10.05.2015) +0.3.1 (29.06.2016) + * fix error when using `/system` endpoint + * fix reconnection issues when AP is not reachable (i.e. after powerloss) + * include latest RGBWWLed Library (0.8.1) + * fix `/color` with `cmd:solid` + * added `from` to `/color` RAW/HSV - fade from a specified color to the desired color + +0.3.0 (10.05.2016) * improved OTA method * fix `/ping` endpoint * fix some issues with saving api security state diff --git a/VERSION b/VERSION index 0d91a54c..9e11b32f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0 +0.3.1 diff --git a/include/RGBWWCtrl.h b/include/RGBWWCtrl.h index 43cc5db4..f4bd3a96 100644 --- a/include/RGBWWCtrl.h +++ b/include/RGBWWCtrl.h @@ -49,7 +49,7 @@ #define RGBWW_USE_ESP_HWPWM // Debugging -#define DEBUG_APP 1 +#define DEBUG_APP 0 //includes #include From 534b360337076235aec51176b3b82475b4daed15 Mon Sep 17 00:00:00 2001 From: ShuzzDE Date: Wed, 25 Jan 2017 23:41:29 +0100 Subject: [PATCH 4/5] + RAW Mode now accepts -1 as valid value for a color channel. --- app/webserver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/webserver.cpp b/app/webserver.cpp index b77900d6..98f9eb65 100644 --- a/app/webserver.cpp +++ b/app/webserver.cpp @@ -763,11 +763,11 @@ void ApplicationWebserver::onColor(HttpRequest &request, HttpResponse &response) String cmd = "solid"; bool q = false; - r = constrain(root["raw"]["r"].as(), 0, 1023); - g = constrain(root["raw"]["g"].as(), 0, 1023); - b = constrain(root["raw"]["b"].as(), 0, 1023); - ww = constrain(root["raw"]["ww"].as(), 0, 1023); - cw = constrain(root["raw"]["cw"].as(), 0, 1023); + r = constrain(root["raw"]["r"].as(), -1, 1023); + g = constrain(root["raw"]["g"].as(), -1, 1023); + b = constrain(root["raw"]["b"].as(), -1, 1023); + ww = constrain(root["raw"]["ww"].as(), -1, 1023); + cw = constrain(root["raw"]["cw"].as(), -1, 1023); if (root["cmd"].success()) { cmd = root["cmd"].asString(); } From 6ad0eef1fb68e8026a60dbe05d0895cde559e549 Mon Sep 17 00:00:00 2001 From: ShuzzDE Date: Thu, 26 Jan 2017 10:59:41 +0100 Subject: [PATCH 5/5] raw fade with "from" now also allows for -1 as value. --- app/webserver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/webserver.cpp b/app/webserver.cpp index 98f9eb65..5fb59f77 100644 --- a/app/webserver.cpp +++ b/app/webserver.cpp @@ -804,11 +804,11 @@ void ApplicationWebserver::onColor(HttpRequest &request, HttpResponse &response) } int from_r, from_g, from_b, from_ww, from_cw = 0; ChannelOutput from_output; - from_r = constrain(root["raw"]["r"].as(), 0, 1023); - from_g = constrain(root["raw"]["g"].as(), 0, 1023); - from_b = constrain(root["raw"]["b"].as(), 0, 1023); - from_ww = constrain(root["raw"]["ww"].as(), 0, 1023); - from_cw = constrain(root["raw"]["cw"].as(), 0, 1023); + from_r = constrain(root["raw"]["r"].as(), -1, 1023); + from_g = constrain(root["raw"]["g"].as(), -1, 1023); + from_b = constrain(root["raw"]["b"].as(), -1, 1023); + from_ww = constrain(root["raw"]["ww"].as(), -1, 1023); + from_cw = constrain(root["raw"]["cw"].as(), -1, 1023); from_output = ChannelOutput(from_r, from_g, from_b, from_ww, from_cw); debugapp("ApplicationWebserver::onColor raw CMD:%s Q:%d FROM r:%i g:%i b:%i ww:%i cw:%i TO r:%i g:%i b:%i ww:%i cw:%i",