diff options
| author | Greg Dahlman <gdahlman@hotmail.com> | 2011-12-05 20:29:31 -0800 |
|---|---|---|
| committer | Greg Dahlman <gdahlman@hotmail.com> | 2011-12-05 20:29:31 -0800 |
| commit | 09d5247ba2deb0c019f8f2e0df5068826e08f045 (patch) | |
| tree | 1a6aac94d771124f174001393ca2dadef602334a /Sprinter/pins.h | |
| parent | 4506c497a46c5ed1acfea25969c5453d42b73276 (diff) | |
| parent | b331d4810168001ef18d7ab034dfd03e2b03cf00 (diff) | |
Merge remote-tracking branch 'upstream/experimental'
Conflicts:
Sprinter/pins.h
Diffstat (limited to 'Sprinter/pins.h')
| -rw-r--r-- | Sprinter/pins.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Sprinter/pins.h b/Sprinter/pins.h index fad0a6e..01f29ed 100644 --- a/Sprinter/pins.h +++ b/Sprinter/pins.h @@ -143,7 +143,6 @@ #endif - /**************************************************************************************** * RepRap Motherboard ****---NOOOOOO RS485/EXTRUDER CONTROLLER!!!!!!!!!!!!!!!!!---******* * @@ -694,7 +693,7 @@ #if MOTHERBOARD == 7 #define KNOWN_BOARD 1 -#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) && !defined(__AVR_ATmega644__) #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #endif @@ -737,7 +736,6 @@ #endif - /**************************************************************************************** * Teensylu 0.7 pin assingments (ATMEGA90USB) * Requires the Teensyduino software with Teensy2.0++ selected in arduino IDE! |