From d814344919b61444d8f53c073506fbac7211d1eb Mon Sep 17 00:00:00 2001 From: IhorNehrutsa Date: Wed, 10 May 2023 20:41:20 +0300 Subject: [PATCH 1/3] Fix funcArgNamesDifferent with cppcheck --- src/OneButton.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OneButton.cpp b/src/OneButton.cpp index 48c946d..7096350 100644 --- a/src/OneButton.cpp +++ b/src/OneButton.cpp @@ -217,9 +217,9 @@ void OneButton::tick(void) } // tick() -void OneButton::tick(bool activeLevel) +void OneButton::tick(bool level) { - _fsm(debounce(activeLevel)); + _fsm(debounce(level)); } From af67dbfe874a78533341c3ab9e8a31a4273ad593 Mon Sep 17 00:00:00 2001 From: IhorNehrutsa Date: Wed, 10 May 2023 21:02:54 +0300 Subject: [PATCH 2/3] Fix cppcheck: Condition 'activeLevel' is always true --- src/OneButton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OneButton.cpp b/src/OneButton.cpp index 7096350..b174630 100644 --- a/src/OneButton.cpp +++ b/src/OneButton.cpp @@ -257,7 +257,7 @@ void OneButton::_fsm(bool activeLevel) _newState(OneButton::OCS_UP); _startTime = now; // remember starting time - } else if ((activeLevel) && (waitTime > _press_ms)) { + } else if (waitTime > _press_ms) { if (_longPressStartFunc) _longPressStartFunc(); if (_paramLongPressStartFunc) _paramLongPressStartFunc(_longPressStartFuncParam); _newState(OneButton::OCS_PRESS); From 2de5bae99a5d6b219ed2f8f2b7fd713e63636a85 Mon Sep 17 00:00:00 2001 From: Ihor Nehrutsa Date: Tue, 18 Jul 2023 10:02:45 +0300 Subject: [PATCH 3/3] Fix funcArgNamesDifferent --- src/OneButton.cpp | 4 ++-- src/OneButton.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OneButton.cpp b/src/OneButton.cpp index 92671cc..4a05fc3 100644 --- a/src/OneButton.cpp +++ b/src/OneButton.cpp @@ -217,9 +217,9 @@ void OneButton::tick(void) } // tick() -void OneButton::tick(bool level) +void OneButton::tick(bool activeLevel) { - _fsm(debounce(level)); + _fsm(debounce(activeLevel)); } diff --git a/src/OneButton.h b/src/OneButton.h index 49f6535..6390ba2 100644 --- a/src/OneButton.h +++ b/src/OneButton.h @@ -137,7 +137,7 @@ class OneButton * level is given by the parameter. * Run the finite state machine (FSM) using the given level. */ - void tick(bool level); + void tick(bool activeLevel); /**