8000 Bugfix: attach interrupt (#6049) by dok-net · Pull Request #6048 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Bugfix: attach interrupt (#6049) #6048

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 7 commits into from
Jul 4, 2019
Merged

Bugfix: attach interrupt (#6049) #6048

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b9ffea
Properly check for "functional" ISRs and expose C-style attachInterru…
dok-net Jun 17, 2019
422cdeb
Indentation
dok-net Jun 26, 2019
e0e8159
Use RAII idiom
dok-net Jun 25, 2019
c3d359c
Easier reviewability
dok-net Jun 26, 2019
3ad3163
Refactored after review input.
dok-net Jul 3, 2019
498356d
Finish up insights from review comments.
dok-net Jul 3, 2019
3336dd6
Merge branch 'master' into bugfix/attachInterrupt
devyte Jul 4, 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
Prev Previous commit
Next Next commit
Use RAII idiom 
(cherry picked from commit 15c0b5b356aad0c3032b96ed6db0ec70cbf719d3)

# Conflicts:
#	cores/esp8266/core_esp8266_wiring_digital.cpp
  • Loading branch information
@dok-net
dok-net committed Jun 27, 2019
commit e0e81593011d17d58f9d5e95dc2c38b8d5b5d4aa
4 changes: 2 additions & 2 deletions cores/esp8266/core_esp8266_wiring_digital.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "ets_sys.h"
#include "user_interface.h"
#include "core_esp8266_waveform.h"
#include "interrupts.h"

extern "C" {

Expand Down Expand Up @@ -147,7 +148,7 @@ void ICACHE_RAM_ATTR interrupt_handler(void*)
(handler->mode & 1) == !!(levels & (1 << i)))) {
// to make ISR compatible to Arduino AVR model where interrupts are disabled
// we disable them before we call the client ISR
uint32_t savedPS = xt_rsil(15); // stop other interrupts
esp8266::InterruptLock irqLock; // stop other interrupts
if (handler->functional)
{
ArgStructure* localArg = (ArgStructure*)handler->arg;
Expand All @@ -166,7 +167,6 @@ void ICACHE_RAM_ATTR interrupt_handler(void*)
{
handler->fn();
}
xt_wsr_ps(savedPS);
}
}
ETS_GPIO_INTR_ENABLE();
Expand Down
0