Commitea9a82e

ABOSTM

authored and

fpistm

committed

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 ambiguitywhen used with lambda function as callbackFixes#1601Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>

1 parentb192e50 commitea9a82eCopy full SHA for ea9a82e

File tree

2 files changed

-12

lines changed

cores/arduino
- WInterrupts.h
- wiring.h

2 files changed

-12

lines changed

`‎cores/arduino/WInterrupts.h`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,10 @@`
`20`	`20`	`#define_WIRING_INTERRUPTS_`
`21`	`21`
`22`	`22`	`#include<stdint.h>`
	`23`	`+#include<functional>`
`23`	`24`
`24`		`-#ifdef __cplusplus`
`25`		`- #include<functional>`
`26`		`-`
`27`		`-typedef std::function<void(void)>callback_function_t;`
`28`		`-voidattachInterrupt(uint32_t pin,callback_function_t callback,uint32_t mode);`
`29`		`-`
`30`		`-#endif`
`31`		`-`
`32`		`-voidattachInterrupt(uint32_t pin,void (*callback)(void), uint32_t mode);`
`33`		`-`
	`25`	`+typedef std::function<void(void)>callback_function_t;`
	`26`	`+voidattachInterrupt(uint32_t pin,callback_function_t callback,uint32_t mode);`
`34`	`27`	`voiddetachInterrupt(uint32_t pin);`
`35`	`28`
`36`	`29`	`#endif/* _WIRING_INTERRUPTS_*/`

`‎cores/arduino/wiring.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,16 @@`
`36`	`36`	`#include"wiring_pulse.h"`
`37`	`37`	`#include"wiring_shift.h"`
`38`	`38`	`#include"wiring_time.h"`
`39`		`-#include"WInterrupts.h"`
`40`	`39`
`41`	`40`	`#include<board.h>`
`42`	`41`
`43`	`42`	`#ifdef__cplusplus`
`44`	`43`	`#include"HardwareTimer.h"`
`45`	`44`	`#include"Tone.h"`
`46`	`45`	`#include"WCharacter.h"`
`47`		`-#include"WSerial.h"`
	`46`	`+#include"WInterrupts.h"`
`48`	`47`	`#include"WMath.h"`
	`48`	`+#include"WSerial.h"`
`49`	`49`	`#include"WString.h"`
`50`	`50`	`#endif// __cplusplus`
`51`	`51`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitea9a82e

File tree

2 files changed

2 files changed

`‎cores/arduino/WInterrupts.h`

`‎cores/arduino/wiring.h`

0 commit comments