From c78cb1b4dd10354bbc51bf652149f4fa365e7966 Mon Sep 17 00:00:00 2001 From: Alexandre Bourdiol Date: Thu, 6 Jan 2022 17:38:59 +0100 Subject: [PATCH] Interrupts: remove C prototype and keep only C++ prototypes attachInterrupt() C prototypes was not usable from C source file (inheritance of former pure C implementation), and causes ambiguity when used with lambda function as callback Fixes #1601 Signed-off-by: Alexandre Bourdiol --- cores/arduino/WInterrupts.h | 13 +++---------- cores/arduino/wiring.h | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cores/arduino/WInterrupts.h b/cores/arduino/WInterrupts.h index 04cecc602a..f31f8f7062 100644 --- a/cores/arduino/WInterrupts.h +++ b/cores/arduino/WInterrupts.h @@ -20,17 +20,10 @@ #define _WIRING_INTERRUPTS_ #include +#include -#ifdef __cplusplus - #include - - typedef std::function callback_function_t; - void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode); - -#endif - -void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode); - +typedef std::function callback_function_t; +void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode); void detachInterrupt(uint32_t pin); #endif /* _WIRING_INTERRUPTS_ */ diff --git a/cores/arduino/wiring.h b/cores/arduino/wiring.h index 1c78088827..37dd658492 100644 --- a/cores/arduino/wiring.h +++ b/cores/arduino/wiring.h @@ -36,7 +36,6 @@ #include "wiring_pulse.h" #include "wiring_shift.h" #include "wiring_time.h" -#include "WInterrupts.h" #include @@ -44,8 +43,9 @@ #include "HardwareTimer.h" #include "Tone.h" #include "WCharacter.h" - #include "WSerial.h" + #include "WInterrupts.h" #include "WMath.h" + #include "WSerial.h" #include "WString.h" #endif // __cplusplus pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy