thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Unify AVR90USB: Pins remap to Arduino

Scott Lahteine 7 years ago
parent
b378deaf89
commit
87d8223251
8 changed files with 581 additions and 459 deletions
Split View Show Diff Stats
  1. 77
    38
      Marlin/pins_5DPRINT.h
  2. 38
    32
      Marlin/pins_BRAINWAVE.h
  3. 39
    54
      Marlin/pins_BRAINWAVE_PRO.h
  4. 93
    72
      Marlin/pins_PRINTRBOARD.h
  5. 88
    74
      Marlin/pins_PRINTRBOARD_REVF.h
  6. 92
    58
      Marlin/pins_SAV_MKI.h
  7. 80
    44
      Marlin/pins_TEENSY2.h
  8. 74
    87
      Marlin/pins_TEENSYLU.h

+ 77
- 38
Marlin/pins_5DPRINT.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -21,13 +21,54 @@
21 21 
  */
22 22
23 23 
 /**
24 
+ *  Rev B  2 JUN 2017
25 
+ *
26 
+ *  Converted to Arduino pin numbering
27 
+ */
28 
+
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
35 
+ *
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
38 
+ *
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *
41 
+ *    Installation:
42 
+ *
43 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
44 
+ *          click on "Download ZIP" button.
45 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
46 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
47 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
48 
+ *       3. Restart Arduino.
49 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
50 
+ *
51 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
52 
+ *  the Teensyduino bootloader on it.
53 
+ */
54 
+
55 
+/**
56 
+ *  To burn the bootloader that comes with Printrboard:
57 
+ *
58 
+ *   1. Connect your programmer to the board.
59 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
60 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 
+ *   4. The programmer is no longer needed. Remove it.
62 
+ */
63 
+
64 
+/**
24 65 
  * 5DPrint D8 Driver board pin assignments
25 66 
  *
26 67 
  * https://bitbucket.org/makible/5dprint-d8-controller-board
27 68 
  */
28 69
29 70 
 #ifndef __AVR_AT90USB1286__
30 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
71 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
31 72 
 #endif
32 73
33 74 
 #define DEFAULT_MACHINE_NAME "Makibox"
 
@@ -39,56 +80,54 @@
39 80 
 //
40 81 
 // Limit Switches
41 82 
 //
42 
-#define X_STOP_PIN         37
43 
-#define Y_STOP_PIN         36
44 
-#define Z_STOP_PIN         39
83 
+#define X_STOP_PIN         37   // E5
84 
+#define Y_STOP_PIN         36   // E4
85 
+#define Z_STOP_PIN         19   // E7
45 86
46 87 
 //
47 88 
 // Steppers
48 89 
 //
49 
-#define X_STEP_PIN          0
50 
-#define X_DIR_PIN           1
51 
-#define X_ENABLE_PIN       23
52 
-
53 
-#define Y_STEP_PIN          2
54 
-#define Y_DIR_PIN           3
55 
-#define Y_ENABLE_PIN       19
56 
-
57 
-#define Z_STEP_PIN          4
58 
-#define Z_DIR_PIN           5
59 
-#define Z_ENABLE_PIN       18
60 
-
61 
-#define E0_STEP_PIN         6
62 
-#define E0_DIR_PIN          7
63 
-#define E0_ENABLE_PIN      17
64 
-
65 
-// Microstepping pins - Mapping not from fastio.h (?)
66 
-#define X_MS1_PIN          25
67 
-#define X_MS2_PIN          26
68 
-#define Y_MS1_PIN           9
69 
-#define Y_MS2_PIN           8
70 
-#define Z_MS1_PIN           7
71 
-#define Z_MS2_PIN           6
72 
-#define E0_MS1_PIN          5
73 
-#define E0_MS2_PIN          4
90 
+#define X_STEP_PIN         28   // A0
91 
+#define X_DIR_PIN          29   // A1
92 
+#define X_ENABLE_PIN       17   // C7
93 
+
94 
+#define Y_STEP_PIN         30   // A2
95 
+#define Y_DIR_PIN          31   // A3
96 
+#define Y_ENABLE_PIN       13   // C3
97 
+
98 
+#define Z_STEP_PIN         32   // A4
99 
+#define Z_DIR_PIN          33   // A5
100 
+#define Z_ENABLE_PIN       12   // C2
101 
+
102 
+#define E0_STEP_PIN        34   // A6
103 
+#define E0_DIR_PIN         35   // A7
104 
+#define E0_ENABLE_PIN      11   // C1
105 
+
106 
+
107 
+#define X_MS1_PIN          25   // B5
108 
+#define X_MS2_PIN          26   // B6
109 
+#define Y_MS1_PIN           9   // E1
110 
+#define Y_MS2_PIN           8   // E0
111 
+#define Z_MS1_PIN           7   // D7
112 
+#define Z_MS2_PIN           6   // D6
113 
+#define E0_MS1_PIN          5   // D5
114 
+#define E0_MS2_PIN          4   // D4
74 115
75 116 
 //
76 117 
 // Temperature Sensors
77 118 
 //
78 
-#define TEMP_0_PIN          1   // Analog Input
79 
-#define TEMP_BED_PIN        0   // Analog Input
119 
+#define TEMP_0_PIN          1   // F1  Analog Input
120 
+#define TEMP_BED_PIN        0   // F0  Analog Input
80 121
81 122 
 //
82 123 
 // Heaters / Fans
83 124 
 //
84 
-#define HEATER_0_PIN       21
85 
-#define HEATER_BED_PIN     20
125 
+#define HEATER_0_PIN       15   // C5
126 
+#define HEATER_BED_PIN     14   // C4
86 127
87 
-// You may need to change FAN_PIN to 16 because Marlin isn't using fastio.h
88 
-// for the fan and Teensyduino uses a different pin mapping.
89 
-#define FAN_PIN            16
128 
+#define FAN_PIN            16   // C6  PWM3A
90 129
91 130 
 //
92 131 
 // Misc. Functions
93 132 
 //
94 
-#define SDSS               20
133 
+#define SDSS               20   // B0

+ 38
- 32
Marlin/pins_BRAINWAVE.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -35,6 +35,12 @@
35 35 
  */
36 36
37 37 
 /**
38 
+ *  Rev C  2 JUN 2017
39 
+ *
40 
+ *  Converted to Arduino pin numbering
41 
+ */
42 
+
43 
+/**
38 44 
  *  Marlin_AT90USB - https://github.com/Bob-the-Kuhn/Marlin_AT90USB
39 45 
  *    This is the only known IDE extension that is compatible with the pin definitions
40 46 
  *    in this file, Adrduino 1.6.12 and the latest mainstream Marlin software.
 
@@ -49,20 +55,20 @@
49 55 
  *       https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
50 56 
  *    2. Under Tools -> Board -> Boards manager, scroll to the bottom, click on MARLIN_AT90USB
51 57 
  *       and then click on "Install"
52 
- *    3. Select "AT90USB646_STANDARD" from the 'Tools -> Boards' menu.
58 
+ *    3. Select "AT90USB646_TEENSYPP" from the 'Tools -> Boards' menu.
53 59 
  */
54 60
55 61 
 /**
56 62 
  *  To burn the bootloader that comes with Marlin_AT90USB:
57 63 
  *
58 64 
  *    1. Connect your programmer to the board.
59 
- *    2. In Arduino IDE select "AT90USB646_STANDARD" and then select the programmer.
65 
+ *    2. In Arduino IDE select "AT90USB646_TEENSYPP" and then select the programmer.
60 66 
  *    3. In Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 67 
  *    4. The programmer is no longer needed. Remove it.
62 68 
  */
63 69
64 70 
 #ifndef __AVR_AT90USB646__
65 
-  #error "Oops!  Make sure you have 'Brainwave' selected from the 'Tools -> Boards' menu."
71 
+  #error "Oops!  Make sure you have 'AT90USB646_TEENSYPP' selected from the 'Tools -> Boards' menu."
66 72 
 #endif
67 73
68 74 
 #define BOARD_NAME         "Brainwave"
 
@@ -72,48 +78,48 @@
72 78 
 //
73 79 
 // Limit Switches
74 80 
 //
75 
-#define X_STOP_PIN          7
76 
-#define Y_STOP_PIN          6
77 
-#define Z_STOP_PIN          5
81 
+#define X_STOP_PIN         35   // A7
82 
+#define Y_STOP_PIN         34   // A6
83 
+#define Z_STOP_PIN         33   // A5
78 84
79 85 
 //
80 86 
 // Steppers
81 87 
 //
82 
-#define X_STEP_PIN         27
83 
-#define X_DIR_PIN          29
84 
-#define X_ENABLE_PIN       28
85 
-#define X_ATT_PIN          26
86 
-
87 
-#define Y_STEP_PIN         31
88 
-#define Y_DIR_PIN          33
89 
-#define Y_ENABLE_PIN       32
90 
-#define Y_ATT_PIN          30
91 
-
92 
-#define Z_STEP_PIN         17
93 
-#define Z_DIR_PIN          19
94 
-#define Z_ENABLE_PIN       18
95 
-#define Z_ATT_PIN          16
96 
-
97 
-#define E0_STEP_PIN        21
98 
-#define E0_DIR_PIN         23
99 
-#define E0_ENABLE_PIN      22
100 
-#define E0_ATT_PIN         20
88 
+#define X_STEP_PIN          3   // D3
89 
+#define X_DIR_PIN           5   // D5
90 
+#define X_ENABLE_PIN        4   // D4
91 
+#define X_ATT_PIN           2   // D2
92 
+
93 
+#define Y_STEP_PIN          7   // D7
94 
+#define Y_DIR_PIN           9   // E1
95 
+#define Y_ENABLE_PIN        8   // E0
96 
+#define Y_ATT_PIN           6   // D6
97 
+
98 
+#define Z_STEP_PIN         11   // C1
99 
+#define Z_DIR_PIN          13   // C3
100 
+#define Z_ENABLE_PIN       12   // C2
101 
+#define Z_ATT_PIN          10   // C0
102 
+
103 
+#define E0_STEP_PIN        15   // C5
104 
+#define E0_DIR_PIN         17   // C7
105 
+#define E0_ENABLE_PIN      16   // C6
106 
+#define E0_ATT_PIN         14   // C4
101 107
102 108 
 //
103 109 
 // Temperature Sensors
104 110 
 //
105 
-#define TEMP_0_PIN          7   // Analog Input
106 
-#define TEMP_BED_PIN        6   // Analog Input
111 
+#define TEMP_0_PIN          7   // F7  Analog Input
112 
+#define TEMP_BED_PIN        6   // F6  Analog Input
107 113
108 114 
 //
109 115 
 // Heaters / Fans
110 116 
 //
111 
-#define HEATER_0_PIN        4  // Extruder
112 
-#define HEATER_BED_PIN     38  // Bed
117 
+#define HEATER_0_PIN       32   // A4 Extruder
118 
+#define HEATER_BED_PIN     18   // E6 Bed
113 119
114 
-#define FAN_PIN             3  // Fan
120 
+#define FAN_PIN            31   // A3 Fan
115 121
116 122 
 //
117 123 
 // Misc. Functions
118 124 
 //
119 
-#define LED_PIN            39
125 
+#define LED_PIN            19   // E7

+ 39
- 54
Marlin/pins_BRAINWAVE_PRO.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -32,11 +32,16 @@
32 32 
  *
33 33 
  *  Added pointers to currently available Arduino IDE extensions that will
34 34 
  *  allow this board to use the latest Marlin software
35 
+ *
36 
+ *
37 
+ *  Rev C  2 JUN 2017
38 
+ *
39 
+ *  Converted to Arduino pin numbering
35 40 
  */
36 41
37 42 
 /**
38 
- *  There are three Arduino IDE extensions that are compatible with this board
39 
- *  and with the mainstream Marlin software.  All have been used with Arduino 1.6.12
43 
+ *  There are two Arduino IDE extensions that are compatible with this board
44 
+ *  and with the mainstream Marlin software.
40 45 
  *
41 46 
  *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
42 47 
  *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
 
@@ -45,8 +50,6 @@
45 50 
  *    libraries - they are not used with the Marlin software.
46 51 
  *
47 52 
  *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
48 
- *    This is basically Teensyduino but with a bootloader that can handle image sizes
49 
- *    larger than 64K.
50 53 
  *
51 54 
  *    Installation:
52 55 
  *
 
@@ -54,43 +57,25 @@
54 57 
  *          click on "Download ZIP" button.
55 58 
  *       2. Unzip the file, find the "printrboard" directory and then copy it to the
56 59 
  *          hardware directory in Arduino.  The Arduino hardware directory will probably
57 
- *			be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
60 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
58 61 
  *       3. Restart Arduino.
59 62 
  *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
60 63 
  *
61 
- *  Marlin_AT90USB - https://github.com/Bob-the-Kuhn/Marlin_AT90USB
62 
- *    Uses the bootloader from Printerboard above.
63 
- *
64 
- *    "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
65 
- *    the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
66 
- *    that PWM1A, PWM1B & PWM1C can't be used.
67 
- *
68 
- *    Installation:
69 
- *
70 
- *       1. In the Arduino IDE, under Files -> Preferences paste the following URL
71 
- *          https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
72 
- *       2. Under Tools -> Board -> Boards manager, scroll to the bottom, click on MARLIN_AT90USB
73 
- *          and then click on "Install"
74 
- *       3. Select "AT90USB1286_TEENSYPP" from the 'Tools -> Boards' menu.
64 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
65 
+ *  the Teensyduino bootloader on it.
75 66 
  */
76 67
77 68 
 /**
78 
- *  To burn the bootloader that comes with Printrboard and Marlin_AT90USB:
69 
+ *  To burn the bootloader that comes with Printrboard:
79 70 
  *
80 71 
  *   1. Connect your programmer to the board.
81 
- *   2. In the Arduino IDE select "Printrboard" or "AT90USB1286_TEENSYPP" and then select the programmer.
72 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
82 73 
  *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
83 74 
  *   4. The programmer is no longer needed. Remove it.
84 75 
  */
85 76
86 77 
 #ifndef __AVR_AT90USB1286__
87 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0', 'AT90USB1286_TEENSYPP', or 'Printrboard' selected from the 'Tools -> Boards' menu."
88 
-#endif
89 
-
90 
-#include "fastio.h"
91 
-
92 
-#if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
93 
-  #error "Uncomment '#define AT90USBxx_TEENSYPP_ASSIGNMENTS' in fastio.h for this config"
78 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
94 79 
 #endif
95 80
96 81 
 #define BOARD_NAME         "Brainwave Pro"
 
@@ -101,53 +86,53 @@
101 86 
 //
102 87 
 // Limit Switches
103 88 
 //
104 
-#define X_STOP_PIN         47
105 
-#define Y_STOP_PIN         18
106 
-#define Z_MAX_PIN          36
89 
+#define X_STOP_PIN         45   // F7
90 
+#define Y_STOP_PIN         12   // C2
91 
+#define Z_STOP_PIN         36   // E4
107 92
108 93 
 //
109 94 
 // Z Probe (when not Z_MIN_PIN)
110 95 
 //
111 96 
 #ifndef Z_MIN_PROBE_PIN
112 
-  #define Z_MIN_PROBE_PIN  17
97 
+  #define Z_MIN_PROBE_PIN  11   // C1
113 98 
 #endif
114 99
115 100 
 //
116 101 
 // Steppers
117 102 
 //
118 
-#define X_STEP_PIN         33
119 
-#define X_DIR_PIN          32
120 
-#define X_ENABLE_PIN       11
103 
+#define X_STEP_PIN          9   // E1
104 
+#define X_DIR_PIN           8   // E0
105 
+#define X_ENABLE_PIN       23   // B3
121 106
122 
-#define Y_STEP_PIN         31
123 
-#define Y_DIR_PIN          30
124 
-#define Y_ENABLE_PIN        8
107 
+#define Y_STEP_PIN          7   // D7
108 
+#define Y_DIR_PIN           6   // D6
109 
+#define Y_ENABLE_PIN       20   // B0
125 110
126 
-#define Z_STEP_PIN         29
127 
-#define Z_DIR_PIN          28
128 
-#define Z_ENABLE_PIN       37
111 
+#define Z_STEP_PIN          5   // D5
112 
+#define Z_DIR_PIN           4   // D4
113 
+#define Z_ENABLE_PIN       37   // E5
129 114
130 
-#define E0_STEP_PIN        35
131 
-#define E0_DIR_PIN         34
132 
-#define E0_ENABLE_PIN      13
115 
+#define E0_STEP_PIN        47   // E3
116 
+#define E0_DIR_PIN         46   // E2
117 
+#define E0_ENABLE_PIN      25   // B5
133 118
134 119 
 //
135 120 
 // Temperature Sensors
136 121 
 //
137 
-#define TEMP_0_PIN          2   // Analog Input
138 
-#define TEMP_1_PIN          1   // Analog Input
139 
-#define TEMP_BED_PIN        0   // Analog Input
122 
+#define TEMP_0_PIN          2   // F2  Analog Input
123 
+#define TEMP_1_PIN          1   // F1  Analog Input
124 
+#define TEMP_BED_PIN        0   // F0  Analog Input
140 125
141 126 
 //
142 127 
 // Heaters / Fans
143 128 
 //
144 
-#define HEATER_0_PIN       15
145 
-#define HEATER_BED_PIN     14  // Bed
146 
-#define FAN_PIN            16  // Fan, PWM
129 
+#define HEATER_0_PIN       27   // B7
130 
+#define HEATER_BED_PIN     26   // B6  Bed
131 
+#define FAN_PIN            16   // C6  Fan, PWM3A
147 132
148 133 
 //
149 134 
 // Misc. Functions
150 135 
 //
151 
-#define SDSS               20
152 
-#define SD_DETECT_PIN      12
153 
-#define LED_PIN            19
136 
+#define SDSS               20   // B0
137 
+#define SD_DETECT_PIN      24   // B4
138 
+#define LED_PIN            13   // C3

+ 93
- 72
Marlin/pins_PRINTRBOARD.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -21,18 +21,48 @@
21 21 
  */
22 22
23 23 
 /**
24 
- * Printrboard pin assignments (AT90USB1286)
25 
- * Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE!
26 
- * http://www.pjrc.com/teensy/teensyduino.html
27 
- * See http://reprap.org/wiki/Printrboard for more info
24 
+ *  Rev B  2 JUN 2017
25 
+ *
26 
+ *  Converted to Arduino pin numbering
28 27 
  */
29 28
30 
-#ifndef __AVR_AT90USB1286__
31 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
32 
-#endif
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
35 
+ *
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
38 
+ *
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *
41 
+ *    Installation:
42 
+ *
43 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
44 
+ *          click on "Download ZIP" button.
45 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
46 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
47 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
48 
+ *       3. Restart Arduino.
49 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
50 
+ *
51 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
52 
+ *  the Teensyduino bootloader on it.
53 
+ */
33 54
34 
-#if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)  // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional.
35 
-  #error "These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h"
55 
+/**
56 
+ *  To burn the bootloader that comes with Printrboard:
57 
+ *
58 
+ *   1. Connect your programmer to the board.
59 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
60 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 
+ *   4. The programmer is no longer needed. Remove it.
62 
+ */
63 
+
64 
+#ifndef __AVR_AT90USB1286__
65 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
36 66 
 #endif
37 67
38 68 
 #define BOARD_NAME         "Printrboard"
 
@@ -46,32 +76,32 @@
46 76 
 //
47 77 
 // Limit Switches
48 78 
 //
49 
-#define X_STOP_PIN         35
79 
+#define X_STOP_PIN         47   // E3
50 80 
 #if ENABLED(SDSUPPORT)
51 
-  #define Y_STOP_PIN       37 // Move Ystop to Estop socket
81 
+  #define Y_STOP_PIN       37   // E5 - Move Ystop to Estop socket
52 82 
 #else
53 
-  #define Y_STOP_PIN        8 // Ystop in Ystop socket
83 
+  #define Y_STOP_PIN       20   // B0 SS - Ystop in Ystop socket
54 84 
 #endif
55 
-#define Z_STOP_PIN         36
85 
+#define Z_STOP_PIN         36   // E4
56 86
57 87 
 //
58 88 
 // Steppers
59 89 
 //
60 
-#define X_STEP_PIN          0
61 
-#define X_DIR_PIN           1
62 
-#define X_ENABLE_PIN       39
90 
+#define X_STEP_PIN         28   // A0
91 
+#define X_DIR_PIN          29   // A1
92 
+#define X_ENABLE_PIN       19   // E7
63 93
64 
-#define Y_STEP_PIN          2
65 
-#define Y_DIR_PIN           3
66 
-#define Y_ENABLE_PIN       38
94 
+#define Y_STEP_PIN         30   // A2
95 
+#define Y_DIR_PIN          31   // A3
96 
+#define Y_ENABLE_PIN       18   // E6
67 97
68 
-#define Z_STEP_PIN          4
69 
-#define Z_DIR_PIN           5
70 
-#define Z_ENABLE_PIN       23
98 
+#define Z_STEP_PIN         32   // A4
99 
+#define Z_DIR_PIN          33   // A5
100 
+#define Z_ENABLE_PIN       17   // C7
71 101
72 
-#define E0_STEP_PIN         6
73 
-#define E0_DIR_PIN          7
74 
-#define E0_ENABLE_PIN      19
102 
+#define E0_STEP_PIN        34   // A6
103 
+#define E0_DIR_PIN         35   // A7
104 
+#define E0_ENABLE_PIN      13   // C3
75 105
76 106 
 //
77 107 
 // Temperature Sensors
 
@@ -82,76 +112,67 @@
82 112 
 //
83 113 
 // Heaters / Fans
84 114 
 //
85 
-#define HEATER_0_PIN       21 // Extruder
86 
-#define HEATER_1_PIN       46
87 
-#define HEATER_2_PIN       47
88 
-#define HEATER_BED_PIN     20
89 
-
90 
-// If soft or fast PWM is off then use Teensyduino pin numbering, Marlin
91 
-// fastio pin numbering otherwise
92 
-#if ENABLED(FAN_SOFT_PWM) || ENABLED(FAST_PWM_FAN)
93 
-  #define FAN_PIN          22
94 
-#else
95 
-  #define FAN_PIN          16
96 
-#endif
115 
+#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
116 
+#define HEATER_1_PIN       44   // F6
117 
+#define HEATER_2_PIN       45   // F7
118 
+#define HEATER_BED_PIN     14   // C4 PWM3C
119 
+
120 
+
121 
+#define FAN_PIN            16   // C6 PWM3A
97 122
98 123 
 //
99 124 
 // Misc. Functions
100 125 
 //
101 
-#define SDSS               26
102 
-
103 
-#ifndef FILWIDTH_PIN
104 
-  #define FILWIDTH_PIN      2   // Analog Input
105 
-#endif
126 
+#define SDSS               20   // B0 SS
127 
+#define FILWIDTH_PIN        2   // Analog Input
106 128
107 129 
 //
108 130 
 // LCD / Controller
109 131 
 //
110 132 
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
111 133 
   // we have no buzzer installed
112 
-  #define BEEPER_PIN -1
134 
+  #define BEEPER_PIN       -1
113 135
114 136 
   // LCD Pins
115 137 
   #if ENABLED(LCD_I2C_PANELOLU2)
116 
-    #define BTN_EN1 27 // RX1 - fastio.h pin mapping 27
117 
-    #define BTN_EN2 26 // TX1 - fastio.h pin mapping 26
118 
-    #define BTN_ENC 43 // A3 - fastio.h pin mapping 43
119 
-    #define SDSS    40 // use SD card on Panelolu2 (Teensyduino pin mapping)
138 
+    #define BTN_EN1         3   // D3 RX1   JP2-7
139 
+    #define BTN_EN2         2   // D2 TX1   JP2-5
140 
+    #define BTN_ENC        41   // F3       JP2-4
141 
+    #define SDSS           38   // F0       B-THERM connector - use SD card on Panelolu2
120 142 
   #else
121 
-    #define BTN_EN1 16
122 
-    #define BTN_EN2 17
123 
-    #define BTN_ENC 18 // the click
124 
-  #endif // LCD_I2C_PANELOLU2
143 
+    #define BTN_EN1        10   // C0       JP11-12
144 
+    #define BTN_EN2        11   // C1       JP11-13
145 
+    #define BTN_ENC        12   // C2       JP11-14
146 
+  #endif
125 147
126 
-  // not connected to a pin
127 
-  #define SD_DETECT_PIN -1
148 
+  // not connected
149 
+  #define SD_DETECT_PIN    -1
128 150
129 
-  #define LCD_PINS_RS 9
130 
-  #define LCD_PINS_ENABLE 8
131 
-  #define LCD_PINS_D4 7
132 
-  #define LCD_PINS_D5 6
133 
-  #define LCD_PINS_D6 5
134 
-  #define LCD_PINS_D7 4
151 
+  #define LCD_PINS_RS       9   // E1       JP11-11
152 
+  #define LCD_PINS_ENABLE   8   // E0       JP11-10
153 
+  #define LCD_PINS_D4       7   // D7       JP11-8
154 
+  #define LCD_PINS_D5       6   // D6       JP11-7
155 
+  #define LCD_PINS_D6       5   // D5       JP11-6
156 
+  #define LCD_PINS_D7       4   // D4       JP11-5
135 157
136 158 
 #endif // ULTRA_LCD && NEWPANEL
137 159
138 160 
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
139 
-  // FastIO
140 
-  #define BEEPER_PIN 32
161 
+  #define BEEPER_PIN        8   // E0       JP11-10
141 162 
   // Pins for DOGM SPI LCD Support
142 
-  #define DOGLCD_A0  42 // Non-FastIO
143 
-  #define DOGLCD_CS  43 // Non-FastIO
163 
+  #define DOGLCD_A0        40   // F2       JP2-2
164 
+  #define DOGLCD_CS        41   // F3       JP2-4
144 165 
   #define LCD_SCREEN_ROT_180
145 166
146 
-  // The encoder and click button (FastIO Pins)
147 
-  #define BTN_EN1 26
148 
-  #define BTN_EN2 27
149 
-  #define BTN_ENC 47
167 
+  // The encoder and click button
168 
+  #define BTN_EN1           2   // D2 TX1   JP2-5
169 
+  #define BTN_EN2           3   // D3 RX1   JP2-7
170 
+  #define BTN_ENC          45   // F7 TDI   JP2-12
150 171
151 
-  #define SDSS 45
152 
-  #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)
172 
+  #define SDSS             43   // F5 TMS   JP2-8
173 
+  #define SD_DETECT_PIN    -1
153 174
154 
-  #define STAT_LED_RED_PIN  12 // Non-FastIO
155 
-  #define STAT_LED_BLUE_PIN 10 // Non-FastIO
175 
+  #define STAT_LED_RED_PIN  12  // C2       JP11-14
176 
+  #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
156 177
157 178 
 #endif

+ 88
- 74
Marlin/pins_PRINTRBOARD_REVF.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -21,18 +21,48 @@
21 21 
  */
22 22
23 23 
 /**
24 
- * Printrboard pin assignments (AT90USB1286)
25 
- * Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE!
26 
- * http://www.pjrc.com/teensy/teensyduino.html
27 
- * See http://reprap.org/wiki/Printrboard for more info
24 
+ *  Rev B  2 JUN 2017
25 
+ *
26 
+ *  Converted to Arduino pin numbering
28 27 
  */
29 28
30 
-#ifndef __AVR_AT90USB1286__
31 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
32 
-#endif
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
35 
+ *
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
38 
+ *
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *
41 
+ *    Installation:
42 
+ *
43 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
44 
+ *          click on "Download ZIP" button.
45 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
46 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
47 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
48 
+ *       3. Restart Arduino.
49 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
50 
+ *
51 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
52 
+ *  the Teensyduino bootloader on it.
53 
+ */
33 54
34 
-#if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)  // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional.
35 
-  #error "These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h"
55 
+/**
56 
+ *  To burn the bootloader that comes with Printrboard:
57 
+ *
58 
+ *   1. Connect your programmer to the board.
59 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
60 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 
+ *   4. The programmer is no longer needed. Remove it.
62 
+ */
63 
+
64 
+#ifndef __AVR_AT90USB1286__
65 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
36 66 
 #endif
37 67
38 68 
 #define BOARD_NAME         "Printrboard Rev F"
 
@@ -41,28 +71,28 @@
41 71 
 //
42 72 
 // Limit Switches
43 73 
 //
44 
-#define X_STOP_PIN         35
45 
-#define Y_STOP_PIN         12
46 
-#define Z_STOP_PIN         36
74 
+#define X_STOP_PIN         47   // E3
75 
+#define Y_STOP_PIN         24   // B4 PWM2A
76 
+#define Z_STOP_PIN         36   // E4
47 77
48 78 
 //
49 79 
 // Steppers
50 80 
 //
51 
-#define X_STEP_PIN          0
52 
-#define X_DIR_PIN           1
53 
-#define X_ENABLE_PIN       39
81 
+#define X_STEP_PIN         28   // A0
82 
+#define X_DIR_PIN          29   // A1
83 
+#define X_ENABLE_PIN       19   // E7
54 84
55 
-#define Y_STEP_PIN          2
56 
-#define Y_DIR_PIN           3
57 
-#define Y_ENABLE_PIN       38
85 
+#define Y_STEP_PIN         30   // A2
86 
+#define Y_DIR_PIN          31   // A3
87 
+#define Y_ENABLE_PIN       18   // E6
58 88
59 
-#define Z_STEP_PIN          4
60 
-#define Z_DIR_PIN           5
61 
-#define Z_ENABLE_PIN       23
89 
+#define Z_STEP_PIN         32   // A4
90 
+#define Z_DIR_PIN          33   // A5
91 
+#define Z_ENABLE_PIN       17   // C7
62 92
63 
-#define E0_STEP_PIN         6
64 
-#define E0_DIR_PIN          7
65 
-#define E0_ENABLE_PIN      19
93 
+#define E0_STEP_PIN        34   // A6
94 
+#define E0_DIR_PIN         35   // A7
95 
+#define E0_ENABLE_PIN      13   // C3
66 96
67 97 
 // uncomment to enable an I2C based DAC like on the Printrboard REVF
68 98 
 #define DAC_STEPPER_CURRENT
 
@@ -72,7 +102,7 @@
72 102 
 #define DAC_STEPPER_SENSE    0.11
73 103 
 #define DAC_STEPPER_ADDRESS  0
74 104 
 #define DAC_STEPPER_MAX   3520
75 
-#define DAC_STEPPER_VREF     1 // internal Vref, gain 1x = 2.048V
105 
+#define DAC_STEPPER_VREF     1   // internal Vref, gain 1x = 2.048V
76 106 
 #define DAC_STEPPER_GAIN     0
77 107 
 #define DAC_OR_ADDRESS    0x00
78 108 
 
@@ -85,68 +115,52 @@
85 115 
 //
86 116 
 // Heaters / Fans
87 117 
 //
88 
-#define HEATER_0_PIN       21 // Extruder
89 
-#define HEATER_1_PIN       46
90 
-#define HEATER_2_PIN       47
91 
-#define HEATER_BED_PIN     20
92 
-
93 
-// If soft or fast PWM is off then use Teensyduino pin numbering, Marlin
94 
-// fastio pin numbering otherwise
95 
-#if ENABLED(FAN_SOFT_PWM) || ENABLED(FAST_PWM_FAN)
96 
-  #define FAN_PIN          22
97 
-#else
98 
-  #define FAN_PIN          16
99 
-#endif
118 
+#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
119 
+#define HEATER_1_PIN       44   // F6
120 
+#define HEATER_2_PIN       45   // F7
121 
+#define HEATER_BED_PIN     14   // C4 PWM3C
122 
+
123 
+#define FAN_PIN            16   // C6 PWM3A
100 124
101 125 
 //
102 126 
 // Misc. Functions
103 127 
 //
104 
-#define SDSS               20 // Teensylu pin mapping
105 
-
106 
-#ifndef FILWIDTH_PIN
107 
-  #define FILWIDTH_PIN      2   // Analog Input
108 
-#endif
128 
+#define SDSS               20   // B0 SS
129 
+#define FILWIDTH_PIN        2   // Analog Input
109 130
110 131 
 //
111 132 
 // LCD / Controller
112 133 
 //
113 134 
 #if ENABLED(ULTRA_LCD)
114 
-  #define BEEPER_PIN -1
115 
-
116 
-  #define LCD_PINS_RS 9
117 
-  #define LCD_PINS_ENABLE 8
118 
-  #define LCD_PINS_D4 7
119 
-  #define LCD_PINS_D5 6
120 
-  #define LCD_PINS_D6 5
121 
-  #define LCD_PINS_D7 4
122 
-
123 
-  #define BTN_EN1   16
124 
-  #define BTN_EN2   17
125 
-  #define BTN_ENC   18 // the click
126 
-
127 
-  #define SD_DETECT_PIN -1
128 
-
129 
-  // encoder rotation values
130 
-  #define encrot0 0
131 
-  #define encrot1 2
132 
-  #define encrot2 3
133 
-  #define encrot3 1
135 
+  #define BEEPER_PIN       -1
136 
+
137 
+  #define LCD_PINS_RS       9   // E1       JP11-11
138 
+  #define LCD_PINS_ENABLE   8   // E0       JP11-10
139 
+  #define LCD_PINS_D4       7   // D7       JP11-8
140 
+  #define LCD_PINS_D5       6   // D6       JP11-7
141 
+  #define LCD_PINS_D6       5   // D5       JP11-6
142 
+  #define LCD_PINS_D7       4   // D4       JP11-5
143 
+
144 
+  #define BTN_EN1          10   // C0       JP11-12
145 
+  #define BTN_EN2          11   // C1       JP11-13
146 
+  #define BTN_ENC          12   // C2       JP11-14
147 
+
148 
+  #define SD_DETECT_PIN    -1
134 149 
 #endif
135 150
136 151 
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
137 
-  #define BEEPER_PIN 32 // FastIO
138 
-  #define DOGLCD_A0  42 // Non-FastIO
139 
-  #define DOGLCD_CS  43 // Non-FastIO
152 
+  #define BEEPER_PIN        8   // E0       JP11-10
153 
+  #define DOGLCD_A0        40   // F2       JP2-2
154 
+  #define DOGLCD_CS        41   // F3       JP2-4
140 155 
   #define LCD_SCREEN_ROT_180
141 156
142 
-  // (FastIO Pins)
143 
-  #define BTN_EN1 26
144 
-  #define BTN_EN2 27
145 
-  #define BTN_ENC 47
157 
+  #define BTN_EN1           2   // D2 TX1   JP2-5
158 
+  #define BTN_EN2           3   // D3 RX1   JP2-7
159 
+  #define BTN_ENC          45   // F7 TDI   JP2-12
146 160
147 
-  #define SDSS 45
148 
-  #define SD_DETECT_PIN -1 // FastIO (Manual says 72)
161 
+  #define SDSS             43   // F5 TMS   JP2-8
162 
+  #define SD_DETECT_PIN    -1
149 163
150 
-  #define STAT_LED_RED_PIN  12 // Non-FastIO
151 
-  #define STAT_LED_BLUE_PIN 10 // Non-FastIO
164 
+  #define STAT_LED_RED_PIN  12  // C2       JP11-14
165 
+  #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
152 166 
 #endif

+ 92
- 58
Marlin/pins_SAV_MKI.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -21,14 +21,48 @@
21 21 
  */
22 22
23 23 
 /**
24 
- * SAV MkI pin assignments (AT90USB1286)
25 
- * Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE!
26 
- * http://www.pjrc.com/teensy/teensyduino.html
27 
- * RepRap Clone Wars project board.
24 
+ *  Rev B  2 JUN 2017
25 
+ *
26 
+ *  Converted to Arduino pin numbering
27 
+ */
28 
+
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
35 
+ *
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
38 
+ *
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *
41 
+ *    Installation:
42 
+ *
43 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
44 
+ *          click on "Download ZIP" button.
45 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
46 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
47 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
48 
+ *       3. Restart Arduino.
49 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
50 
+ *
51 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
52 
+ *  the Teensyduino bootloader on it.
53 
+ */
54 
+
55 
+/**
56 
+ *  To burn the bootloader that comes with Printrboard:
57 
+ *
58 
+ *   1. Connect your programmer to the board.
59 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
60 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 
+ *   4. The programmer is no longer needed. Remove it.
28 62 
  */
29 63
30 64 
 #ifndef __AVR_AT90USB1286__
31 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
65 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
32 66 
 #endif
33 67
34 68 
 #define DEFAULT_MACHINE_NAME    "SAV MkI"
 
@@ -41,54 +75,54 @@
41 75 
 //
42 76 
 // Servos
43 77 
 //
44 
-#define SERVO0_PIN         41 // In teensy's pin definition for pinMode (in servo.cpp)
78 
+#define SERVO0_PIN         39   // F1  In teensy's pin definition for pinMode (in servo.cpp)
45 79
46 80 
 //
47 81 
 // Limit Switches
48 82 
 //
49 
-#define X_STOP_PIN         13
50 
-#define Y_STOP_PIN         14
51 
-//#define Z_STOP_PIN         15
52 
-#define Z_STOP_PIN         36  // For inductive sensor.
83 
+#define X_STOP_PIN         25   // B5
84 
+#define Y_STOP_PIN         26   // B6
85 
+//#define Z_STOP_PIN         27   // B7
86 
+#define Z_STOP_PIN         36   // E4 For inductive sensor.
87 
+//#define E_STOP_PIN         36   // E4
53 88
54 89 
 //
55 90 
 // Steppers
56 91 
 //
57 
-#define X_STEP_PIN         0
58 
-#define X_DIR_PIN          1
59 
-#define X_ENABLE_PIN       39
92 
+#define X_STEP_PIN         28   // A0
93 
+#define X_DIR_PIN          29   // A1
94 
+#define X_ENABLE_PIN       19   // E7
60 95
61 
-#define Y_STEP_PIN         2
62 
-#define Y_DIR_PIN          3
63 
-#define Y_ENABLE_PIN       38
96 
+#define Y_STEP_PIN         30   // A2
97 
+#define Y_DIR_PIN          31   // A3
98 
+#define Y_ENABLE_PIN       18   // E6
64 99
65 
-#define Z_STEP_PIN         4
66 
-#define Z_DIR_PIN          5
67 
-#define Z_ENABLE_PIN       23
100 
+#define Z_STEP_PIN         32   // A4
101 
+#define Z_DIR_PIN          33   // A5
102 
+#define Z_ENABLE_PIN       17   // C7
68 103
69 
-#define E0_STEP_PIN        6
70 
-#define E0_DIR_PIN         7
71 
-#define E0_ENABLE_PIN      19
104 
+#define E0_STEP_PIN        34   // A6
105 
+#define E0_DIR_PIN         35   // A7
106 
+#define E0_ENABLE_PIN      13   // C3
72 107
73 108 
 //
74 109 
 // Temperature Sensors
75 110 
 //
76 
-#define TEMP_0_PIN          7  // Analog Input (Extruder)
77 
-#define TEMP_BED_PIN        6  // Analog Input (Bed)
111 
+#define TEMP_0_PIN          7   // F7  Analog Input (Extruder)
112 
+#define TEMP_BED_PIN        6   // F6  Analog Input (Bed)
78 113
79 114 
 //
80 115 
 // Heaters / Fans
81 116 
 //
82 
-#define HEATER_0_PIN       21  // Extruder
83 
-#define HEATER_BED_PIN     20  // Bed
117 
+#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
118 
+#define HEATER_BED_PIN     14   // C4 PWM3C - Bed
84 119
85 
-#define FAN_PIN            16  // Fan -- from Teensyduino environment.
86 
-                               // For the fan and Teensyduino uses a different pin mapping.
120 
+#define FAN_PIN            16   // C6 PWM3A
87 121
88 122 
 //
89 123 
 // Misc. Functions
90 124 
 //
91 
-#define SDSS               20  // PB0 - 8 in marlin env.
125 
+#define SDSS               20   // B0
92 126
93 127 
 // Extension header pin mapping
94 128 
 // ----------------------------
 
@@ -99,21 +133,21 @@
99 133 
 //  PWM-D24         A4 (An), IO
100 134 
 //  5V              GND
101 135 
 //  12V             GND
102 
-#define EXT_AUX_SCL_D0            0  // 0 (teensy), 24 (marlin)
103 
-#define EXT_AUX_SDA_D1            1  // 1 (teensy), 25 (marlin)
104 
-#define EXT_AUX_RX1_D2            26 // 2 (teensy), 26 (marlin)
105 
-#define EXT_AUX_TX1_D3            27 // 3 (teensy), 27 (marlin)
106 
-#define EXT_AUX_PWM_D24           12 // 24 (teensy), 12 (marlin)
107 
-#define EXT_AUX_A0                 0 // Analog
108 
-#define EXT_AUX_A0_IO             40 // Digital IO, 38 (teensy), 40 (marlin)
109 
-#define EXT_AUX_A1                 1 // Analog
110 
-#define EXT_AUX_A1_IO             41 // Digital IO, 39 (teensy), 41 (marlin)
111 
-#define EXT_AUX_A2                 2 // Analog
112 
-#define EXT_AUX_A2_IO             42 // Digital IO, 40 (teensy), 42 (marlin)
113 
-#define EXT_AUX_A3                 3 // Analog
114 
-#define EXT_AUX_A3_IO             43 // Digital IO, 41 (teensy), 43 (marlin)
115 
-#define EXT_AUX_A4                 4 // Analog
116 
-#define EXT_AUX_A4_IO             44 // Digital IO, 42 (teensy), 44 (marlin)
136 
+#define EXT_AUX_SCL_D0      0   // D0  PWM0B
137 
+#define EXT_AUX_SDA_D1      1   // D1
138 
+#define EXT_AUX_RX1_D2      2   // D2
139 
+#define EXT_AUX_TX1_D3      3   // D3
140 
+#define EXT_AUX_PWM_D24    24   // B4  PWM2A
141 
+#define EXT_AUX_A0          0   // F0  Analog Input
142 
+#define EXT_AUX_A0_IO      38   // F0  Digital IO
143 
+#define EXT_AUX_A1          1   // F1  Analog Input
144 
+#define EXT_AUX_A1_IO      39   // F1  Digital IO
145 
+#define EXT_AUX_A2          2   // F2  Analog Input
146 
+#define EXT_AUX_A2_IO      40   // F2  Digital IO
147 
+#define EXT_AUX_A3          3   // F3  Analog Input
148 
+#define EXT_AUX_A3_IO      41   // F3  Digital IO
149 
+#define EXT_AUX_A4          4   // F4  Analog Input
150 
+#define EXT_AUX_A4_IO      42   // F4  Digital IO
117 151
118 152 
 //
119 153 
 // LCD / Controller
 
@@ -128,28 +162,28 @@
128 162
129 163 
 #if ENABLED(SAV_3DLCD)
130 164 
   // For LCD SHIFT register LCD
131 
-  #define SR_DATA_PIN         EXT_AUX_SDA_D1
132 
-  #define SR_CLK_PIN          EXT_AUX_SCL_D0
133 
-#endif // SAV_3DLCD
165 
+  #define SR_DATA_PIN      EXT_AUX_SDA_D1
166 
+  #define SR_CLK_PIN       EXT_AUX_SCL_D0
167 
+#endif
134 168
135 169 
 #if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD)
136 170
137 
-  #define BTN_EN1            EXT_AUX_A1_IO
138 
-  #define BTN_EN2            EXT_AUX_A0_IO
139 
-  #define BTN_ENC            EXT_AUX_PWM_D24
171 
+  #define BTN_EN1          EXT_AUX_A1_IO
172 
+  #define BTN_EN2          EXT_AUX_A0_IO
173 
+  #define BTN_ENC          EXT_AUX_PWM_D24
140 174
141 
-  #define KILL_PIN           EXT_AUX_A2_IO
142 
-  #define HOME_PIN           EXT_AUX_A4_IO
175 
+  #define KILL_PIN         EXT_AUX_A2_IO
176 
+  #define HOME_PIN         EXT_AUX_A4_IO
143 177
144 
-#else // Try to use the expansion header for spindle control
178 
+#else // Use the expansion header for spindle control
145 179
146 180 
   //
147 181 
   // M3/M4/M5 - Spindle/Laser Control
148 182 
   //
149 
-  #define SPINDLE_LASER_PWM_PIN    24  // 12 AT90USB… pin #
150 
-  #define SPINDLE_LASER_ENABLE_PIN 39  // Pin should have a pullup!   41 AT90USB… pin #
151 
-  #define SPINDLE_DIR_PIN          40  // 42 AT90USB… pin #
183 
+  #define SPINDLE_LASER_PWM_PIN    24  // B4  PWM2A
184 
+  #define SPINDLE_LASER_ENABLE_PIN 39  // F1  Pin should have a pullup!
185 
+  #define SPINDLE_DIR_PIN          40  // F2
152 186
153 
-  #define CASE_LIGHT_PIN            0  // 24 AT90USB… pin #
187 
+  #define CASE_LIGHT_PIN            0  // D0  PWM0B
154 188
155 189 
 #endif

+ 80
- 44
Marlin/pins_TEENSY2.h View File 

@@ -1,6 +1,6 @@
1 1 
 /**
2 2 
  * Marlin 3D Printer Firmware
3 
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3 
+ * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4 
  *
5 5 
  * Based on Sprinter and grbl.
6 6 
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
 
@@ -21,12 +21,53 @@
21 21 
  */
22 22
23 23 
 /**
24 
+ *  Rev B  2 JUN 2017
25 
+ *
26 
+ *  Converted to Arduino pin numbering
27 
+ */
28 
+
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
35 
+ *
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
38 
+ *
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *
41 
+ *    Installation:
42 
+ *
43 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
44 
+ *          click on "Download ZIP" button.
45 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
46 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
47 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
48 
+ *       3. Restart Arduino.
49 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
50 
+ *
51 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
52 
+ *  the Teensyduino bootloader on it.
53 
+ */
54 
+
55 
+/**
56 
+ *  To burn the bootloader that comes with Printrboard:
57 
+ *
58 
+ *   1. Connect your programmer to the board.
59 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
60 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
61 
+ *   4. The programmer is no longer needed. Remove it.
62 
+ */
63 
+
64 
+/**
24 65 
  * Teensy++ 2.0 Breadboard pin assignments (AT90USB1286)
25 66 
  * Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE!
26 67 
  * http://www.pjrc.com/teensy/teensyduino.html
27 68 
  * See http://reprap.org/wiki/Printrboard for more info
28 69 
  *
29 
- * CLI build: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make
70 
+ * CLI build: HARDWARE_MOTHERBOARD=84 make
30 71 
  *
31 72 
  *  DaveX plan for Teensylu/printrboard-type pinouts for a TeensyBreadboard:
32 73 
  *  (ref teensylu & sprinter)
 
@@ -66,12 +107,7 @@
66 107 
  */
67 108
68 109 
 #ifndef __AVR_AT90USB1286__
69 
-  #error "Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
70 
-#endif
71 
-
72 
-#if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
73 
-  #error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config"
74 
-  // (or build from command line)
110 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
75 111 
 #endif
76 112
77 113 
 #define BOARD_NAME         "Teensy++2.0"
 
@@ -82,68 +118,68 @@
82 118 
 //
83 119 
 // Limit Switches
84 120 
 //
85 
-#define X_STOP_PIN          2
86 
-#define Y_STOP_PIN          3
87 
-#define Z_STOP_PIN          4
121 
+#define X_STOP_PIN          2   // D2
122 
+#define Y_STOP_PIN          3   // D3
123 
+#define Z_STOP_PIN          4   // D4
88 124
89 125 
 //
90 126 
 // Steppers
91 127 
 //
92 
-#define X_STEP_PIN         28 // 0 Marlin
93 
-#define X_DIR_PIN          29 // 1 Marlin
94 
-#define X_ENABLE_PIN       26
128 
+#define X_STEP_PIN         28   // A0 Marlin
129 
+#define X_DIR_PIN          29   // A1 Marlin
130 
+#define X_ENABLE_PIN       26   // B6
95 131
96 
-#define Y_STEP_PIN         30 // 2 Marlin
97 
-#define Y_DIR_PIN          31 // 3
98 
-#define Y_ENABLE_PIN       26 // Shared w/x
132 
+#define Y_STEP_PIN         30   // A2 Marlin
133 
+#define Y_DIR_PIN          31   // A3
134 
+#define Y_ENABLE_PIN       26   // B6 Shared w/x
99 135
100 
-#define Z_STEP_PIN         32 // 4
101 
-#define Z_DIR_PIN          33 // 5
102 
-#define Z_ENABLE_PIN       26 // Shared w/x
136 
+#define Z_STEP_PIN         32   // A4
137 
+#define Z_DIR_PIN          33   // A5
138 
+#define Z_ENABLE_PIN       26   // B6 Shared w/x
103 139
104 
-#define E0_STEP_PIN        34 // 6
105 
-#define E0_DIR_PIN         35 // 7
106 
-#define E0_ENABLE_PIN      26 // Shared w/x
140 
+#define E0_STEP_PIN        34   // A6
141 
+#define E0_DIR_PIN         35   // A7
142 
+#define E0_ENABLE_PIN      26   // B6 Shared w/x
107 143
108 144 
 //
109 145 
 // Temperature Sensors
110 146 
 //
111 
-#define TEMP_0_PIN          7   // Analog Input (Extruder)
112 
-#define TEMP_BED_PIN        6   // Analog Input (Bed)
147 
+#define TEMP_0_PIN          7   // F7 Analog Input (Extruder)
148 
+#define TEMP_BED_PIN        6   // F6 Analog Input (Bed)
113 149
114 150 
 //
115 151 
 // Heaters / Fans
116 152 
 //
117 
-#define HEATER_0_PIN       15 // 21 // Extruder
118 
-#define HEATER_BED_PIN     14 // 20 // Bed
119 
-#define FAN_PIN            16 // 22 // Fan
153 
+#define HEATER_0_PIN       15   // C5 PWM3B  Extruder
154 
+#define HEATER_BED_PIN     14   // C4 PWM3C
155 
+#define FAN_PIN            16   // C6 PWM3A  Fan
120 156
121 157 
 //
122 158 
 // Misc. Functions
123 159 
 //
124 
-#define SDSS               20 // 8
125 
-#define LED_PIN             6
126 
-#define PS_ON_PIN          27
127 
-#define CASE_LIGHT_PIN      1 // MUST BE HARDWARE PWM
160 
+#define SDSS               20   // B0
161 
+#define LED_PIN             6   // D6
162 
+#define PS_ON_PIN          27   // B7
163 
+#define CASE_LIGHT_PIN      1   // D1 PWM2B  MUST BE HARDWARE PWM
128 164
129 165 
 //
130 166 
 // LCD / Controller
131 167 
 //
132 168 
 #if ENABLED(ULTIPANEL)
133 
-  #define LCD_PINS_RS         8
134 
-  #define LCD_PINS_ENABLE     9
135 
-  #define LCD_PINS_D4        10
136 
-  #define LCD_PINS_D5        11
137 
-  #define LCD_PINS_D6        12
138 
-  #define LCD_PINS_D7        13
139 
-  #define BTN_EN1            38
140 
-  #define BTN_EN2            39
141 
-  #define BTN_ENC            40
169 
+  #define LCD_PINS_RS       8   // E0
170 
+  #define LCD_PINS_ENABLE   9   // E1
171 
+  #define LCD_PINS_D4      10   // C0
172 
+  #define LCD_PINS_D5      11   // C1
173 
+  #define LCD_PINS_D6      12   // C2
174 
+  #define LCD_PINS_D7      13   // C3
175 
+  #define BTN_EN1          38   // F0
176 
+  #define BTN_EN2          39   // F1
177 
+  #define BTN_ENC          40   // F2
142 178 
 #endif
143 179
144 180 
 //
145 181 
 // M3/M4/M5 - Spindle/Laser Control
146 182 
 //
147 
-#define SPINDLE_LASER_ENABLE_PIN  5 // Pin should have a pullup!
148 
-#define SPINDLE_LASER_PWM_PIN     0 // MUST BE HARDWARE PWM
149 
-#define SPINDLE_DIR_PIN           7
183 
+#define SPINDLE_LASER_ENABLE_PIN  5  // D5  Pin should have a pullup!
184 
+#define SPINDLE_LASER_PWM_PIN     0  // D0 PWM0B   MUST BE HARDWARE PWM
185 
+#define SPINDLE_DIR_PIN           7  // D7

+ 74
- 87
Marlin/pins_TEENSYLU.h View File 

@@ -21,54 +21,46 @@
21 21 
  */
22 22
23 23 
 /**
24 
- *  rev B    30 DEC 2016
24 
+ *  Rev C  2 JUN 2017
25 25 
  *
26 
- *  The original version of this file did NOT result in a useful program because:
27 
- *   1. The pin numbers assumed that the "#define AT90USBxx_TEENSYPP_ASSIGNMENTS" line
28 
- *      in FASTIO.h was commented out. There wasn't an Arduino IDE 1.6.x extension/package
29 
- *      that supported this pin map so the latest Marlin wouldn't compile.
30 
- *   2. The silkscreen for the four end stops don't agree with the schematic. Activating
31 
- *      the X endstop would tell the software that the Y endstop just went active.
32 
- *   3. The thermistor inputs also had heater names assigned to them. The result was
33 
- *      thermistor inputs that were set to digital outputs.
26 
+ *  Converted to Arduino pin numbering
27 
+ */
28 
+
29 
+/**
30 
+ *  There are two Arduino IDE extensions that are compatible with this board
31 
+ *  and with the mainstream Marlin software.  All have been used with Arduino 1.6.12
32 
+ *
33 
+ *  Teensyduino - http://www.pjrc.com/teensy/teensyduino.html
34 
+ *    Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu
34 35 
  *
35 
- *  Rev B corrects the above problems by:
36 
- *   1. The "Marlin_AT90USB" extension/package was developed.  This extension enables the
37 
- *      latest Marlin software to compile using Arduino IDE 1.6.x and 1.80.
38 
- *   2. The endstop pin numbers in this file were changed to match the silkscreen.  This
39 
- *      makes it a little confusing when trying to correlate the schematic with the pin
40 
- *      numbers used in this file.
41 
- *   3. The offending heater names were deleted.
36 
+ *    Installation instructions are at the above URL.  Don't bother loading the
37 
+ *    libraries - they are not used with the Marlin software.
42 38 
  *
43 
- *  To create a useable image for Teensylu do the following:
44 
- *   a) Install the Marlin_AT90USB extension with either of the following methods:
45 
- *        Automatic - paste this URL into preferences and then use Boards manager
46 
- *            https://rawgit.com/Bob-the-Kuhn/Marlin_AT90USB/master/package_MARLIN_AT90USB_index.json
47 
- *        Manual:
48 
- *           1. Copy the following URL into Go to "https://github.com/Bob-the-Kuhn/Marlin_AT90USB",
49 
- *              click on the "Clone or Download" button and then click on "Download ZIP" button.
50 
- *           2. Unzip the file, find the "Marlin_AT90USB" directory and then copy it to the
51 
- *              hardware directory in Arduino.  The Arduino hardware directory will probably be
52 
- *              located in a path similar to this: C:\Program Files (x86)\Arduino\hardware
53 
- *   b) Connect the USBtinyISP to the board.
54 
- *   c) In the Arduino IDE select the "AT90USB1286_STANDARD" board in the of the "Marlin_AT90USB"
55 
- *      section and select the "USBtinyISP" programmer.
56 
- *   d) In the Arduino IDE click on "burn bootloader".  Don't worry about the "verify
57 
- *      failed at 1F000" error message.
58 
- *   e) The USBtinyISP programmer is no longer needed.  Remove it.
59 
- *   f) In FASTIO.h comment out the "#define AT90USBxx_TEENSYPP_ASSIGNMENTS" line.
60 
- *   g) To upload a sketch do the following:
61 
- *       1. remove the jumper
62 
- *       2. press reset
63 
- *       3. click on the "upload" button in the Arduino IDE
64 
- *       4. wait until the upload finishes (less than a minute)
65 
- *       5. put the jumper back on
66 
- *       6. press the reset button
39 
+ *  Printrboard - https://github.com/scwimbush/Printrboard-HID-Arduino-IDE-Support
40 
+ *    This is basically Teensyduino but with a bootloader that can handle image sizes
41 
+ *    larger than 64K.
67 42 
  *
43 
+ *    Installation:
44 
+ *
45 
+ *       1. Go to the above URL, click on the "Clone or Download" button and then
46 
+ *          click on "Download ZIP" button.
47 
+ *       2. Unzip the file, find the "printrboard" directory and then copy it to the
48 
+ *          hardware directory in Arduino.  The Arduino hardware directory will probably
49 
+ *          be located in a path similar to this: C:\Program Files (x86)\Arduino\hardware.
50 
+ *       3. Restart Arduino.
51 
+ *       4. Select "Printrboard" from the 'Tools -> Boards' menu.
52 
+ *
53 
+ *  Teensyduino is the most popular option. Printrboard is used if your board doesn't have
54 
+ *  the Teensyduino bootloader on it.
55 
+ */
56 
+
57 
+/**
58 
+ *  To burn the bootloader that comes with Printrboard:
68 59 
  *
69 
- *  NOTE - the "Marlin_AT90USB" pin maps make PWM0A available rather than the usual PWM1C.
70 
- *         These PWMs share the same physical pin. Marlin uses TIMER1 to generate
71 
- *         interrupts and sets it up such that PWM1A, PWM1B & PWM1C can't be used.
60 
+ *   1. Connect your programmer to the board.
61 
+ *   2. In the Arduino IDE select "Printrboard" and then select the programmer.
62 
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
63 
+ *   4. The programmer is no longer needed. Remove it.
72 64 
  */
73 65
74 66 
  /**
 
@@ -81,13 +73,8 @@
81 73 
   *  The pin assignments in this file match the silkscreen.
82 74 
   */
83 75
84 
-
85 76 
 #if !defined(__AVR_AT90USB1286__) && !defined(__AVR_AT90USB1286P__)
86 
-  #error "Oops!  Make sure you have 'AT90USB1286_STANDARD' selected from the 'Tools -> Boards' menu."
87 
-#endif
88 
-
89 
-#if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)
90 
-  #error "please disable (comment out) the AT90USBxx_TEENSYPP_ASSIGNMENTS flag in FASTIO.h "
77 
+  #error "Oops!  Make sure you have 'Teensy++ 2.0' or 'Printrboard' selected from the 'Tools -> Boards' menu."
91 78 
 #endif
92 79
93 80 
 #define BOARD_NAME         "Teensylu"
 
@@ -97,60 +84,60 @@
97 84
98 85
99 86 
 //
100 
-// Limit Switche definitions that match the SCHEMATIC
87 
+// Limit Switch definitions that match the SCHEMATIC
101 88 
 //
102 
-//#define X_STOP_PIN              13
103 
-//#define Y_STOP_PIN              14
104 
-//#define Z_STOP_PIN              15
105 
-//#define E_STOP_PIN              36
89 
+//#define X_STOP_PIN              25   // B5
90 
+//#define Y_STOP_PIN              26   // B6
91 
+//#define Z_STOP_PIN              27   // B7
92 
+//#define E_STOP_PIN              36   // E4
106 93
107 94
108 95 
 //
109 96 
 // Limit Switch definitions that match the SILKSCREEN
110 97 
 //
111 
-#define X_STOP_PIN              14
112 
-#define Y_STOP_PIN              15
113 
-#define Z_STOP_PIN              36
114 
-//#define E_STOP_PIN              13
98 
+#define X_STOP_PIN              26   // B6
99 
+#define Y_STOP_PIN              27   // B7
100 
+#define Z_STOP_PIN              36   // E4
101 
+//#define E_STOP_PIN              25   // B5
115 102
116 103 
 //
117 104 
 // Steppers
118 105 
 //
119 
-#define X_STEP_PIN               0
120 
-#define X_DIR_PIN                1
121 
-#define X_ENABLE_PIN            39
106 
+#define X_STEP_PIN              28   // A0
107 
+#define X_DIR_PIN               29   // A1
108 
+#define X_ENABLE_PIN            19   // E7
122 109
123 
-#define Y_STEP_PIN               2
124 
-#define Y_DIR_PIN                3
125 
-#define Y_ENABLE_PIN            38
110 
+#define Y_STEP_PIN              30   // A2
111 
+#define Y_DIR_PIN               31   // A3
112 
+#define Y_ENABLE_PIN            18   // E6
126 113
127 
-#define Z_STEP_PIN               4
128 
-#define Z_DIR_PIN                5
129 
-#define Z_ENABLE_PIN            23
130 
-
131 
-#define E0_STEP_PIN              6
132 
-#define E0_DIR_PIN               7
133 
-#define E0_ENABLE_PIN           19
114 
+#define Z_STEP_PIN              32   // A4
115 
+#define Z_DIR_PIN               33   // A5
116 
+#define Z_ENABLE_PIN            17   // C7
134 117
118 
+#define E0_STEP_PIN             34   // A6
119 
+#define E0_DIR_PIN              35   // A7
120 
+#define E0_ENABLE_PIN           13   // C3
135 121
122 
+//
136 123 
 // Temperature Sensors
137 
-
138 
-#define TEMP_0_PIN               7  // Analog Input (Extruder)
139 
-#define TEMP_BED_PIN             6  // Analog Input (Bed)
124 
+//
125 
+#define TEMP_0_PIN               7   // Analog Input (Extruder)
126 
+#define TEMP_BED_PIN             6   // Analog Input (Bed)
140 127
141 128 
 //
142 129 
 // Heaters / Fans
143 130 
 //
144 
-#define HEATER_0_PIN            21  // Extruder
145 
-#define HEATER_BED_PIN          20
131 
+#define HEATER_0_PIN            15   // C5 PWM3B - Extruder
132 
+#define HEATER_BED_PIN          14   // C4 PWM3C
146 133
147 
-#define FAN_PIN                 22
134 
+#define FAN_PIN                 16   // C6 PWM3A
148 135
149 136 
 //
150 137 
 // Misc. Functions
151 138 
 //
152 
-#define SDSS                     8
153 
-#define CASE_LIGHT_PIN          24
139 
+#define SDSS                    20   // B0 JP31-6
140 
+#define CASE_LIGHT_PIN           0   // D0 IO-14  PWM0B
154 141
155 142 
 //
156 143 
 // LCD / Controller
 
@@ -160,11 +147,11 @@
160 147 
   #define BEEPER_PIN            -1
161 148
162 149 
   #if ENABLED(LCD_I2C_PANELOLU2)
163 
-    #define BTN_EN1             27
164 
-    #define BTN_EN2             26
165 
-    #define BTN_ENC             43
166 
-    #define SDSS                40  // use SD card on Panelolu2
167 
-  #endif // LCD_I2C_PANELOLU2
150 
+    #define BTN_EN1              3   // D3 IO-8
151 
+    #define BTN_EN2              2   // D2 IO-10
152 
+    #define BTN_ENC             41   // F3 IO-7
153 
+    #define SDSS                38   // F0 IO-13 use SD card on Panelolu2
154 
+  #endif
168 155
169 156 
   #define SD_DETECT_PIN         -1
170 157 
 
@@ -173,6 +160,6 @@
173 160 
 //
174 161 
 // M3/M4/M5 - Spindle/Laser Control
175 162 
 //
176 
-#define SPINDLE_LASER_PWM_PIN    12  // MUST BE HARDWARE PWM
177 
-#define SPINDLE_LASER_ENABLE_PIN 41  // Pin should have a pullup!
178 
-#define SPINDLE_DIR_PIN          42
163 
+#define SPINDLE_LASER_PWM_PIN    24   // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
164 
+#define SPINDLE_LASER_ENABLE_PIN 39   // F1 IO-11 - Pin should have a pullup!
165 
+#define SPINDLE_DIR_PIN          40   // F2 IO-9

Write Preview
Loading…
Cancel
Save