Skip to content

Interrupts: remove C prototype and keep only C++ prototypes #1617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2022
Merged

Interrupts: remove C prototype and keep only C++ prototypes #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions cores/arduino/WInterrupts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@
#define _WIRING_INTERRUPTS_

#include <stdint.h>
#include <functional>

#ifdef __cplusplus
#include <functional>

typedef std::function<void(void)> 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<void(void)> callback_function_t;
void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode);
void detachInterrupt(uint32_t pin);

#endif /* _WIRING_INTERRUPTS_ */
4 changes: 2 additions & 2 deletions cores/arduino/wiring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
#include "wiring_pulse.h"
#include "wiring_shift.h"
#include "wiring_time.h"
#include "WInterrupts.h"

#include <board.h>

#ifdef __cplusplus
#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

Expand Down