Skip to content

Commit 654efb7

Browse files
committed
1 parent efb0341 commit 654efb7

File tree

4 files changed

+115
-204
lines changed

4 files changed

+115
-204
lines changed

Diff for: cores/esp8266/Arduino.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
182182
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
183183
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
184184

185-
void attachInterrupt(uint8_t pin, void (*)(void), int mode);
185+
void attachInterrupt(uint8_t pin, void (*)(), int mode);
186+
void attachInterruptParam(uint8_t pin, void (*)(void*), int mode, void* param);
186187
void detachInterrupt(uint8_t pin);
187-
void attachInterruptArg(uint8_t pin, void (*)(void*), void* arg, int mode);
188188

189189
void preinit(void);
190190
void setup(void);
@@ -223,6 +223,7 @@ void optimistic_yield(uint32_t interval_us);
223223
#ifdef __cplusplus
224224

225225
#include <algorithm>
226+
#include <functional>
226227
#include <cstdlib>
227228
#include <cmath>
228229

@@ -264,6 +265,9 @@ long secureRandom(long);
264265
long secureRandom(long, long);
265266
long map(long, long, long, long, long);
266267

268+
// Functional interrupt handler
269+
void attachInterrupt(uint8_t pin, std::function<void()>, int mode);
270+
267271
void setTZ(const char* tz);
268272

269273
void configTime(int timezone, int daylightOffset_sec, const char* server1,

Diff for: cores/esp8266/FunctionalInterrupt.cpp

-65
This file was deleted.

Diff for: cores/esp8266/FunctionalInterrupt.h

-35
This file was deleted.

0 commit comments

Comments
 (0)