diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-08-12 22:42:12 -0700 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-08-12 22:42:12 -0700 |
| commit | 3372c0f0291ee01c7bf37e9705731f40db931241 (patch) | |
| tree | 3cc3f64596225da0114c32255a4a83ae91a929c2 | |
| parent | 6ea72437757412991b10e25463f46f3c59549890 (diff) | |
| parent | 7a3bdb7028204f5cdd11e981fe8ac148eb9ad260 (diff) | |
Merge pull request #69 from changwoo/master
ATmega1284P support
| -rw-r--r-- | Sprinter/Sd2PinMap.h | 2 | ||||
| -rw-r--r-- | Sprinter/fastio.h | 4 | ||||
| -rw-r--r-- | Sprinter/pins.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Sprinter/Sd2PinMap.h b/Sprinter/Sd2PinMap.h index 4bd75a3..55518ed 100644 --- a/Sprinter/Sd2PinMap.h +++ b/Sprinter/Sd2PinMap.h @@ -117,7 +117,7 @@ static const pin_map_t digitalPinMap[] = { {&DDRK, &PINK, &PORTK, 7} // K7 69
};
//------------------------------------------------------------------------------
-#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__)
+#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega1284P__)
// Sanguino
// Two Wire (aka I2C) ports
diff --git a/Sprinter/fastio.h b/Sprinter/fastio.h index 1d28d05..73410cb 100644 --- a/Sprinter/fastio.h +++ b/Sprinter/fastio.h @@ -400,7 +400,7 @@ pins #define PD7_PWM NULL #endif /* _AVR_ATmega{168,328,328P}__ */ -#if defined (__AVR_ATmega644__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) +#if defined (__AVR_ATmega644__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__) // UART #define RXD DIO8 #define TXD DIO9 @@ -901,7 +901,7 @@ pins #define PD7_WPORT PORTD #define PD7_DDR DDRD #define PD7_PWM &OCR2A -#endif /* _AVR_ATmega{644,644P,644PA}__ */ +#endif /* _AVR_ATmega{644,644P,644PA,1284P}__ */ #if defined (__AVR_ATmega1280__) || defined (__AVR_ATmega2560__) // UART diff --git a/Sprinter/pins.h b/Sprinter/pins.h index f8e36c3..0d861cc 100644 --- a/Sprinter/pins.h +++ b/Sprinter/pins.h @@ -98,7 +98,7 @@ #if MOTHERBOARD == 1 #define KNOWN_BOARD 1 -#ifndef __AVR_ATmega644P__ +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #endif @@ -148,7 +148,7 @@ #if MOTHERBOARD == 2 #define KNOWN_BOARD 1 -#ifndef __AVR_ATmega644P__ +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #endif @@ -499,7 +499,7 @@ #if MOTHERBOARD == 5 #define KNOWN_BOARD 1 -#ifndef __AVR_ATmega644P__ +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #endif @@ -558,7 +558,7 @@ #endif #if MOTHERBOARD == 6 #define KNOWN_BOARD 1 -#ifndef __AVR_ATmega644P__ +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #endif |