Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix buttons' unit tests

pull/121/head
D.R.racer 2021-09-20 15:02:56 +02:00 committed by DRracer
parent c0b776375d
commit f8ac620379
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/modules/buttons/test_buttons.cpp
View File

@ -68,9 +68,12 @@ bool Step_Basic_One_Button(hal::adc::TADCData &&d, uint8_t testedButtonIndex) {
return Step_Basic_One_Button_Test(b, oversampleFactor, testedButtonIndex, otherButton1, otherButton2); return Step_Basic_One_Button_Test(b, oversampleFactor, testedButtonIndex, otherButton1, otherButton2);
} }
constexpr uint16_t M1(uint16_t v) {
return static_cast<uint16_t>(v - 1U);
}
TEST_CASE("buttons::Step-basic-button", "[buttons]") { TEST_CASE("buttons::Step-basic-button", "[buttons]") {
for (uint8_t i = 0; i < config::buttonCount; ++i) { for (uint8_t i = 0; i < config::buttonCount; ++i) {
CHECK(Step_Basic_One_Button({ config::buttonADCLimits[i][0], CHECK(Step_Basic_One_Button({ M1(config::buttonADCLimits[i][0]),
config::buttonADCLimits[i][1], config::buttonADCLimits[i][1],
adcMaxValue }, adcMaxValue },
i)); i));
@ -81,9 +84,9 @@ TEST_CASE("buttons::Step-basic-button", "[buttons]") {
/// and the Buttons class should press first button and release, then the second one and then the third one /// and the Buttons class should press first button and release, then the second one and then the third one
/// without being reinitialized. /// without being reinitialized.
TEST_CASE("buttons::Step-basic-button-one-after-other", "[buttons]") { TEST_CASE("buttons::Step-basic-button-one-after-other", "[buttons]") {
hal::adc::TADCData d({ config::buttonADCLimits[0][0], config::buttonADCLimits[0][0] + 1, adcMaxValue, hal::adc::TADCData d({ M1(config::buttonADCLimits[0][0]), config::buttonADCLimits[0][0] + 1, adcMaxValue,
config::buttonADCLimits[1][0], config::buttonADCLimits[1][0] + 1, adcMaxValue, M1(config::buttonADCLimits[1][0]), config::buttonADCLimits[1][0] + 1, adcMaxValue,
config::buttonADCLimits[2][0], config::buttonADCLimits[2][0] + 1, adcMaxValue }); M1(config::buttonADCLimits[2][0]), config::buttonADCLimits[2][0] + 1, adcMaxValue });
mb::Buttons b; mb::Buttons b;
// need to oversample the data as debouncing takes 100 cycles to accept a pressed button // need to oversample the data as debouncing takes 100 cycles to accept a pressed button