Merge pull request #195 from kliment/master

merge masterchanges into experimental

2 files changed, 37 insertions, 7 deletions

diff --git a/README b/README
index 0100e80..f3542c0 100644
--- a/README
+++ b/README
@@ -40,17 +40,17 @@ Software installation
 1. Install the required packages (gcc-avr, avr-libc, etc.)

   sudo apt-get install arduino-core

 

-2. Get the arduino software version 0018 (0023 works for RAMPS), uncompress it in a directory.

+2. Get the arduino software version 0023, uncompress it in a directory.

 Arduino software v1 has not been tested much, but is known to work with some boards.

    http://www.arduino.cc/en/Main/Software

 

-3. Get the sanguino software, version 0018

+3. Get the sanguino software, version 0023

    http://sanguino.cc/softwareforlinux

 

 follow the sanguino's readme so that your arduino hardware folder looks like 

-  arduino-0018/hardware/arduino

-  arduino-0018/hardware/sanguino

-  arduino-0018/hardware/tools

+  arduino-0023/hardware/arduino

+  arduino-0023/hardware/sanguino

+  arduino-0023/hardware/tools

 

 4. Clone the Sprinter git repository. 

    git clone https://github.com/kliment/Sprinter.git

@@ -64,12 +64,12 @@ Firmware compilation and upload
 5. Edit INSTALL_DIR inside Sprinter/Makefile (do not mind the default reference to arduino 0022)

 

 6. Run make. If everything goes well Sprinter/applet/Sprinter.cpp should have been created.

-You can safely ignore the error message mentioning arduino-0018/hardware/arduino/cores/arduino/WString.o

+You can safely ignore the error message mentioning arduino-0023/hardware/arduino/cores/arduino/WString.o

 

 7. Connect your Sanguinololu to your computer

    http://reprap.org/wiki/Sanguinololu

 

-8. Launch arduino-0018/arduino, open Sprinter/Sprinter.pde

+8. Launch arduino-0023/arduino, open Sprinter/Sprinter.pde

 

 9. Go to Tools -> Serial Port, and select the relevant option

 

diff --git a/Sprinter/pins.h b/Sprinter/pins.h
index 42b1fa1..e2d2f89 100644
--- a/Sprinter/pins.h
+++ b/Sprinter/pins.h
@@ -96,6 +96,36 @@
 *       PWM (D 14) PD6 20|        |21  PD7 (D 15) PWM
 *                        +--------+
 *
+****************************************************************************************
+*
+*                     ATMega644P (SMD)
+*
+*                        +--------+
+*       MOSI (D 5) PB5  1| O      |44  PB4 (D 4)  PWM  
+*       MISO (D 6) PB6  2|        |43  PB3 (D 3)  PWM  
+*       SCK  (D 7) PB7  3|        |42  PB2 (D 2)  INT2   
+*                  RST  4|        |41  PB1 (D 1)
+*                  Vcc  5|        |40  PB0 (D 0)  
+*                  GND  6|        |39  GND
+*                XTAL2  7|        |38  Vcc
+*                XTAL1  8|        |37  PA0 (AI 0 / D31)
+*       RX0 (D 8)  PD0  9|        |36  PA1 (AI 1 / D30)
+*       TX0 (D 9)  PD1 10|        |35  PA2 (AI 2 / D29)
+*  INT0 RX1 (D 10) PD2 11|        |34  PA3 (AI 3 / D28)
+*                        +        +
+*  INT1 TX1 (D 11) PD3 12|        |33  PA4 (AI 4 / D27)
+*       PWM (D 12) PD4 13|        |32  PA5 (AI 5 / D26)
+*       PWM (D 13) PD5 14|        |31  PA6 (AI 6 / D25)
+*       PWM (D 14) PD6 15|        |30  PA7 (AI 7 / D24)
+*       PWM (D 15) PD7 16|        |29  AREF
+*                  Vcc 17|        |28  GND
+*                  GND 18|        |27  AVCC
+*           (D 16) PC0 19|        |26  PC7 (D 23)      
+*           (D 17) PC1 20|        |25  PC6 (D 22)      
+*           (D 18) PC2 21|        |24  PC5 (D 21) TDI  
+*           (D 19) PC3 22|        |23  PC4 (D 20) TDO  
+*                        +--------+
+*
 ****************************************************************************************/
 #if MOTHERBOARD == 1
 #define KNOWN_BOARD 1