tylen/ESP-Ventilation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch-controller: rename b_state to b_pressed

Browse Source
This commit is contained in:
Vasily Davydov 2022-10-17 15:00:10 +03:00
parent b8780772a1
commit 3104cc7e24
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SwitchController/inc/SwitchController.h
View File

@ -26,7 +26,7 @@ private:
DigitalIoPin *b;
Timer *t;
StateHandler *h;
bool b_state;
bool b_pressed;
int b_mode;
void buttonOnHold ();
void buttonInLoop ();

14
SwitchController/src/SwitchController.cpp
View File

@ -13,7 +13,7 @@ SwitchController::SwitchController (DigitalIoPin *button, Timer *timer,
b = button;
t = timer;
h = handler;
b_state = false;
b_pressed = false;
b_mode = button_mode;
}
@ -27,20 +27,20 @@ SwitchController::listen ()
{
int timer = t->getCounter ();
/** Button is pressed for the first time*/
if (b->read () && !b_state)
if (b->read () && !b_pressed)
{
t->resetCounter ();
b_state = true;
b_pressed = true;
}
/** Button is released before 2 seconds*/
if (!b->read () && b_state && timer < 2000)
if (!b->read () && b_pressed && timer < 2000)
{
h->HandleState (Event (Event::eKey, b_mode));
b_state = false;
b_pressed = false;
t->resetCounter ();
}
/** Button is pressed after 2 seconds*/
if (b->read () && b_state && timer >= 2000)
if (b->read () && b_pressed && timer >= 2000)
{
buttonOnHold ();
}
@ -58,7 +58,7 @@ SwitchController::buttonOnHold ()
{
h->HandleState (Event (Event::eKey, b_mode));
}
b_state = false;
b_pressed = false;
t->resetCounter ();
}