CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup to es int patch

Browse Source
This commit is contained in:
Scott Lahteine 2019-11-04 15:40:35 -06:00
parent 35cd545106
commit d80ef43c19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
View File

@ -62,7 +62,7 @@ void endstop_ISR() { endstops.update(); }
WITHIN(p, 14, 15) ? 1 : \ WITHIN(p, 14, 15) ? 1 : \
WITHIN(p, 62, 69) ? 2 : \ WITHIN(p, 62, 69) ? 2 : \
0) 0)
#undef digitalPinToPCMSK #undef digitalPinToPCMSK
#define digitalPinToPCMSK(p) (WITHIN(p, 10, 13) || WITHIN(p, 50, 53) ? (&PCMSK0) : \ #define digitalPinToPCMSK(p) (WITHIN(p, 10, 13) || WITHIN(p, 50, 53) ? (&PCMSK0) : \
WITHIN(p, 14, 15) ? (&PCMSK1) : \ WITHIN(p, 14, 15) ? (&PCMSK1) : \
@ -94,7 +94,7 @@ void endstop_ISR() { endstops.update(); }
// Install Pin change interrupt for a pin. Can be called multiple times. // Install Pin change interrupt for a pin. Can be called multiple times.
void pciSetup(const int8_t pin) { void pciSetup(const int8_t pin) {
if (digitalPinToPCMSK(pin) != nullptr) { if (digitalPinHasPCICR(pin)) {
SBI(*digitalPinToPCMSK(pin), digitalPinToPCMSKbit(pin)); // enable pin SBI(*digitalPinToPCMSK(pin), digitalPinToPCMSKbit(pin)); // enable pin
SBI(PCIFR, digitalPinToPCICRbit(pin)); // clear any outstanding interrupt SBI(PCIFR, digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
SBI(PCICR, digitalPinToPCICRbit(pin)); // enable interrupt for the group SBI(PCICR, digitalPinToPCICRbit(pin)); // enable interrupt for the group