zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Teensy pins cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-09-23 15:33:54 -05:00
parent 632ac54440
commit 8b69d697dd
4 changed files with 135 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/pins/teensy3/pins_TEENSY31_32.h
View file

@ -35,9 +35,6 @@
#define BOARD_INFO_NAME "Teensy3.2" #define BOARD_INFO_NAME "Teensy3.2"
#endif #endif
#define AT90USB 1286 // Disable MarlinSerial etc.
#define USBCON //1286 // Disable MarlinSerial etc.
// //
// Limit Switches // Limit Switches
// //
@ -92,20 +89,14 @@
// //
// Misc. Functions // Misc. Functions
// //
//#define SDSS 16 // 8
#define LED_PIN 13 #define LED_PIN 13
//#define SOL1_PIN 28 //#define SOL1_PIN 28
//#define SDSS 16 // 8
// //
// LCD / Controller // LCD / Controller
// //
//#define SCK_PIN 13
//#define MISO_PIN 12
//#define MOSI_PIN 11
/* /*
#if HAS_SPI_LCD #if HAS_SPI_LCD
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40

100
Marlin/src/pins/teensy3/pins_TEENSY35_36.h
View file

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

83
Marlin/src/pins/teensy4/pins_T41U5XBB.h
View file

@ -33,39 +33,44 @@
#define BOARD_INFO_NAME "Teensy4.1" #define BOARD_INFO_NAME "Teensy4.1"
#endif #endif
#define AT90USB 1286 // Disable MarlinSerial etc. /**
#define USBCON //1286 // Disable MarlinSerial etc. * Plan for Teensy 4.0 and Teensy 4.1:
/* * USB
* GND |-----#####-----| VIN (3.65 TO 5.5V)
* RX1 CS1 RX1 PWM 0 | ##### | GND
* TX1 MISO1 TX1 PWM 1 | | 3.3V
* STPX PWM 2 | | 23 A9 PWM
* DIRX PWM 3 | | 22 A8 PWM LIMZ
* STPY PWM 4 | | 21 A7 RX5 LIMY
* DIRY PWM 5 | | 20 A6 TX5 LIMX
* STPZ PWM 6 | | 19 A5 PWM SCL0 COOL
* DIRZ RX2 PWM 7 | | 18 A4 PWM SDA0 MIST
* STPA TX2 PWM 8 | | 17 A3 RX4 SDA1 CYST
* DIRA PWM 9 | | 16 A2 TX4 SCL1 EHOLD
* STEN PWM 10 | | 15 A1 PWM RX3 PRB
* SPDI MOSI0 PWM 11 | | 14 A0 PWM TX3 PANIC
* SPEN MISO0 PWM 12 | | 13 LED PWM SCK0 SPWM
* 3.3V | | GND
* SCL PWM 24 | | 41 A17 KPSTR
* SDA PWM 25 | | 40 A16 STENY
* STPB MOSI1 26 | | 39 A15 MISO1 STENZ
* DIRB SCK1 27 | * * * * * | 38 A14 STENA
* LIMB RX7 PWM 28 | | 37 PWM STENB
* DOOR TX7 PWM 29 | | 36 PWM ST0
* ST1 30 | | 35 TX8 ST3
* AUX0 31 | SDCARD | 34 RX8 ST2
* AUX1 32 |_______________| 33 PWM AUX2
*/
plan for Teensy4.0 and Teensy4.1: #ifndef SDCARD_CONNECTION
USB #define SDCARD_CONNECTION ONBOARD
GND |-----#####-----| VIN (3.65 TO 5.5V) #endif
RX1 CS1 RX1 PWM 0 | ##### | GND
TX1 MISO1 TX1 PWM 1 | | 3.3V
STPX PWM 2 | | 23 A9 PWM
DIRX PWM 3 | | 22 A8 PWM LIMZ
STPY PWM 4 | | 21 A7 RX5 LIMY
DIRY PWM 5 | | 20 A6 TX5 LIMX
STPZ PWM 6 | | 19 A5 PWM SCL0 COOL
DIRZ RX2 PWM 7 | | 18 A4 PWM SDA0 MIST
STPA TX2 PWM 8 | | 17 A3 RX4 SDA1 CYST
DIRA PWM 9 | | 16 A2 TX4 SCL1 EHOLD
STEN PWM 10 | | 15 A1 PWM RX3 PRB
SPDI MOSI0 PWM 11 | | 14 A0 PWM TX3 PANIC
SPEN MISO0 PWM 12 | | 13 LED PWM SCK0 SPWM
3.3V | | GND
SCL PWM 24 | | 41 A17 KPSTR
SDA PWM 25 | | 40 A16 STENY
STPB MOSI1 26 | | 39 A15 MISO1 STENZ
DIRB SCK1 27 | * * * * * | 38 A14 STENA
LIMB RX7 PWM 28 | | 37 PWM STENB
DOOR TX7 PWM 29 | | 36 PWM ST0
ST1 30 | | 35 TX8 ST3
AUX0 31 | SDCARD | 34 RX8 ST2
AUX1 32 |_______________| 33 PWM AUX2
//
*/ // Servos
//
#define SERVO0_PIN 24
#define SERVO1_PIN 25
// //
// Limit Switches // Limit Switches
@ -100,20 +105,22 @@
#define E1_DIR_PIN 27 #define E1_DIR_PIN 27
#define E1_ENABLE_PIN 37 #define E1_ENABLE_PIN 37
//
// Heaters / Fans
//
#define HEATER_0_PIN 31 #define HEATER_0_PIN 31
#define HEATER_1_PIN 32 #define HEATER_1_PIN 32
#define HEATER_BED_PIN 33 #define HEATER_BED_PIN 33
//
// Temperature Sensors
//
#define TEMP_0_PIN 5 // Extruder / Analog pin numbering: 2 => A2 #define TEMP_0_PIN 5 // Extruder / Analog pin numbering: 2 => A2
#define TEMP_1_PIN 4 #define TEMP_1_PIN 4
#define TEMP_BED_PIN 15 // Bed / Analog pin numbering #define TEMP_BED_PIN 15 // Bed / Analog pin numbering
//
// Misc. Functions
//
#define LED_PIN 13 #define LED_PIN 13
#define SOL0_PIN 17 #define SOL0_PIN 17
#define SERVO0_PIN 24
#define SERVO1_PIN 25
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif

86
Marlin/src/pins/teensy4/pins_TEENSY41.h
View file

@ -33,39 +33,40 @@
#define BOARD_INFO_NAME "Teensy4.1" #define BOARD_INFO_NAME "Teensy4.1"
#endif #endif
#define AT90USB 1286 // Disable MarlinSerial etc. /**
#define USBCON //1286 // Disable MarlinSerial etc. * Plan for Teensy 4.0 and Teensy 4.1:
/* * USB
* GND |-----#####-----| VIN (3.65 TO 5.5V)
* X_STEP_PIN CS1 RX1 PWM 0 | ##### | GND
* X_DIR_PIN MISO1 TX1 PWM 1 | | 3.3V
* Y_STEP_PIN PWM 2 | | 23 A9 PWM SERVO1_PIN
* Y_DIR_PIN PWM 3 | | 22 A8 PWM SERVO0_PIN
* Z_STEP_PIN PWM 4 | | 21 A7 RX5
* Z_DIR_PIN PWM 5 | | 20 A6 TX5 FILWIDTH_PIN
* X_ENABLE_PIN PWM 6 | | 19 A5 PWM SCL0
* Y_ENABLE_PIN RX2 PWM 7 | | 18 A4 PWM SDA0 HEATER_1_PIN
* Z_ENABLE_PIN TX2 PWM 8 | | 17 A3 RX4 SDA1
* E0_STEP_PIN PWM 9 | | 16 A2 TX4 SCL1 TEMP_0_PIN
* E0_DIR_PIN PWM 10 | | 15 A1 PWM RX3 TEMP_BED_PIN
* MOSI_PIN MOSI0 PWM 11 | | 14 A0 PWM TX3 TEMP_1_PIN
* MISO_PIN MISO0 PWM 12 | | 13 LED PWM SCK0 SCK_PIN
* 3.3V | | GND
* Z_STOP_PIN PWM 24 | | 41 A17
* E0_ENABLE_PIN PWM 25 | | 40 A16
* FAN_PIN MOSI1 26 | | 39 A15 MISO1 X_STOP_PIN
* Z-PROBE PWR SCK1 27 | * * * * * | 38 A14 Y_STOP_PIN
* SOL1_PIN RX7 PWM 28 | | 37 PWM HEATER_0_PIN
* FAN_PIN TX7 PWM 29 | | 36 PWM HEATER_BED_PIN
* X_CS_PIN 30 | | 35 TX8 E1_ENABLE_PIN
* y_CS_PIN 31 | SDCARD | 34 RX8 E1_DIR_PIN
* Z_CS_PIN 32 |_______________| 33 PWM E1_STEP_PIN
*/
plan for Teensy4.0 and Teensy4.1: //
USB // Servos
GND |-----#####-----| VIN (3.65 TO 5.5V) //
X_STEP_PIN CS1 RX1 PWM 0 | ##### | GND #define SERVO0_PIN 22
X_DIR_PIN MISO1 TX1 PWM 1 | | 3.3V #define SERVO1_PIN 23
Y_STEP_PIN PWM 2 | | 23 A9 PWM SERVO1_PIN
Y_DIR_PIN PWM 3 | | 22 A8 PWM SERVO0_PIN
Z_STEP_PIN PWM 4 | | 21 A7 RX5
Z_DIR_PIN PWM 5 | | 20 A6 TX5 FILWIDTH_PIN
X_ENABLE_PIN PWM 6 | | 19 A5 PWM SCL0
Y_ENABLE_PIN RX2 PWM 7 | | 18 A4 PWM SDA0 HEATER_1_PIN
Z_ENABLE_PIN TX2 PWM 8 | | 17 A3 RX4 SDA1
E0_STEP_PIN PWM 9 | | 16 A2 TX4 SCL1 TEMP_0_PIN
E0_DIR_PIN PWM 10 | | 15 A1 PWM RX3 TEMP_BED_PIN
MOSI_PIN MOSI0 PWM 11 | | 14 A0 PWM TX3 TEMP_1_PIN
MISO_PIN MISO0 PWM 12 | | 13 LED PWM SCK0 SCK_PIN
3.3V | | GND
Z_STOP_PIN PWM 24 | | 41 A17
E0_ENABLE_PIN PWM 25 | | 40 A16
FAN_PIN MOSI1 26 | | 39 A15 MISO1 X_STOP_PIN
Z-PROBE PWR SCK1 27 | * * * * * | 38 A14 Y_STOP_PIN
SOL1_PIN RX7 PWM 28 | | 37 PWM HEATER_0_PIN
FAN_PIN TX7 PWM 29 | | 36 PWM HEATER_BED_PIN
X_CS_PIN 30 | | 35 TX8 E1_ENABLE_PIN
y_CS_PIN 31 | SDCARD | 34 RX8 E1_DIR_PIN
Z_CS_PIN 32 |_______________| 33 PWM E1_STEP_PIN
*/
// //
// Limit Switches // Limit Switches
@ -100,6 +101,9 @@
#define E1_DIR_PIN 34 #define E1_DIR_PIN 34
#define E1_ENABLE_PIN 35 #define E1_ENABLE_PIN 35
//
// Heaters / Fans
//
#define HEATER_0_PIN 37 #define HEATER_0_PIN 37
#define HEATER_1_PIN 18 #define HEATER_1_PIN 18
#define HEATER_BED_PIN 36 #define HEATER_BED_PIN 36
@ -107,22 +111,20 @@
#define FAN_PIN 29 #define FAN_PIN 29
#endif #endif
//
// Temperature Sensors
//
#define TEMP_0_PIN 2 // Extruder / Analog pin numbering: 2 => A2 #define TEMP_0_PIN 2 // Extruder / Analog pin numbering: 2 => A2
#define TEMP_1_PIN 0 #define TEMP_1_PIN 0
#define TEMP_BED_PIN 1 // Bed / Analog pin numbering #define TEMP_BED_PIN 1 // Bed / Analog pin numbering
//
// Misc. Functions
//
#define LED_PIN 13 #define LED_PIN 13
//#define PS_ON_PIN 1
//#define ALARM_PIN -1
//#define FILWIDTH_PIN 6 // A6
#define SOL0_PIN 28 #define SOL0_PIN 28
#define SERVO0_PIN 22 //#define PS_ON_PIN 1
#define SERVO1_PIN 23 //#define FILWIDTH_PIN 6 // A6
//#define SCK_PIN 13
//#define MISO_PIN 12
//#define MOSI_PIN 11
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD