|
@@ -56,10 +56,11 @@
|
56
|
56
|
#endif
|
57
|
57
|
|
58
|
58
|
#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
|
59
|
|
-#define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
|
60
|
59
|
#if AVR_ATmega1284_FAMILY
|
61
|
|
- #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
|
62
|
|
-#else
|
|
60
|
+ #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
|
|
61
|
+ #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
|
|
62
|
+#else
|
|
63
|
+ #define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
|
63
|
64
|
#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
|
64
|
65
|
#endif
|
65
|
66
|
#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
|