Browse Source

Teensy pins cleanup

Scott Lahteine 3 years ago
parent
commit
93421f3a00

+ 1
- 10
Marlin/src/pins/teensy3/pins_TEENSY31_32.h View File

@@ -35,9 +35,6 @@
35 35
   #define BOARD_INFO_NAME "Teensy3.2"
36 36
 #endif
37 37
 
38
-#define AT90USB                              1286 // Disable MarlinSerial etc.
39
-#define USBCON //1286  // Disable MarlinSerial etc.
40
-
41 38
 //
42 39
 // Limit Switches
43 40
 //
@@ -92,20 +89,14 @@
92 89
 //
93 90
 // Misc. Functions
94 91
 //
95
-
96
-//#define SDSS                                16  // 8
97 92
 #define LED_PIN                               13
98
-
99 93
 //#define SOL1_PIN                            28
94
+//#define SDSS                                16  // 8
100 95
 
101 96
 //
102 97
 // LCD / Controller
103 98
 //
104 99
 
105
-//#define SCK_PIN                             13
106
-//#define MISO_PIN                            12
107
-//#define MOSI_PIN                            11
108
-
109 100
 /*
110 101
 #if HAS_SPI_LCD
111 102
   #define LCD_PINS_RS                         40

+ 45
- 55
Marlin/src/pins/teensy3/pins_TEENSY35_36.h View File

@@ -37,48 +37,44 @@
37 37
   #define BOARD_INFO_NAME "Teensy3.6"
38 38
 #endif
39 39
 
40
-#define AT90USB                              1286 // Disable MarlinSerial etc.
41
-#define USBCON //1286  // Disable MarlinSerial etc.
42
-/*
43
-
44
-  teemuatlut plan for Teensy3.5 and Teensy3.6:
45
-                                                     USB
46
-                                          GND |-----#####-----| VIN 5V
47
-      X_STEP_PIN          MOSI1   RX1       0 |     #####     | Analog GND
48
-      X_DIR_PIN           MISO1   TX1       1 |               | 3.3V
49
-      Y_STEP_PIN                       PWM  2 | *NC     AREF* | 23  A9 PWM
50
-      Y_DIR_PIN           SCL2 CAN0TX  PWM  3 | *A26     A10* | 22  A8 PWM
51
-      Z_STEP_PIN          SDA2 CAN0RX  PWM  4 | *A25     A11* | 21  A7 PWM  CS0   MOSI1  RX1
52
-      Z_DIR_PIN           MISO1   TX1  PWM  5 | *GND * * 57   | 20  A6 PWM  CS0   SCK1        FILWIDTH_PIN
53
-      X_ENABLE_PIN                     PWM  6 | *GND * * 56   | 19  A5            SCL0        E0_STEP_PIN
54
-      Y_ENABLE_PIN  SCL0  MOSI0   RX3  PWM  7 |      * * 55   | 18  A4            SDA0        E0_DIR_PIN
55
-      Z_ENABLE_PIN  SDA0  MISO0   TX3  PWM  8 |      * * 54   | 17  A3            SDA0        E0_ENABLE_PIN
56
-                          CS0     RX2  PWM  9 |               | 16  A2            SCL0        TEMP_0_PIN
57
-                          CS0     TX2  PWM 10 |               | 15  A1      CS0               TEMP_BED_PIN
58
-      X_STOP_PIN          MOSI0            11 |               | 14  A0 PWM  CS0               TEMP_1_PIN
59
-      Y_STOP_PIN          MISO0            12 |               | 13 LED            SCK0        LED_PIN
60
-                                         3.3V |               | GND
61
-      Z_STOP_PIN                           24 |   40 * * 53   |    A22 DAC1
62
-AUX2                                       25 |   41 * * 52   |    A21 DAC0
63
-AUX2  FAN_PIN             SCL2    TX1      26 |   42 * * 51   | 39 A20      MISO0             SDSS
64
-AUX2  Z-PROBE PWR         SCK0    RX1      27 | *  *  *  *  * | 38 A19 PWM        SDA1
65
-AUX2  SOL1_PIN            MOSI0            28 |   43 * * 50   | 37 A18 PWM        SCL1
66
-D10   CONTROLLER_FAN_PIN  CAN0TX       PWM 29 |   44 * * 49   | 36 A17 PWM
67
-D9    HEATER_0_PIN        CAN0RX       PWM 30 |   45 * * 48   | 35 A16 PWM                    E1_ENABLE_PIN
68
-D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM        SDA0  RX5   E1_DIR_PIN
69
-                          SCK1    TX4  A13 32 |__GND_*_*_3.3V_| 33 A14 PWM        SCL0  TX5   E1_STEP_PIN
70
-
71
-          Interior pins:
72
-                          LCD_PINS_RS             40 * * 53   SCK2
73
-                          LCD_PINS_ENABLE         41 * * 52   MOSI2
74
-                          LCD_PINS_D4             42 * * 51   MISO2
75
-                          LCD_PINS_D5     CS2     43 * * 50   A24
76
-                          LCD_PINS_D6     MOSI2   44 * * 49   A23
77
-                          LCD_PINS_D7     MISO2   45 * * 48   TX6   SDA0  BTN_ENC
78
-                          BTN_EN1         SCK2    46 * * 47   RX6   SCL0  BTN_EN2
79
-                                                 GND * * 3.3V
80
-
81
-*/
40
+/**
41
+ * Plan for Teensy 3.5 and Teensy 3.6:
42
+ *                                                       USB
43
+ *                                            GND |-----#####-----| VIN 5V
44
+ *        X_STEP_PIN          MOSI1   RX1       0 |     #####     | Analog GND
45
+ *        X_DIR_PIN           MISO1   TX1       1 |               | 3.3V
46
+ *        Y_STEP_PIN                       PWM  2 | *NC     AREF* | 23  A9 PWM
47
+ *        Y_DIR_PIN           SCL2 CAN0TX  PWM  3 | *A26     A10* | 22  A8 PWM
48
+ *        Z_STEP_PIN          SDA2 CAN0RX  PWM  4 | *A25     A11* | 21  A7 PWM  CS0   MOSI1  RX1
49
+ *        Z_DIR_PIN           MISO1   TX1  PWM  5 | *GND * * 57   | 20  A6 PWM  CS0   SCK1        FILWIDTH_PIN
50
+ *        X_ENABLE_PIN                     PWM  6 | *GND * * 56   | 19  A5            SCL0        E0_STEP_PIN
51
+ *        Y_ENABLE_PIN  SCL0  MOSI0   RX3  PWM  7 |      * * 55   | 18  A4            SDA0        E0_DIR_PIN
52
+ *        Z_ENABLE_PIN  SDA0  MISO0   TX3  PWM  8 |      * * 54   | 17  A3            SDA0        E0_ENABLE_PIN
53
+ *                            CS0     RX2  PWM  9 |               | 16  A2            SCL0        TEMP_0_PIN
54
+ *                            CS0     TX2  PWM 10 |               | 15  A1      CS0               TEMP_BED_PIN
55
+ *        X_STOP_PIN          MOSI0            11 |               | 14  A0 PWM  CS0               TEMP_1_PIN
56
+ *        Y_STOP_PIN          MISO0            12 |               | 13 LED            SCK0        LED_PIN
57
+ *                                           3.3V |               | GND
58
+ *        Z_STOP_PIN                           24 |   40 * * 53   |    A22 DAC1
59
+ *  AUX2                                       25 |   41 * * 52   |    A21 DAC0
60
+ *  AUX2  FAN_PIN             SCL2    TX1      26 |   42 * * 51   | 39 A20      MISO0             SDSS
61
+ *  AUX2  Z-PROBE PWR         SCK0    RX1      27 | *  *  *  *  * | 38 A19 PWM        SDA1
62
+ *  AUX2  SOL1_PIN            MOSI0            28 |   43 * * 50   | 37 A18 PWM        SCL1
63
+ *  D10   CONTROLLER_FAN_PIN  CAN0TX       PWM 29 |   44 * * 49   | 36 A17 PWM
64
+ *  D9    HEATER_0_PIN        CAN0RX       PWM 30 |   45 * * 48   | 35 A16 PWM                    E1_ENABLE_PIN
65
+ *  D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM        SDA0  RX5   E1_DIR_PIN
66
+ *                            SCK1    TX4  A13 32 |__GND_*_*_3.3V_| 33 A14 PWM        SCL0  TX5   E1_STEP_PIN
67
+ *
68
+ *            Interior pins:
69
+ *                            LCD_PINS_RS             40 * * 53   SCK2
70
+ *                            LCD_PINS_ENABLE         41 * * 52   MOSI2
71
+ *                            LCD_PINS_D4             42 * * 51   MISO2
72
+ *                            LCD_PINS_D5     CS2     43 * * 50   A24
73
+ *                            LCD_PINS_D6     MOSI2   44 * * 49   A23
74
+ *                            LCD_PINS_D7     MISO2   45 * * 48   TX6   SDA0  BTN_ENC
75
+ *                            BTN_EN1         SCK2    46 * * 47   RX6   SCL0  BTN_EN2
76
+ *                                                   GND * * 3.3V
77
+ */
82 78
 
83 79
 //
84 80
 // Limit Switches
@@ -121,24 +117,18 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
121 117
 #define TEMP_1_PIN                             0
122 118
 #define TEMP_BED_PIN                           1  // Bed / Analog pin numbering
123 119
 
124
-#define SDSS                                  39  // 8
120
+//
121
+// Misc. Functions
122
+//
125 123
 #define LED_PIN                               13
126 124
 #define PS_ON_PIN                              1
127
-#define ALARM_PIN                             -1
128
-
129 125
 #define FILWIDTH_PIN                           6
130 126
 #define SOL1_PIN                              28
131 127
 
132
-#if 0
133
-// Pretty sure this is obsolete!
134
-// Please use Marlin 1.1.x pins files as reference for new pins files.
135
-#ifndef SDSUPPORT
136
-  // these are defined in the SD library if building with SD support
137
-  #define SCK_PIN                             13
138
-  #define MISO_PIN                            12
139
-  #define MOSI_PIN                            11
140
-#endif
141
-#endif
128
+//
129
+// SD Card
130
+//
131
+#define SDSS                                  39  // 8
142 132
 
143 133
 #if HAS_SPI_LCD
144 134
   #define LCD_PINS_RS                         40

+ 45
- 38
Marlin/src/pins/teensy4/pins_T41U5XBB.h View File

@@ -33,39 +33,44 @@
33 33
   #define BOARD_INFO_NAME "Teensy4.1"
34 34
 #endif
35 35
 
36
-#define AT90USB          1286  // Disable MarlinSerial etc.
37
-#define USBCON         //1286  // Disable MarlinSerial etc.
38
-/*
39
-
40
-   plan for Teensy4.0 and Teensy4.1:
41
-                                                     USB
42
-                                          GND |-----#####-----| VIN (3.65 TO 5.5V)
43
-      RX1                 CS1     RX1  PWM  0 |     #####     | GND
44
-      TX1                 MISO1   TX1  PWM  1 |               | 3.3V
45
-      STPX                             PWM  2 |               | 23  A9 PWM
46
-      DIRX                             PWM  3 |               | 22  A8 PWM              LIMZ
47
-      STPY                             PWM  4 |               | 21  A7      RX5         LIMY
48
-      DIRY                             PWM  5 |               | 20  A6      TX5         LIMX
49
-      STPZ                             PWM  6 |               | 19  A5 PWM        SCL0  COOL
50
-      DIRZ                        RX2  PWM  7 |               | 18  A4 PWM        SDA0  MIST
51
-      STPA                        TX2  PWM  8 |               | 17  A3      RX4   SDA1  CYST
52
-      DIRA                             PWM  9 |               | 16  A2      TX4   SCL1  EHOLD
53
-      STEN                             PWM 10 |               | 15  A1 PWM  RX3         PRB
54
-      SPDI                MOSI0        PWM 11 |               | 14  A0 PWM  TX3         PANIC
55
-      SPEN                MISO0        PWM 12 |               | 13 LED PWM  SCK0        SPWM
56
-                                         3.3V |               | GND
57
-      SCL                              PWM 24 |               | 41 A17                  KPSTR
58
-      SDA                              PWM 25 |               | 40 A16                  STENY
59
-      STPB                MOSI1            26 |               | 39 A15      MISO1       STENZ
60
-      DIRB                SCK1             27 | *  *  *  *  * | 38 A14                  STENA
61
-      LIMB                        RX7  PWM 28 |               | 37     PWM              STENB
62
-      DOOR                        TX7  PWM 29 |               | 36     PWM              ST0
63
-      ST1                                  30 |               | 35          TX8         ST3
64
-      AUX0                                 31 |    SDCARD     | 34          RX8         ST2
65
-      AUX1                                 32 |_______________| 33     PWM              AUX2
36
+/**
37
+ * Plan for Teensy 4.0 and Teensy 4.1:
38
+ *                                     USB
39
+ *                          GND |-----#####-----| VIN (3.65 TO 5.5V)
40
+ *    RX1   CS1     RX1  PWM  0 |     #####     | GND
41
+ *    TX1   MISO1   TX1  PWM  1 |               | 3.3V
42
+ *    STPX               PWM  2 |               | 23  A9 PWM
43
+ *    DIRX               PWM  3 |               | 22  A8 PWM              LIMZ
44
+ *    STPY               PWM  4 |               | 21  A7      RX5         LIMY
45
+ *    DIRY               PWM  5 |               | 20  A6      TX5         LIMX
46
+ *    STPZ               PWM  6 |               | 19  A5 PWM        SCL0  COOL
47
+ *    DIRZ          RX2  PWM  7 |               | 18  A4 PWM        SDA0  MIST
48
+ *    STPA          TX2  PWM  8 |               | 17  A3      RX4   SDA1  CYST
49
+ *    DIRA               PWM  9 |               | 16  A2      TX4   SCL1  EHOLD
50
+ *    STEN               PWM 10 |               | 15  A1 PWM  RX3         PRB
51
+ *    SPDI  MOSI0        PWM 11 |               | 14  A0 PWM  TX3         PANIC
52
+ *    SPEN  MISO0        PWM 12 |               | 13 LED PWM  SCK0        SPWM
53
+ *                         3.3V |               | GND
54
+ *    SCL                PWM 24 |               | 41 A17                  KPSTR
55
+ *    SDA                PWM 25 |               | 40 A16                  STENY
56
+ *    STPB  MOSI1            26 |               | 39 A15      MISO1       STENZ
57
+ *    DIRB  SCK1             27 | *  *  *  *  * | 38 A14                  STENA
58
+ *    LIMB          RX7  PWM 28 |               | 37     PWM              STENB
59
+ *    DOOR          TX7  PWM 29 |               | 36     PWM              ST0
60
+ *    ST1                    30 |               | 35          TX8         ST3
61
+ *    AUX0                   31 |    SDCARD     | 34          RX8         ST2
62
+ *    AUX1                   32 |_______________| 33     PWM              AUX2
63
+ */
66 64
 
65
+#ifndef SDCARD_CONNECTION
66
+  #define SDCARD_CONNECTION              ONBOARD
67
+#endif
67 68
 
68
-*/
69
+//
70
+// Servos
71
+//
72
+#define SERVO0_PIN                            24
73
+#define SERVO1_PIN                            25
69 74
 
70 75
 //
71 76
 // Limit Switches
@@ -100,20 +105,22 @@
100 105
 #define E1_DIR_PIN                            27
101 106
 #define E1_ENABLE_PIN                         37
102 107
 
108
+//
109
+// Heaters / Fans
110
+//
103 111
 #define HEATER_0_PIN                          31
104 112
 #define HEATER_1_PIN                          32
105 113
 #define HEATER_BED_PIN                        33
106 114
 
115
+//
116
+// Temperature Sensors
117
+//
107 118
 #define TEMP_0_PIN                             5  // Extruder / Analog pin numbering: 2 => A2
108 119
 #define TEMP_1_PIN                             4
109 120
 #define TEMP_BED_PIN                          15  // Bed / Analog pin numbering
110 121
 
122
+//
123
+// Misc. Functions
124
+//
111 125
 #define LED_PIN                               13
112
-
113 126
 #define SOL0_PIN                              17
114
-#define SERVO0_PIN                            24
115
-#define SERVO1_PIN                            25
116
-
117
-#ifndef SDCARD_CONNECTION
118
-  #define SDCARD_CONNECTION              ONBOARD
119
-#endif

+ 43
- 41
Marlin/src/pins/teensy4/pins_TEENSY41.h View File

@@ -33,39 +33,40 @@
33 33
   #define BOARD_INFO_NAME "Teensy4.1"
34 34
 #endif
35 35
 
36
-#define AT90USB          1286  // Disable MarlinSerial etc.
37
-#define USBCON         //1286  // Disable MarlinSerial etc.
38
-/*
39
-
40
-   plan for Teensy4.0 and Teensy4.1:
41
-                                                     USB
42
-                                          GND |-----#####-----| VIN (3.65 TO 5.5V)
43
-      X_STEP_PIN          CS1     RX1  PWM  0 |     #####     | GND
44
-      X_DIR_PIN           MISO1   TX1  PWM  1 |               | 3.3V
45
-      Y_STEP_PIN                       PWM  2 |               | 23  A9 PWM              SERVO1_PIN
46
-      Y_DIR_PIN                        PWM  3 |               | 22  A8 PWM              SERVO0_PIN
47
-      Z_STEP_PIN                       PWM  4 |               | 21  A7      RX5
48
-      Z_DIR_PIN                        PWM  5 |               | 20  A6      TX5         FILWIDTH_PIN
49
-      X_ENABLE_PIN                     PWM  6 |               | 19  A5 PWM        SCL0
50
-      Y_ENABLE_PIN                RX2  PWM  7 |               | 18  A4 PWM        SDA0  HEATER_1_PIN
51
-      Z_ENABLE_PIN                TX2  PWM  8 |               | 17  A3      RX4   SDA1
52
-      E0_STEP_PIN                      PWM  9 |               | 16  A2      TX4   SCL1  TEMP_0_PIN
53
-      E0_DIR_PIN                       PWM 10 |               | 15  A1 PWM  RX3         TEMP_BED_PIN
54
-      MOSI_PIN            MOSI0        PWM 11 |               | 14  A0 PWM  TX3         TEMP_1_PIN
55
-      MISO_PIN            MISO0        PWM 12 |               | 13 LED PWM  SCK0        SCK_PIN
56
-                                         3.3V |               | GND
57
-      Z_STOP_PIN                       PWM 24 |               | 41 A17
58
-      E0_ENABLE_PIN                    PWM 25 |               | 40 A16
59
-      FAN_PIN             MOSI1            26 |               | 39 A15      MISO1       X_STOP_PIN
60
-      Z-PROBE PWR         SCK1             27 | *  *  *  *  * | 38 A14                  Y_STOP_PIN
61
-      SOL1_PIN                    RX7  PWM 28 |               | 37     PWM              HEATER_0_PIN
62
-      FAN_PIN                     TX7  PWM 29 |               | 36     PWM              HEATER_BED_PIN
63
-      X_CS_PIN                             30 |               | 35          TX8         E1_ENABLE_PIN
64
-      y_CS_PIN                             31 |    SDCARD     | 34          RX8         E1_DIR_PIN
65
-      Z_CS_PIN                             32 |_______________| 33     PWM              E1_STEP_PIN
66
-
36
+/**
37
+ * Plan for Teensy 4.0 and Teensy 4.1:
38
+ *                                            USB
39
+ *                                 GND |-----#####-----| VIN (3.65 TO 5.5V)
40
+ *  X_STEP_PIN     CS1     RX1  PWM  0 |     #####     | GND
41
+ *  X_DIR_PIN      MISO1   TX1  PWM  1 |               | 3.3V
42
+ *  Y_STEP_PIN                  PWM  2 |               | 23  A9 PWM              SERVO1_PIN
43
+ *  Y_DIR_PIN                   PWM  3 |               | 22  A8 PWM              SERVO0_PIN
44
+ *  Z_STEP_PIN                  PWM  4 |               | 21  A7      RX5
45
+ *  Z_DIR_PIN                   PWM  5 |               | 20  A6      TX5         FILWIDTH_PIN
46
+ *  X_ENABLE_PIN                PWM  6 |               | 19  A5 PWM        SCL0
47
+ *  Y_ENABLE_PIN           RX2  PWM  7 |               | 18  A4 PWM        SDA0  HEATER_1_PIN
48
+ *  Z_ENABLE_PIN           TX2  PWM  8 |               | 17  A3      RX4   SDA1
49
+ *  E0_STEP_PIN                 PWM  9 |               | 16  A2      TX4   SCL1  TEMP_0_PIN
50
+ *  E0_DIR_PIN                  PWM 10 |               | 15  A1 PWM  RX3         TEMP_BED_PIN
51
+ *  MOSI_PIN       MOSI0        PWM 11 |               | 14  A0 PWM  TX3         TEMP_1_PIN
52
+ *  MISO_PIN       MISO0        PWM 12 |               | 13 LED PWM  SCK0        SCK_PIN
53
+ *                                3.3V |               | GND
54
+ *  Z_STOP_PIN                  PWM 24 |               | 41 A17
55
+ *  E0_ENABLE_PIN               PWM 25 |               | 40 A16
56
+ *  FAN_PIN        MOSI1            26 |               | 39 A15      MISO1       X_STOP_PIN
57
+ *  Z-PROBE PWR    SCK1             27 | *  *  *  *  * | 38 A14                  Y_STOP_PIN
58
+ *  SOL1_PIN               RX7  PWM 28 |               | 37     PWM              HEATER_0_PIN
59
+ *  FAN_PIN                TX7  PWM 29 |               | 36     PWM              HEATER_BED_PIN
60
+ *  X_CS_PIN                        30 |               | 35          TX8         E1_ENABLE_PIN
61
+ *  y_CS_PIN                        31 |    SDCARD     | 34          RX8         E1_DIR_PIN
62
+ *  Z_CS_PIN                        32 |_______________| 33     PWM              E1_STEP_PIN
63
+ */
67 64
 
68
-*/
65
+//
66
+// Servos
67
+//
68
+#define SERVO0_PIN                            22
69
+#define SERVO1_PIN                            23
69 70
 
70 71
 //
71 72
 // Limit Switches
@@ -100,6 +101,9 @@
100 101
 #define E1_DIR_PIN                            34
101 102
 #define E1_ENABLE_PIN                         35
102 103
 
104
+//
105
+// Heaters / Fans
106
+//
103 107
 #define HEATER_0_PIN                          37
104 108
 #define HEATER_1_PIN                          18
105 109
 #define HEATER_BED_PIN                        36
@@ -107,22 +111,20 @@
107 111
   #define FAN_PIN                             29
108 112
 #endif
109 113
 
114
+//
115
+// Temperature Sensors
116
+//
110 117
 #define TEMP_0_PIN                             2  // Extruder / Analog pin numbering: 2 => A2
111 118
 #define TEMP_1_PIN                             0
112 119
 #define TEMP_BED_PIN                           1  // Bed / Analog pin numbering
113 120
 
121
+//
122
+// Misc. Functions
123
+//
114 124
 #define LED_PIN                               13
125
+#define SOL0_PIN                              28
115 126
 //#define PS_ON_PIN                              1
116
-//#define ALARM_PIN                             -1
117
-
118 127
 //#define FILWIDTH_PIN                           6  // A6
119
-#define SOL0_PIN                              28
120
-#define SERVO0_PIN                            22
121
-#define SERVO1_PIN                            23
122
-
123
-//#define SCK_PIN                               13
124
-//#define MISO_PIN                              12
125
-//#define MOSI_PIN                              11
126 128
 
127 129
 #ifndef SDCARD_CONNECTION
128 130
   #define SDCARD_CONNECTION              ONBOARD

Loading…
Cancel
Save