erki/skullc-peripherals
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Peripherals: fix double registration of short and long press in Button class
All checks were successful
continuous-integration/drone/push Build is passing
Details
gitea/skullc-peripherals/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
erki 2022-12-10 16:21:52 +02:00
parent a0639ec3f1
commit 8fbb0efd5d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Peripherals/Inc/peripherals_button.hpp
View File

@ -50,7 +50,7 @@ public:
} }
else if (!is_pressed && was_pressed_) else if (!is_pressed && was_pressed_)
{ {
if (time_held > TIMEOUT_SHORT_PRESS) if (time_held > TIMEOUT_SHORT_PRESS && time_held <= TIMEOUT_LONG_PRESS)
new_state = ButtonPress::SHORT_PRESS; new_state = ButtonPress::SHORT_PRESS;
time_pressed_down_ = 0; time_pressed_down_ = 0;

11
Tests/button.cpp
View File

@ -109,7 +109,6 @@ TEST_CASE("Button reads presses properly.", "[peripherals],[button]")
SECTION("Long press is identified properly.") SECTION("Long press is identified properly.")
{ {
HAL::millis = Button::TIMEOUT_LONG_PRESS + 2; HAL::millis = Button::TIMEOUT_LONG_PRESS + 2;
Gpio::set = false;
button.update(); button.update();
@ -121,6 +120,16 @@ TEST_CASE("Button reads presses properly.", "[peripherals],[button]")
button.update(); button.update();
REQUIRE(button.getState() == Peripherals::ButtonPress::NOT_PRESSED); REQUIRE(button.getState() == Peripherals::ButtonPress::NOT_PRESSED);
SECTION("Releasing keeps NOT_PRESSED state.")
{
HAL::millis += 1;
Gpio::set = false;
button.update();
REQUIRE(button.getState() == Peripherals::ButtonPress::NOT_PRESSED);
}
} }
} }
} }