Skip to content

Place FunctionalInterrupt into IRAM #5780

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

Closed
wants to merge 4 commits into from
Closed

Place FunctionalInterrupt into IRAM #5780

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56608ec
Place FunctionalInterrupt into IRAM
OttoWinter Feb 18, 2019
f0b472c
Update FunctionalInterrupt.cpp
OttoWinter Feb 19, 2019
e0a6200
Merge branch 'master' into patch-1
OttoWinter Feb 19, 2019
b415b92
Merge branch 'master' into patch-1
earlephilhower Feb 27, 2019
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
8 changes: 4 additions & 4 deletions cores/esp8266/FunctionalInterrupt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ typedef void (*voidFuncPtrArg)(void*);
extern "C" void ICACHE_RAM_ATTR __attachInterruptArg(uint8_t pin, voidFuncPtr userFunc, void*fp , int mode);


void interruptFunctional(void* arg)
void ICACHE_RAM_ATTR interruptFunctional(void* arg)
{
ArgStructure* localArg = (ArgStructure*)arg;
if (localArg->functionInfo->reqScheduledFunction)
Expand All @@ -27,7 +27,7 @@ void interruptFunctional(void* arg)

extern "C"
{
void cleanupFunctional(void* arg)
void ICACHE_RAM_ATTR cleanupFunctional(void* arg)
{
ArgStructure* localArg = (ArgStructure*)arg;
delete (FunctionInfo*)localArg->functionInfo;
Expand All @@ -36,7 +36,7 @@ extern "C"
}
}

void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
void ICACHE_RAM_ATTR attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
{
// use the local interrupt routine which takes the ArgStructure as argument

Expand All @@ -52,7 +52,7 @@ void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode
__attachInterruptArg (pin, (voidFuncPtr)interruptFunctional, as, mode);
}

void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
void ICACHE_RAM_ATTR attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
{
if (!scheduledInterrupts)
{
Expand Down