andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

M42 P1.20 fix

pull/1/head
Bob-the-Kuhn 7 years ago
committed by Scott Lahteine
parent
5060195e8a
commit
a28ccabe2a
9 changed files with 124 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Marlin/src/HAL/HAL_LPC1768/HAL.cpp
  2. 9
      Marlin/src/HAL/HAL_LPC1768/pinmapping.cpp
  3. 66
      Marlin/src/HAL/HAL_LPC1768/pinmapping.h
  4. 8
      Marlin/src/HAL/HAL_LPC1768/spi_pins.h
  5. 6
      Marlin/src/gcode/control/M42.cpp
  6. 32
      Marlin/src/pins/pins_AZSMZ_MINI.h
  7. 22
      Marlin/src/pins/pins_AZTEEG_X5_GT.h
  8. 44
      Marlin/src/pins/pins_MKS_SBASE.h
  9. 46
      Marlin/src/pins/pins_RAMPS_RE_ARM.h

14
Marlin/src/HAL/HAL_LPC1768/HAL.cpp
View File

@ -174,12 +174,12 @@ uint16_t HAL_adc_get_result(void) {
#define SBIT_PWMEN 2 #define SBIT_PWMEN 2
#define SBIT_PWMMR0R 1 #define SBIT_PWMMR0R 1
#define PWM_1 0 //P2_0 (0-1 Bits of PINSEL4) #define PWM_1 0 //P2_00 (0-1 Bits of PINSEL4)
#define PWM_2 2 //P2_1 (2-3 Bits of PINSEL4) #define PWM_2 2 //P2_01 (2-3 Bits of PINSEL4)
#define PWM_3 4 //P2_2 (4-5 Bits of PINSEL4) #define PWM_3 4 //P2_02 (4-5 Bits of PINSEL4)
#define PWM_4 6 //P2_3 (6-7 Bits of PINSEL4) #define PWM_4 6 //P2_03 (6-7 Bits of PINSEL4)
#define PWM_5 8 //P2_4 (8-9 Bits of PINSEL4) #define PWM_5 8 //P2_04 (8-9 Bits of PINSEL4)
#define PWM_6 10 //P2_5 (10-11 Bits of PINSEL4) #define PWM_6 10 //P2_05 (10-11 Bits of PINSEL4)
void HAL_pwm_init(void) { void HAL_pwm_init(void) {
LPC_PINCON->PINSEL4 = _BV(PWM_5) | _BV(PWM_6); LPC_PINCON->PINSEL4 = _BV(PWM_5) | _BV(PWM_6);
@ -193,7 +193,7 @@ void HAL_pwm_init(void) {
// Trigger the latch Enable Bits to load the new Match Values MR0, MR5, MR6 // Trigger the latch Enable Bits to load the new Match Values MR0, MR5, MR6
LPC_PWM1->LER = _BV(0) | _BV(5) | _BV(6); LPC_PWM1->LER = _BV(0) | _BV(5) | _BV(6);
// Enable the PWM output pins for PWM_5-PWM_6(P2_4 - P2_5) // Enable the PWM output pins for PWM_5-PWM_6(P2_04 - P2_05)
LPC_PWM1->PCR = _BV(13) | _BV(14); LPC_PWM1->PCR = _BV(13) | _BV(14);
} }

9
Marlin/src/HAL/HAL_LPC1768/pinmapping.cpp
View File

@ -35,15 +35,18 @@ int16_t GET_PIN_MAP_INDEX(pin_t pin) {
return -1; return -1;
} }
int16_t PARSED_PIN_INDEX(char code, int16_t dval) { int16_t PARSED_PIN_INDEX(char code, int16_t dval) { // treats 1.2 and 1.20 as the same thing
if (parser.seenval(code)) { if (parser.seenval(code)) {
int port, pin; int port, pin;
if (sscanf(parser.strval(code), "%d.%d", &port, &pin) == 2) char pin_string[3] = {" "};
if (sscanf(parser.strval(code), "%d.%2s", &port, pin_string) == 2) {
if (pin_string[1] == '\0') pin_string[1] = '0'; // add trailing zero if a null is found
pin = (10 * (pin_string[0] - '0')) + (pin_string[1] - '0'); // convert string to number
for (size_t i = 0; i < NUM_DIGITAL_PINS; ++i) for (size_t i = 0; i < NUM_DIGITAL_PINS; ++i)
if (LPC1768_PIN_PORT(pin_map[i]) == port && LPC1768_PIN_PIN(pin_map[i]) == pin) if (LPC1768_PIN_PORT(pin_map[i]) == port && LPC1768_PIN_PIN(pin_map[i]) == pin)
return i; return i;
} }
}
return dval; return dval;
} }

66
Marlin/src/HAL/HAL_LPC1768/pinmapping.h
View File

@ -109,19 +109,19 @@ constexpr int8_t LPC1768_PIN_ADC(const pin_t pin) { return (int8_t)((pin >> 10)
#define P_NC -1 #define P_NC -1
#if SERIAL_PORT != 3 #if SERIAL_PORT != 3
#define P0_0 LPC1768_PIN(PORT(0), PIN(0), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_00 LPC1768_PIN(PORT(0), PIN(0), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_1 LPC1768_PIN(PORT(0), PIN(1), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_01 LPC1768_PIN(PORT(0), PIN(1), INTERRUPT(1), PWM(0), ADC_NONE)
#endif #endif
#if SERIAL_PORT != 0 #if SERIAL_PORT != 0
#define P0_2 LPC1768_PIN(PORT(0), PIN(2), INTERRUPT(1), PWM(0), ADC_CHAN(7)) #define P0_02 LPC1768_PIN(PORT(0), PIN(2), INTERRUPT(1), PWM(0), ADC_CHAN(7))
#define P0_3 LPC1768_PIN(PORT(0), PIN(3), INTERRUPT(1), PWM(0), ADC_CHAN(6)) #define P0_03 LPC1768_PIN(PORT(0), PIN(3), INTERRUPT(1), PWM(0), ADC_CHAN(6))
#endif #endif
#define P0_4 LPC1768_PIN(PORT(0), PIN(4), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_04 LPC1768_PIN(PORT(0), PIN(4), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_5 LPC1768_PIN(PORT(0), PIN(5), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_05 LPC1768_PIN(PORT(0), PIN(5), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_6 LPC1768_PIN(PORT(0), PIN(6), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_06 LPC1768_PIN(PORT(0), PIN(6), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_7 LPC1768_PIN(PORT(0), PIN(7), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_07 LPC1768_PIN(PORT(0), PIN(7), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_8 LPC1768_PIN(PORT(0), PIN(8), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_08 LPC1768_PIN(PORT(0), PIN(8), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_9 LPC1768_PIN(PORT(0), PIN(9), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_09 LPC1768_PIN(PORT(0), PIN(9), INTERRUPT(1), PWM(0), ADC_NONE)
#if SERIAL_PORT != 2 #if SERIAL_PORT != 2
#define P0_10 LPC1768_PIN(PORT(0), PIN(10), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_10 LPC1768_PIN(PORT(0), PIN(10), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_11 LPC1768_PIN(PORT(0), PIN(11), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_11 LPC1768_PIN(PORT(0), PIN(11), INTERRUPT(1), PWM(0), ADC_NONE)
@ -144,11 +144,11 @@ constexpr int8_t LPC1768_PIN_ADC(const pin_t pin) { return (int8_t)((pin >> 10)
#define P0_28 LPC1768_PIN(PORT(0), PIN(28), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_28 LPC1768_PIN(PORT(0), PIN(28), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_29 LPC1768_PIN(PORT(0), PIN(29), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_29 LPC1768_PIN(PORT(0), PIN(29), INTERRUPT(1), PWM(0), ADC_NONE)
#define P0_30 LPC1768_PIN(PORT(0), PIN(30), INTERRUPT(1), PWM(0), ADC_NONE) #define P0_30 LPC1768_PIN(PORT(0), PIN(30), INTERRUPT(1), PWM(0), ADC_NONE)
#define P1_0 LPC1768_PIN(PORT(1), PIN(0), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_00 LPC1768_PIN(PORT(1), PIN(0), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_1 LPC1768_PIN(PORT(1), PIN(1), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_01 LPC1768_PIN(PORT(1), PIN(1), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_4 LPC1768_PIN(PORT(1), PIN(4), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_04 LPC1768_PIN(PORT(1), PIN(4), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_8 LPC1768_PIN(PORT(1), PIN(8), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_08 LPC1768_PIN(PORT(1), PIN(8), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_9 LPC1768_PIN(PORT(1), PIN(9), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_09 LPC1768_PIN(PORT(1), PIN(9), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_10 LPC1768_PIN(PORT(1), PIN(10), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_10 LPC1768_PIN(PORT(1), PIN(10), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_14 LPC1768_PIN(PORT(1), PIN(14), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_14 LPC1768_PIN(PORT(1), PIN(14), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_15 LPC1768_PIN(PORT(1), PIN(15), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_15 LPC1768_PIN(PORT(1), PIN(15), INTERRUPT(0), PWM(0), ADC_NONE)
@ -168,16 +168,16 @@ constexpr int8_t LPC1768_PIN_ADC(const pin_t pin) { return (int8_t)((pin >> 10)
#define P1_29 LPC1768_PIN(PORT(1), PIN(29), INTERRUPT(0), PWM(0), ADC_NONE) #define P1_29 LPC1768_PIN(PORT(1), PIN(29), INTERRUPT(0), PWM(0), ADC_NONE)
#define P1_30 LPC1768_PIN(PORT(1), PIN(30), INTERRUPT(0), PWM(0), ADC_CHAN(4)) #define P1_30 LPC1768_PIN(PORT(1), PIN(30), INTERRUPT(0), PWM(0), ADC_CHAN(4))
#define P1_31 LPC1768_PIN(PORT(1), PIN(31), INTERRUPT(0), PWM(0), ADC_CHAN(5)) #define P1_31 LPC1768_PIN(PORT(1), PIN(31), INTERRUPT(0), PWM(0), ADC_CHAN(5))
#define P2_0 LPC1768_PIN(PORT(2), PIN(0), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_00 LPC1768_PIN(PORT(2), PIN(0), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_1 LPC1768_PIN(PORT(2), PIN(1), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_01 LPC1768_PIN(PORT(2), PIN(1), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_2 LPC1768_PIN(PORT(2), PIN(2), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_02 LPC1768_PIN(PORT(2), PIN(2), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_3 LPC1768_PIN(PORT(2), PIN(3), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_03 LPC1768_PIN(PORT(2), PIN(3), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_4 LPC1768_PIN(PORT(2), PIN(4), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_04 LPC1768_PIN(PORT(2), PIN(4), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_5 LPC1768_PIN(PORT(2), PIN(5), INTERRUPT(1), PWM(1), ADC_NONE) #define P2_05 LPC1768_PIN(PORT(2), PIN(5), INTERRUPT(1), PWM(1), ADC_NONE)
#define P2_6 LPC1768_PIN(PORT(2), PIN(6), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_06 LPC1768_PIN(PORT(2), PIN(6), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_7 LPC1768_PIN(PORT(2), PIN(7), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_07 LPC1768_PIN(PORT(2), PIN(7), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_8 LPC1768_PIN(PORT(2), PIN(8), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_08 LPC1768_PIN(PORT(2), PIN(8), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_9 LPC1768_PIN(PORT(2), PIN(9), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_09 LPC1768_PIN(PORT(2), PIN(9), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_10 LPC1768_PIN(PORT(2), PIN(10), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_10 LPC1768_PIN(PORT(2), PIN(10), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_11 LPC1768_PIN(PORT(2), PIN(11), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_11 LPC1768_PIN(PORT(2), PIN(11), INTERRUPT(1), PWM(0), ADC_NONE)
#define P2_12 LPC1768_PIN(PORT(2), PIN(12), INTERRUPT(1), PWM(0), ADC_NONE) #define P2_12 LPC1768_PIN(PORT(2), PIN(12), INTERRUPT(1), PWM(0), ADC_NONE)
@ -231,7 +231,7 @@ constexpr bool INTERRUPT_PIN(const pin_t p) {
constexpr pin_t adc_pin_table[] = { constexpr pin_t adc_pin_table[] = {
P0_23, P0_24, P0_25, P0_26, P1_30, P1_31, P0_23, P0_24, P0_25, P0_26, P1_30, P1_31,
#if SERIAL_PORT != 0 #if SERIAL_PORT != 0
P0_3, P0_2 P0_03, P0_02
#endif #endif
}; };
@ -245,17 +245,17 @@ constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
// P0.6 thru P0.9 are for the onboard SD card // P0.6 thru P0.9 are for the onboard SD card
// P0.29 and P0.30 are for the USB port // P0.29 and P0.30 are for the USB port
#define HAL_SENSITIVE_PINS P0_6, P0_7, P0_8, P0_9, P0_29, P0_30 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09, P0_29, P0_30
// Pin map for M43 and M226 // Pin map for M43 and M226
const pin_t pin_map[] = { const pin_t pin_map[] = {
#if SERIAL_PORT != 3 #if SERIAL_PORT != 3
P0_0, P0_1, P0_00, P0_01,
#endif #endif
#if SERIAL_PORT != 0 #if SERIAL_PORT != 0
P0_2, P0_3, P0_02, P0_03,
#endif #endif
P0_4, P0_5, P0_6, P0_7, P0_8, P0_9, P0_04, P0_05, P0_06, P0_07, P0_08, P0_09,
#if SERIAL_PORT != 2 #if SERIAL_PORT != 2
P0_10, P0_11, P0_10, P0_11,
#endif #endif
@ -264,11 +264,11 @@ const pin_t pin_map[] = {
#endif #endif
P0_17, P0_18, P0_19, P0_20, P0_21, P0_22, P0_23, P0_24, P0_17, P0_18, P0_19, P0_20, P0_21, P0_22, P0_23, P0_24,
P0_25, P0_26, P0_27, P0_28, P0_29, P0_30, P0_25, P0_26, P0_27, P0_28, P0_29, P0_30,
P1_0, P1_1, P1_4, P1_8, P1_9, P1_10, P1_14, P1_15, P1_00, P1_01, P1_04, P1_08, P1_09, P1_10, P1_14, P1_15,
P1_16, P1_17, P1_18, P1_19, P1_20, P1_21, P1_22, P1_23, P1_16, P1_17, P1_18, P1_19, P1_20, P1_21, P1_22, P1_23,
P1_24, P1_25, P1_26, P1_27, P1_28, P1_29, P1_30, P1_31, P1_24, P1_25, P1_26, P1_27, P1_28, P1_29, P1_30, P1_31,
P2_0, P2_1, P2_2, P2_3, P2_4, P2_5, P2_6, P2_7, P2_00, P2_01, P2_02, P2_03, P2_04, P2_05, P2_06, P2_07,
P2_8, P2_9, P2_10, P2_11, P2_12, P2_13, P2_08, P2_09, P2_10, P2_11, P2_12, P2_13,
P3_25, P3_26, P3_25, P3_26,
P4_28, P4_29 P4_28, P4_29
}; };

8
Marlin/src/HAL/HAL_LPC1768/spi_pins.h
View File

@ -26,10 +26,10 @@
#define LPC_SOFTWARE_SPI #define LPC_SOFTWARE_SPI
/** onboard SD card */ /** onboard SD card */
//#define SCK_PIN P0_7 //#define SCK_PIN P0_07
//#define MISO_PIN P0_8 //#define MISO_PIN P0_08
//#define MOSI_PIN P0_9 //#define MOSI_PIN P0_09
//#define SS_PIN P0_6 //#define SS_PIN P0_06
/** external */ /** external */
#define SCK_PIN P0_15 #define SCK_PIN P0_15
#define MISO_PIN P0_17 #define MISO_PIN P0_17

6
Marlin/src/gcode/control/M42.cpp
View File

@ -28,11 +28,7 @@
* M42: Change pin status via GCode * M42: Change pin status via GCode
* *
* P<pin> Pin number (LED if omitted) * P<pin> Pin number (LED if omitted)
* For LPC1768 use M42 P1.20 S255 if wanting to set P1_20 to logic 1 * For LPC1768 enter pin P1_20 as M42 P1.20
* NOTE - Repetier Host truncates trailing zeros on a decimal when
* sending commands so typing M42 P1.20 S255 results in
* M42 P1.2 S255 being sent. Pronterface doesn't have this issue.
*
* S<byte> Pin status from 0 - 255 * S<byte> Pin status from 0 - 255
*/ */
void GcodeSuite::M42() { void GcodeSuite::M42() {

32
Marlin/src/pins/pins_AZSMZ_MINI.h
View File

@ -48,23 +48,23 @@
// //
// Steppers // Steppers
// //
#define X_STEP_PIN P2_0 #define X_STEP_PIN P2_00
#define X_DIR_PIN P0_5 #define X_DIR_PIN P0_05
#define X_ENABLE_PIN P0_4 #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_DIR_PIN P0_11
#define Y_ENABLE_PIN P0_10 #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_DIR_PIN P0_20
#define Z_ENABLE_PIN P0_19 #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_DIR_PIN P0_22
#define E0_ENABLE_PIN P0_21 #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_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29 #define E1_ENABLE_PIN P4_29
@ -80,14 +80,14 @@
// Heaters / Fans // Heaters / Fans
// //
// EFB // EFB
#define HEATER_0_PIN P2_4 #define HEATER_0_PIN P2_04
#define HEATER_BED_PIN P2_5 #define HEATER_BED_PIN P2_05
#define FAN_PIN P2_7 #define FAN_PIN P2_07
#define FAN1_PIN P0_26 #define FAN1_PIN P0_26
#if ENABLED(AZSMZ_12864) #if ENABLED(AZSMZ_12864)
#define BEEPER_PIN P1_30 #define BEEPER_PIN P1_30
#define DOGLCD_A0 P2_6 #define DOGLCD_A0 P2_06
#define DOGLCD_CS P1_22 #define DOGLCD_CS P1_22
#define BTN_EN1 P4_28 #define BTN_EN1 P4_28
#define BTN_EN2 P1_27 #define BTN_EN2 P1_27
@ -104,11 +104,11 @@
#define ENET_RXD1 P1_10 #define ENET_RXD1 P1_10
#define ENET_MOC P1_16 #define ENET_MOC P1_16
#define REF_CLK P1_15 #define REF_CLK P1_15
#define ENET_RXD0 P1_9 #define ENET_RXD0 P1_09
#define ENET_CRS P1_8 #define ENET_CRS P1_08
#define ENET_TX_EN P1_4 #define ENET_TX_EN P1_04
#define ENET_TXD0 P1_0 #define ENET_TXD0 P1_00
#define ENET_TXD1 P1_1 #define ENET_TXD1 P1_01
/** /**
* PWMs * PWMs

22
Marlin/src/pins/pins_AZTEEG_X5_GT.h
View File

@ -49,23 +49,23 @@
// //
// Steppers // Steppers
// //
#define X_STEP_PIN P2_1 #define X_STEP_PIN P2_01
#define X_DIR_PIN P0_11 #define X_DIR_PIN P0_11
#define X_ENABLE_PIN P0_10 #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_DIR_PIN P0_20
#define Y_ENABLE_PIN P0_19 #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_DIR_PIN P0_22
#define Z_ENABLE_PIN P0_21 #define Z_ENABLE_PIN P0_21
#define E0_STEP_PIN P2_0 #define E0_STEP_PIN P2_00
#define E0_DIR_PIN P0_5 #define E0_DIR_PIN P0_05
#define E0_ENABLE_PIN P0_4 #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_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29 #define E1_ENABLE_PIN P4_29
@ -82,9 +82,9 @@
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_BED_PIN P2_7 #define HEATER_BED_PIN P2_07
#define HEATER_0_PIN P2_4 #define HEATER_0_PIN P2_04
#define HEATER_1_PIN P2_5 #define HEATER_1_PIN P2_05
#define FAN_PIN P0_26 #define FAN_PIN P0_26
#define FAN1_PIN P1_22 #define FAN1_PIN P1_22
@ -94,7 +94,7 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN P1_30 #define BEEPER_PIN P1_30
#define DOGLCD_A0 P2_6 #define DOGLCD_A0 P2_06
#define DOGLCD_CS P0_16 #define DOGLCD_CS P0_16
#define BTN_EN1 P3_25 #define BTN_EN1 P3_25

44
Marlin/src/pins/pins_MKS_SBASE.h
View File

@ -53,23 +53,23 @@
// //
// Steppers // Steppers
// //
#define X_STEP_PIN P2_0 #define X_STEP_PIN P2_00
#define X_DIR_PIN P0_5 #define X_DIR_PIN P0_05
#define X_ENABLE_PIN P0_4 #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_DIR_PIN P0_11
#define Y_ENABLE_PIN P0_10 #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_DIR_PIN P0_20
#define Z_ENABLE_PIN P0_19 #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_DIR_PIN P0_22
#define E0_ENABLE_PIN P0_21 #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_DIR_PIN P2_13
#define E1_ENABLE_PIN P4_29 #define E1_ENABLE_PIN P4_29
@ -88,10 +88,10 @@
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_BED_PIN P2_5 #define HEATER_BED_PIN P2_05
#define HEATER_0_PIN P2_7 #define HEATER_0_PIN P2_07
#define HEATER_1_PIN P2_6 #define HEATER_1_PIN P2_06
#define FAN_PIN P2_4 #define FAN_PIN P2_04
#define PS_ON_PIN P0_25 #define PS_ON_PIN P0_25
@ -166,11 +166,11 @@
#endif #endif
#define ENET_MOC P1_16 // J12-3 #define ENET_MOC P1_16 // J12-3
#define REF_CLK P1_15 // J12-5 #define REF_CLK P1_15 // J12-5
#define ENET_RXD0 P1_9 // J12-7 #define ENET_RXD0 P1_09 // J12-7
#define ENET_CRS P1_8 // J12-9 #define ENET_CRS P1_08 // J12-9
#define ENET_TX_EN P1_4 // J12-10 #define ENET_TX_EN P1_04 // J12-10
#define ENET_TXD0 P1_0 // J12-11 #define ENET_TXD0 P1_00 // J12-11
#define ENET_TXD1 P1_1 // J12-12 #define ENET_TXD1 P1_01 // J12-12
/** /**
* PWMs * PWMs
@ -180,17 +180,17 @@
* SERVO2 does NOT have a PWM assigned to it. * SERVO2 does NOT have a PWM assigned to it.
* *
* PWM1.1 P1_18 SERVO3_PIN FIL_RUNOUT_PIN 5V output, PWM * 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 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 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 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 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 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
*/ */
/** /**

46
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

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

Write Preview
Loading…
Cancel
Save