Electronics/Stairs
Electronics/Stairs
1
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Merge tag '1.1' into develop

Browse Source 
Release 1.1
This commit is contained in:
Mark van Renswoude 2017-10-05 17:09:04 +02:00
commit 47dae8c014
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -1,3 +0,0 @@
1. Add an "ease" option to the static mode
other mode to static: from 0
static to static: depends on current brightness

1
src/main.cpp
View File

@ -59,6 +59,7 @@ void setup()
stairs->init(pwmDriver); stairs->init(pwmDriver);
_dln("Initializing WiFi"); _dln("Initializing WiFi");
WiFi.mode(WIFI_STA);
WiFi.hostname(WiFiHostname); WiFi.hostname(WiFiHostname);
WiFi.begin(WiFiSSID, WiFiPassword); WiFi.begin(WiFiSSID, WiFiPassword);

9
src/modes/static.cpp
View File

@ -35,11 +35,14 @@ void StaticMode::tick(IStairs* stairs, uint32_t currentTime)
if (this->easeState == None) if (this->easeState == None)
return; return;
this->currentBrightness = (currentTime - this->easeStartTime) * ((this->parameters.brightness - this->easeStartBrightness) / this->parameters.easeTime); uint32_t elapsedTime = currentTime - this->easeStartTime;
uint32_t diff = this->easeState == Up ? this->parameters.brightness - this->easeStartBrightness : this->easeStartBrightness - this->parameters.brightness;
uint32_t delta = (diff * elapsedTime) / this->parameters.easeTime;
this->currentBrightness = this->easeState == Up ? this->easeStartBrightness + delta : this->easeStartBrightness - delta;
if ((this->easeState == Up && this->currentBrightness >= this->parameters.brightness) || if (elapsedTime >= this->parameters.easeTime)
(this->easeState == Down && this->currentBrightness <= this->parameters.brightness))
{ {
this->currentBrightness = this->parameters.brightness; this->currentBrightness = this->parameters.brightness;
this->easeState = None; this->easeState = None;