Skip to content

Commit 9b4562c

Browse files
committed
Using NOT_AN_INTERRUPT defined constant
1 parent d9f140b commit 9b4562c

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

Diff for: cores/arduino/Arduino.h

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
151151
#define NOT_A_PIN 0
152152
#define NOT_A_PORT 0
153153

154+
#define NOT_AN_INTERRUPT -1
155+
154156
#ifdef ARDUINO_MAIN
155157
#define PA 1
156158
#define PB 2

Diff for: variants/leonardo/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static const uint8_t A11 = 29; // D12
132132
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
133133
#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) )
134134

135-
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : -1)))))
135+
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT)))))
136136

137137
#ifdef ARDUINO_MAIN
138138

Diff for: variants/mega/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static const uint8_t A15 = 69;
8383
( (((p) >= 62) && ((p) <= 69)) ? ((p) - 62) : \
8484
0 ) ) ) ) ) )
8585

86-
#define digitalPinToInterrupt(p) ((p) == 2 ? 0 : ((p) == 3 ? 1 : ((p) >= 18 && (p) <= 21 ? 23 - (p) : -1)))
86+
#define digitalPinToInterrupt(p) ((p) == 2 ? 0 : ((p) == 3 ? 1 : ((p) >= 18 && (p) <= 21 ? 23 - (p) : NOT_AN_INTERRUPT)))
8787

8888
#ifdef ARDUINO_MAIN
8989

Diff for: variants/robot_control/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static const uint8_t LED1 = 17; // D17 - RX_Led
9494
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
9595
#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) )
9696

97-
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : -1)))))
97+
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT)))))
9898

9999
#ifdef ARDUINO_MAIN
100100

Diff for: variants/robot_motor/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static const uint8_t TK4 = 12; // A11
8989
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
9090
#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) )
9191

92-
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : -1)))))
92+
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT)))))
9393

9494
#ifdef ARDUINO_MAIN
9595

Diff for: variants/standard/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static const uint8_t A7 = 21;
6060
#define digitalPinToPCMSK(p) (((p) <= 7) ? (&PCMSK2) : (((p) <= 13) ? (&PCMSK0) : (((p) <= 21) ? (&PCMSK1) : ((uint8_t *)0))))
6161
#define digitalPinToPCMSKbit(p) (((p) <= 7) ? (p) : (((p) <= 13) ? ((p) - 8) : ((p) - 14)))
6262

63-
#define digitalPinToInterrupt(p) ((p) == 2 ? 0 : ((p) == 3 ? 1 : -1))
63+
#define digitalPinToInterrupt(p) ((p) == 2 ? 0 : ((p) == 3 ? 1 : NOT_AN_INTERRUPT))
6464

6565
#ifdef ARDUINO_MAIN
6666

0 commit comments

Comments
 (0)