M42 P1.20 fix

This commit is contained in:
Bob-the-Kuhn
2017-11-18 12:57:32 -06:00
committed by Scott Lahteine
parent 5060195e8a
commit a28ccabe2a
9 changed files with 124 additions and 125 deletions

View File

@@ -48,23 +48,23 @@
//
// Steppers
//
#define X_STEP_PIN P2_0
#define X_DIR_PIN P0_5
#define X_ENABLE_PIN P0_4
#define X_STEP_PIN P2_00
#define X_DIR_PIN P0_05
#define X_ENABLE_PIN P0_04
#define Y_STEP_PIN P2_1
#define Y_STEP_PIN P2_01
#define Y_DIR_PIN P0_11
#define Y_ENABLE_PIN P0_10
#define Z_STEP_PIN P2_2
#define Z_STEP_PIN P2_02
#define Z_DIR_PIN P0_20
#define Z_ENABLE_PIN P0_19
#define E0_STEP_PIN P2_3
#define E0_STEP_PIN P2_03
#define E0_DIR_PIN P0_22
#define E0_ENABLE_PIN P0_21
#define E1_STEP_PIN P2_8
#define E1_STEP_PIN P2_08
#define E1_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29
@@ -80,14 +80,14 @@
// Heaters / Fans
//
// EFB
#define HEATER_0_PIN P2_4
#define HEATER_BED_PIN P2_5
#define FAN_PIN P2_7
#define HEATER_0_PIN P2_04
#define HEATER_BED_PIN P2_05
#define FAN_PIN P2_07
#define FAN1_PIN P0_26
#if ENABLED(AZSMZ_12864)
#define BEEPER_PIN P1_30
#define DOGLCD_A0 P2_6
#define DOGLCD_A0 P2_06
#define DOGLCD_CS P1_22
#define BTN_EN1 P4_28
#define BTN_EN2 P1_27
@@ -104,11 +104,11 @@
#define ENET_RXD1 P1_10
#define ENET_MOC P1_16
#define REF_CLK P1_15
#define ENET_RXD0 P1_9
#define ENET_CRS P1_8
#define ENET_TX_EN P1_4
#define ENET_TXD0 P1_0
#define ENET_TXD1 P1_1
#define ENET_RXD0 P1_09
#define ENET_CRS P1_08
#define ENET_TX_EN P1_04
#define ENET_TXD0 P1_00
#define ENET_TXD1 P1_01
/**
* PWMs

View File

@@ -49,23 +49,23 @@
//
// Steppers
//
#define X_STEP_PIN P2_1
#define X_STEP_PIN P2_01
#define X_DIR_PIN P0_11
#define X_ENABLE_PIN P0_10
#define Y_STEP_PIN P2_2
#define Y_STEP_PIN P2_02
#define Y_DIR_PIN P0_20
#define Y_ENABLE_PIN P0_19
#define Z_STEP_PIN P2_3
#define Z_STEP_PIN P2_03
#define Z_DIR_PIN P0_22
#define Z_ENABLE_PIN P0_21
#define E0_STEP_PIN P2_0
#define E0_DIR_PIN P0_5
#define E0_ENABLE_PIN P0_4
#define E0_STEP_PIN P2_00
#define E0_DIR_PIN P0_05
#define E0_ENABLE_PIN P0_04
#define E1_STEP_PIN P2_8
#define E1_STEP_PIN P2_08
#define E1_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29
@@ -82,9 +82,9 @@
// Heaters / Fans
//
#define HEATER_BED_PIN P2_7
#define HEATER_0_PIN P2_4
#define HEATER_1_PIN P2_5
#define HEATER_BED_PIN P2_07
#define HEATER_0_PIN P2_04
#define HEATER_1_PIN P2_05
#define FAN_PIN P0_26
#define FAN1_PIN P1_22
@@ -94,7 +94,7 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN P1_30
#define DOGLCD_A0 P2_6
#define DOGLCD_A0 P2_06
#define DOGLCD_CS P0_16
#define BTN_EN1 P3_25

View File

@@ -53,23 +53,23 @@
//
// Steppers
//
#define X_STEP_PIN P2_0
#define X_DIR_PIN P0_5
#define X_ENABLE_PIN P0_4
#define X_STEP_PIN P2_00
#define X_DIR_PIN P0_05
#define X_ENABLE_PIN P0_04
#define Y_STEP_PIN P2_1
#define Y_STEP_PIN P2_01
#define Y_DIR_PIN P0_11
#define Y_ENABLE_PIN P0_10
#define Z_STEP_PIN P2_2
#define Z_STEP_PIN P2_02
#define Z_DIR_PIN P0_20
#define Z_ENABLE_PIN P0_19
#define E0_STEP_PIN P2_3
#define E0_STEP_PIN P2_03
#define E0_DIR_PIN P0_22
#define E0_ENABLE_PIN P0_21
#define E1_STEP_PIN P2_8
#define E1_STEP_PIN P2_08
#define E1_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29
@@ -88,10 +88,10 @@
// Heaters / Fans
//
#define HEATER_BED_PIN P2_5
#define HEATER_0_PIN P2_7
#define HEATER_1_PIN P2_6
#define FAN_PIN P2_4
#define HEATER_BED_PIN P2_05
#define HEATER_0_PIN P2_07
#define HEATER_1_PIN P2_06
#define FAN_PIN P2_04
#define PS_ON_PIN P0_25
@@ -166,11 +166,11 @@
#endif
#define ENET_MOC P1_16 // J12-3
#define REF_CLK P1_15 // J12-5
#define ENET_RXD0 P1_9 // J12-7
#define ENET_CRS P1_8 // J12-9
#define ENET_TX_EN P1_4 // J12-10
#define ENET_TXD0 P1_0 // J12-11
#define ENET_TXD1 P1_1 // J12-12
#define ENET_RXD0 P1_09 // J12-7
#define ENET_CRS P1_08 // J12-9
#define ENET_TX_EN P1_04 // J12-10
#define ENET_TXD0 P1_00 // J12-11
#define ENET_TXD1 P1_01 // J12-12
/**
* PWMs
@@ -180,17 +180,17 @@
* SERVO2 does NOT have a PWM assigned to it.
*
* PWM1.1 P1_18 SERVO3_PIN FIL_RUNOUT_PIN 5V output, PWM
* PWM1.1 P2_0 E0_STEP_PIN
* PWM1.1 P2_00 E0_STEP_PIN
* PWM1.2 P1_20 SERVO0_PIN
* PWM1.2 P2_1 X_STEP_PIN
* PWM1.2 P2_01 X_STEP_PIN
* PWM1.3 P1_21 SERVO1_PIN J5-1
* PWM1.3 P2_2 Y_STEP_PIN
* PWM1.3 P2_02 Y_STEP_PIN
* PWM1.4 P1_23 SDSS(SSEL0) J3-5 AUX-3
* PWM1.4 P2_3 Z_STEP_PIN
* PWM1.4 P2_03 Z_STEP_PIN
* PWM1.5 P1_24 X_MIN_PIN 10K PULLUP TO 3.3v, 1K SERIES
* PWM1.5 P2_4 RAMPS_D9_PIN
* PWM1.5 P2_04 RAMPS_D9_PIN
* PWM1.6 P1_26 Y_MIN_PIN 10K PULLUP TO 3.3v, 1K SERIES
* PWM1.6 P2_5 RAMPS_D10_PIN
* PWM1.6 P2_05 RAMPS_D10_PIN
*/
/**

View File

@@ -65,27 +65,27 @@
//
// Steppers
//
#define X_STEP_PIN P2_1 // (54)
#define X_STEP_PIN P2_01 // (54)
#define X_DIR_PIN P0_11 // (55)
#define X_ENABLE_PIN P0_10 // (38)
#define Y_STEP_PIN P2_2 // (60)
#define Y_STEP_PIN P2_02 // (60)
#define Y_DIR_PIN P0_20 // (61)
#define Y_ENABLE_PIN P0_19 // (56)
#define Z_STEP_PIN P2_3 // (46)
#define Z_STEP_PIN P2_03 // (46)
#define Z_DIR_PIN P0_22 // (48)
#define Z_ENABLE_PIN P0_21 // (62)
#define E0_STEP_PIN P2_0 // (26)
#define E0_DIR_PIN P0_5 // (28)
#define E0_ENABLE_PIN P0_4 // (24)
#define E0_STEP_PIN P2_00 // (26)
#define E0_DIR_PIN P0_05 // (28)
#define E0_ENABLE_PIN P0_04 // (24)
#define E1_STEP_PIN P2_8 // (36)
#define E1_STEP_PIN P2_08 // (36)
#define E1_DIR_PIN P2_13 // (34)
#define E1_ENABLE_PIN P4_29 // (30)
#define E2_STEP_PIN P2_8 // (36)
#define E2_STEP_PIN P2_08 // (36)
#define E2_DIR_PIN P2_13 // (34)
#define E2_ENABLE_PIN P4_29 // (30)
@@ -127,13 +127,13 @@
#define MOSFET_D_PIN -1
#endif
#ifndef RAMPS_D8_PIN
#define RAMPS_D8_PIN P2_7 // (8)
#define RAMPS_D8_PIN P2_07 // (8)
#endif
#ifndef RAMPS_D9_PIN
#define RAMPS_D9_PIN P2_4 // (9)
#define RAMPS_D9_PIN P2_04 // (9)
#endif
#ifndef RAMPS_D10_PIN
#define RAMPS_D10_PIN P2_5 // (10)
#define RAMPS_D10_PIN P2_05 // (10)
#endif
#define HEATER_0_PIN RAMPS_D10_PIN
@@ -198,8 +198,8 @@
//
// Průša i3 MK2 Multiplexer Support
//
#define E_MUX0_PIN P0_3 // ( 0) Z_CS_PIN
#define E_MUX1_PIN P0_2 // ( 1) E0_CS_PIN
#define E_MUX0_PIN P0_03 // ( 0) Z_CS_PIN
#define E_MUX1_PIN P0_02 // ( 1) E0_CS_PIN
#define E_MUX2_PIN P0_26 // (63) E1_CS_PIN
/**
@@ -237,7 +237,7 @@
#define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
#define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
#define DOGLCD_A0 P2_6 // (59) J3-8 & AUX-2
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
#ifdef ULTIPANEL
@@ -278,8 +278,8 @@
#undef LCD_PINS_ENABLE //P0_18 // (51) (MOSI) J3-10 & AUX-3
#undef LCD_PINS_D4 //P0_15 // (52) (SCK) J3-9 & AUX-3
#undef LCD_PINS_D5 //P2_6 // (59) J3-8 & AUX-2
#define DOGLCD_A0 P2_6 // (59) J3-8 & AUX-2
#undef LCD_PINS_D5 //P2_06 // (59) J3-8 & AUX-2
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#undef LCD_PINS_D6 //P0_26 // (63) J5-3 & AUX-2
#undef LCD_PINS_D7 //P1_21 // ( 6) (SERVO1) J5-1 & SERVO connector
#define DOGLCD_SCK SCK_PIN
@@ -315,11 +315,11 @@
#endif
#define ENET_MOC P1_16 // (70) J12-3
#define REF_CLK P1_15 // (72) J12-5
#define ENET_RXD0 P1_9 // (74) J12-7
#define ENET_CRS P1_8 // (76) J12-9
#define ENET_TX_EN P1_4 // (77) J12-10
#define ENET_TXD0 P1_0 // (78) J12-11
#define ENET_TXD1 P1_1 // (79) J12-12
#define ENET_RXD0 P1_09 // (74) J12-7
#define ENET_CRS P1_08 // (76) J12-9
#define ENET_TX_EN P1_04 // (77) J12-10
#define ENET_TXD0 P1_00 // (78) J12-11
#define ENET_TXD1 P1_01 // (79) J12-12
/**
* Fast PWMS
@@ -339,8 +339,8 @@
* P1_20 (11) SERVO0_PIN
* P1_21 ( 6) SERVO1_PIN J5-1
* P0_18 ( 4) SERVO3_PIN 5V output
* *P2_4 ( 9) RAMPS_D9_PIN
* *P2_5 (10) RAMPS_D10_PIN
* *P2_04 ( 9) RAMPS_D9_PIN
* *P2_05 (10) RAMPS_D10_PIN
*
* * - If used as a heater driver then a Fast PWM is NOT assigned. If used as
* a fan driver then enabling FAST_PWM_FAN assigns a Fast PWM to it.
@@ -375,4 +375,4 @@
* 64
* 65
* 66
*/
*/