1515 * #include "EasyButtonAtInt01.hpp"
1616 * EasyButton Button0AtPin2(true);
1717 *
18- * Copyright (C) 2018-2022 Armin Joachimsmeyer
18+ * Copyright (C) 2018-2024 Armin Joachimsmeyer
1919 2020 *
2121 * This file is part of EasyButtonAtInt01 https://github.com/ArminJo/EasyButtonAtInt01.
@@ -222,6 +222,12 @@ void EasyButton::init(bool aIsButtonAtINT0) {
222222 sPointerToButton0ForISR = this ;
223223# if defined(USE_ATTACH_INTERRUPT)
224224 attachInterrupt (digitalPinToInterrupt (INT0_PIN), &handleINT0Interrupt, CHANGE);
225+
226+ # elif defined(USE_INT2_FOR_BUTTON_0)
227+ EICRA |= _BV (ISC20); // interrupt on any logical change
228+ EIFR |= _BV (INTF2);// clear interrupt bit
229+ EIMSK |= _BV (INT2);// enable interrupt on next change
230+
225231# else
226232 EICRA |= _BV (ISC00); // interrupt on any logical change
227233 EIFR |= _BV (INTF0);// clear interrupt bit
@@ -340,7 +346,9 @@ void EasyButton::init(bool aIsButtonAtINT0) {
340346}
341347
342348/*
343- * Negative logic for readButtonState() true means button pin is LOW, if button is active low (default)
349+ * if NOT defined BUTTON_IS_ACTIVE_HIGH we have negative logic for readButtonState()!
350+ * In this case BUTTON_IS_ACTIVE (true) means button pin is LOW
351+ * @return BUTTON_IS_ACTIVE (true) or BUTTON_IS_INACTIVE (false)
344352 */
345353bool EasyButton::readButtonState () {
346354#if defined(USE_BUTTON_0) && not defined(USE_BUTTON_1)
@@ -384,11 +392,14 @@ bool EasyButton::getButtonStateIsActive() {
384392}
385393/*
386394 * Returns stored state if in debouncing period otherwise current state of button
395+ * If button is in bouncing period, we do not know button state, so it is only save to return BUTTON_IS_INACTIVE
396+ * @return BUTTON_IS_ACTIVE (true) or BUTTON_IS_INACTIVE (false)
387397 */
388398bool EasyButton::readDebouncedButtonState () {
389- // Check for bouncing period
399+ // Check if we are in bouncing period
390400 if (millis () - ButtonLastChangeMillis <= BUTTON_DEBOUNCING_MILLIS) {
391- return ButtonStateIsActive;
401+ // If button is in bouncing period, we do not know button state, so it is only save to return BUTTON_IS_INACTIVE
402+ return BUTTON_IS_INACTIVE;
392403 }
393404 return readButtonState ();
394405}
@@ -445,14 +456,15 @@ uint16_t EasyButton::updateButtonPressDuration() {
445456 */
446457uint8_t EasyButton::checkForLongPress (uint16_t aLongPressThresholdMillis) {
447458 uint8_t tRetvale = EASY_BUTTON_LONG_PRESS_ABORT;
448- if (readDebouncedButtonState ()) {
459+ // noInterrupts() is required, since otherwise we may get wrong results if interrupted during processing by button ISR
460+ noInterrupts ();
461+ if (readDebouncedButtonState () != BUTTON_IS_INACTIVE) {
449462 // Button still active -> update current ButtonPressDurationMillis
450- // noInterrupts() is required, since otherwise we may get wrong results if interrupted during load of long value by button ISR
451- noInterrupts ();
463+
452464 ButtonPressDurationMillis = millis () - ButtonLastChangeMillis;
453- interrupts ();
454465 tRetvale = EASY_BUTTON_LONG_PRESS_STILL_POSSIBLE; // if not detected, you may try again
455466 }
467+ interrupts ();
456468 if (ButtonPressDurationMillis >= aLongPressThresholdMillis) {
457469 // long press detected
458470 return EASY_BUTTON_LONG_PRESS_DETECTED;
@@ -716,8 +728,8 @@ void __attribute__ ((weak)) handleINT1Interrupt() {
716728// ISR for PIN PD2
717729// Cannot make the vector itself weak, since the vector table is already filled by weak vectors resulting in ignoring my weak one:-(
718730// ISR(INT0_vect, __attribute__ ((weak))) {
719- # if defined(USE_BUTTON_0 )
720- ISR (INT0_vect ) {
731+ # if defined(USE_INT2_FOR_BUTTON_0 )
732+ ISR (INT2_vect ) {
721733# if defined(MEASURE_EASY_BUTTON_INTERRUPT_TIMING)
722734 digitalWriteFast (INTERRUPT_TIMING_OUTPUT_PIN, HIGH);
723735# endif
@@ -726,6 +738,18 @@ ISR(INT0_vect) {
726738 digitalWriteFast (INTERRUPT_TIMING_OUTPUT_PIN, LOW);
727739# endif
728740}
741+ # else
742+ # if defined(USE_BUTTON_0)
743+ ISR (INT0_vect) {
744+ # if defined(MEASURE_EASY_BUTTON_INTERRUPT_TIMING)
745+ digitalWriteFast (INTERRUPT_TIMING_OUTPUT_PIN, HIGH);
746+ # endif
747+ handleINT0Interrupt ();
748+ # if defined(MEASURE_EASY_BUTTON_INTERRUPT_TIMING)
749+ digitalWriteFast (INTERRUPT_TIMING_OUTPUT_PIN, LOW);
750+ # endif
751+ }
752+ # endif
729753# endif
730754
731755# if defined(USE_BUTTON_1)
0 commit comments