Skip to content

M
MarlinKimbra
Commit e5a79858 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Same fix

parent 22c55024
Hide whitespace changes
Inline Side-by-side
Showing with 809 additions and 818 deletions
MarlinKimbra/Configuration_Pins.h
View file @ e5a79858
#ifndef CONFIGURATION_PINS_H #ifndef CONFIGURATION_PINS_H
#define CONFIGURATION_PINS_H #define CONFIGURATION_PINS_H
//=========================== BASIC ============================== //=================================== BASIC ==================================
//X axis pins // X axis pins
#define X_STEP_PIN ORIG_X_STEP_PIN #define X_STEP_PIN ORIG_X_STEP_PIN
#define X_DIR_PIN ORIG_X_DIR_PIN #define X_DIR_PIN ORIG_X_DIR_PIN
#define X_ENABLE_PIN ORIG_X_ENABLE_PIN #define X_ENABLE_PIN ORIG_X_ENABLE_PIN
//Y axis pins // Y axis pins
#define Y_STEP_PIN ORIG_Y_STEP_PIN #define Y_STEP_PIN ORIG_Y_STEP_PIN
#define Y_DIR_PIN ORIG_Y_DIR_PIN #define Y_DIR_PIN ORIG_Y_DIR_PIN
#define Y_ENABLE_PIN ORIG_Y_ENABLE_PIN #define Y_ENABLE_PIN ORIG_Y_ENABLE_PIN
//Z axis pins // Z axis pins
#define Z_STEP_PIN ORIG_Z_STEP_PIN #define Z_STEP_PIN ORIG_Z_STEP_PIN
#define Z_DIR_PIN ORIG_Z_DIR_PIN #define Z_DIR_PIN ORIG_Z_DIR_PIN
#define Z_ENABLE_PIN ORIG_Z_ENABLE_PIN #define Z_ENABLE_PIN ORIG_Z_ENABLE_PIN
//E axis pins // E axis pins
#if DRIVER_EXTRUDERS > 0 #if DRIVER_EXTRUDERS > 0
#define E0_STEP_PIN ORIG_E0_STEP_PIN #define E0_STEP_PIN ORIG_E0_STEP_PIN
#define E0_DIR_PIN ORIG_E0_DIR_PIN #define E0_DIR_PIN ORIG_E0_DIR_PIN
#define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN #define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 1 #if DRIVER_EXTRUDERS > 1
#define E1_STEP_PIN ORIG_E1_STEP_PIN #define E1_STEP_PIN ORIG_E1_STEP_PIN
#define E1_DIR_PIN ORIG_E1_DIR_PIN #define E1_DIR_PIN ORIG_E1_DIR_PIN
#define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN #define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 2 #if DRIVER_EXTRUDERS > 2
#define E2_STEP_PIN ORIG_E2_STEP_PIN #define E2_STEP_PIN ORIG_E2_STEP_PIN
#define E2_DIR_PIN ORIG_E2_DIR_PIN #define E2_DIR_PIN ORIG_E2_DIR_PIN
#define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN #define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 3 #if DRIVER_EXTRUDERS > 3
#define E3_STEP_PIN ORIG_E3_STEP_PIN #define E3_STEP_PIN ORIG_E3_STEP_PIN
#define E3_DIR_PIN ORIG_E3_DIR_PIN #define E3_DIR_PIN ORIG_E3_DIR_PIN
#define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN #define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN
#endif #endif
//HEATHER pin // ENDSTOP pin
#define HEATER_0_PIN ORIG_HEATER_0_PIN #define X_MIN_PIN ORIG_X_MIN_PIN
#define HEATER_1_PIN ORIG_HEATER_1_PIN #define X_MAX_PIN ORIG_X_MAX_PIN
#define HEATER_2_PIN ORIG_HEATER_2_PIN #define Y_MIN_PIN ORIG_Y_MIN_PIN
#define HEATER_3_PIN ORIG_HEATER_3_PIN #define Y_MAX_PIN ORIG_Y_MAX_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN #define Z_MIN_PIN ORIG_Z_MIN_PIN
#define Z_MAX_PIN ORIG_Z_MAX_PIN
//TEMP pin // HEATER pin
#define TEMP_0_PIN ORIG_TEMP_0_PIN #define HEATER_0_PIN ORIG_HEATER_0_PIN
#define TEMP_1_PIN ORIG_TEMP_1_PIN #define HEATER_1_PIN ORIG_HEATER_1_PIN
#define TEMP_2_PIN ORIG_TEMP_2_PIN #define HEATER_2_PIN ORIG_HEATER_2_PIN
#define TEMP_3_PIN ORIG_TEMP_3_PIN #define HEATER_3_PIN ORIG_HEATER_3_PIN
#define TEMP_BED_PIN ORIG_TEMP_BED_PIN #define HEATER_BED_PIN ORIG_HEATER_BED_PIN
//FAN pin // TEMP pin
#define FAN_PIN ORIG_FAN_PIN #define TEMP_0_PIN ORIG_TEMP_0_PIN
#define TEMP_1_PIN ORIG_TEMP_1_PIN
#define TEMP_2_PIN ORIG_TEMP_2_PIN
#define TEMP_3_PIN ORIG_TEMP_3_PIN
#define TEMP_BED_PIN ORIG_TEMP_BED_PIN
//================================================================== // FAN pin
#define FAN_PIN ORIG_FAN_PIN
//=========================== FEATURE ============================== //============================================================================
//================================= FEATURE ==================================
#if ENABLED(MKR4) #if ENABLED(MKR4)
#define E0E1_CHOICE_PIN -1 #define E0E1_CHOICE_PIN -1
#define E0E2_CHOICE_PIN -1 #define E0E2_CHOICE_PIN -1
#define E0E3_CHOICE_PIN -1 #define E0E3_CHOICE_PIN -1
#define E1E3_CHOICE_PIN -1 #define E1E3_CHOICE_PIN -1
#endif //MKR4 #endif
#if ENABLED(NPR2) #if ENABLED(NPR2)
#define E_MIN_PIN -1 #define E_MIN_PIN -1
#endif #endif
#if ENABLED(LASERBEAM) #if ENABLED(LASERBEAM)
#define LASER_PWR_PIN -1 #define LASER_PWR_PIN -1
#define LASER_TTL_PIN -1 #define LASER_TTL_PIN -1
#endif #endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
#define FILRUNOUT_PIN -1 #define FILRUNOUT_PIN -1
#endif #endif
#if ENABLED(FILAMENT_SENSOR) #if ENABLED(FILAMENT_SENSOR)
#define FILWIDTH_PIN -1 // ANALOG NUMBERING #define FILWIDTH_PIN -1
#endif #endif
#if ENABLED(POWER_CONSUMPTION) #if ENABLED(POWER_CONSUMPTION)
#define POWER_CONSUMPTION_PIN -1 // ANALOG NUMBERING #define POWER_CONSUMPTION_PIN -1
#endif #endif
#if ENABLED(PHOTOGRAPH) #if ENABLED(PHOTOGRAPH)
...@@ -118,12 +126,13 @@ ...@@ -118,12 +126,13 @@
#endif #endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
#if ENABLED(Z_PROBE_ENDSTOP) #if ENABLED(Z_PROBE_ENDSTOP)
#define Z_PROBE_PIN -1 #define Z_PROBE_PIN -1
#endif #endif
//==================================================================== //============================================================================
#endif
\ No newline at end of file #endif
MarlinKimbra/Marlin_main.cpp
View file @ e5a79858
...@@ -697,7 +697,7 @@ bool enqueuecommand(const char *cmd) { ...@@ -697,7 +697,7 @@ bool enqueuecommand(const char *cmd) {
} }
#endif #endif
#if HAS(SERVO) #if HAS(SERVOS)
void servo_init() { void servo_init() {
#if HAS(SERVO_0) #if HAS(SERVO_0)
servo[0].attach(SERVO0_PIN); servo[0].attach(SERVO0_PIN);
...@@ -717,21 +717,23 @@ bool enqueuecommand(const char *cmd) { ...@@ -717,21 +717,23 @@ bool enqueuecommand(const char *cmd) {
#endif #endif
#if ENABLED(DONDOLO) #if ENABLED(DONDOLO)
servo[DONDOLO_SERVO_INDEX].attach(0);
servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0); servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0);
delay(DONDOLO_SERVO_DELAY); delay(DONDOLO_SERVO_DELAY);
servo[DONDOLO_SERVO_INDEX].detach();
#endif #endif
// Set position of Servo Endstops that are defined // Set position of Servo Endstops that are defined
#if HAS(SERVO_ENDSTOPS) #if HAS(SERVO_ENDSTOPS)
#if ENABLED(DONDOLO) #if ENABLED(DONDOLO)
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if (servo_endstops[i] >= 0 && servo_endstops[i] != DONDOLO_SERVO_INDEX) if (servo_endstop_id[i] >= 0 && servo_endstop_id[i] != DONDOLO_SERVO_INDEX)
servo[servo_endstops[i]].write(servo_endstop_angles[i * 2 + 1]); servo[servo_endstop_id[i]].write(servo_endstop_angle[i][1]);
} }
#else #else
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if (servo_endstops[i] >= 0) if (servo_endstop_id[i] >= 0)
servo[servo_endstops[i]].write(servo_endstop_angles[i * 2 + 1]); servo[servo_endstop_id[i]].write(servo_endstop_angle[i][1]);
} }
#endif #endif
#endif #endif
...@@ -857,7 +859,7 @@ void setup() { ...@@ -857,7 +859,7 @@ void setup() {
#if ENABLED(LASERBEAM) #if ENABLED(LASERBEAM)
setup_laserbeampin(); // Initialize Laserbeam pin setup_laserbeampin(); // Initialize Laserbeam pin
#endif #endif
#if HAS(SERVO) #if HAS(SERVOS)
servo_init(); servo_init();
#endif #endif
#if HAS(STEPPER_RESET) #if HAS(STEPPER_RESET)
...@@ -5857,7 +5859,7 @@ inline void gcode_M226() { ...@@ -5857,7 +5859,7 @@ inline void gcode_M226() {
#endif // DOGLCD #endif // DOGLCD
#if HAS(SERVO) #if HAS(SERVOS)
/** /**
* M280: Get or set servo position. P<index> S<angle> * M280: Get or set servo position. P<index> S<angle>
*/ */
...@@ -5880,8 +5882,10 @@ inline void gcode_M226() { ...@@ -5880,8 +5882,10 @@ inline void gcode_M226() {
} }
else if(servo_index == DONDOLO_SERVO_INDEX) { else if(servo_index == DONDOLO_SERVO_INDEX) {
Servo *srv = &servo[servo_index]; Servo *srv = &servo[servo_index];
srv->attach(0);
srv->write(servo_position); srv->write(servo_position);
delay (DONDOLO_SERVO_DELAY); delay (DONDOLO_SERVO_DELAY);
srv->detach();
} }
else { else {
ECHO_SM(ER, "Servo "); ECHO_SM(ER, "Servo ");
...@@ -6975,13 +6979,17 @@ inline void gcode_T(uint8_t tmp_extruder) { ...@@ -6975,13 +6979,17 @@ inline void gcode_T(uint8_t tmp_extruder) {
active_driver = 0; active_driver = 0;
if (active_extruder == 0) { if (active_extruder == 0) {
st_synchronize(); st_synchronize();
servo[DONDOLO_SERVO_INDEX].attach(0);
servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0); servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0);
delay (DONDOLO_SERVO_DELAY); delay (DONDOLO_SERVO_DELAY);
servo[DONDOLO_SERVO_INDEX].detach();
} }
else if (active_extruder == 1) { else if (active_extruder == 1) {
st_synchronize(); st_synchronize();
servo[DONDOLO_SERVO_INDEX].attach(0);
servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E1); servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E1);
delay(DONDOLO_SERVO_DELAY); delay(DONDOLO_SERVO_DELAY);
servo[DONDOLO_SERVO_INDEX].detach();
} }
ECHO_LMV(DB, MSG_ACTIVE_DRIVER, active_driver); ECHO_LMV(DB, MSG_ACTIVE_DRIVER, active_driver);
ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder); ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder);
...@@ -7332,7 +7340,7 @@ void process_next_command() { ...@@ -7332,7 +7340,7 @@ void process_next_command() {
gcode_M250(); break; gcode_M250(); break;
#endif // DOGLCD #endif // DOGLCD
#if HAS(SERVO) #if HAS(SERVOS)
case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds
gcode_M280(); break; gcode_M280(); break;
#endif // NUM_SERVOS > 0 #endif // NUM_SERVOS > 0
......
MarlinKimbra/conditionals.h
View file @ e5a79858
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
*/ */
#if ENABLED(DONDOLO) #if ENABLED(DONDOLO)
#undef SINGLENOZZLE #undef SINGLENOZZLE
#define DRIVER_EXTRUDERS 0 #define DRIVER_EXTRUDERS 1
#endif #endif
/** /**
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
/** /**
* DRIVER_EXTRUDERS * DRIVER_EXTRUDERS
*/ */
#if DISABLED(MKR4) && DISABLED(NPR2) #if DISABLED(MKR4) && DISABLED(NPR2) && DISABLED(DONDOLO)
#define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
#endif #endif
......
MarlinKimbra/pins.h
View file @ e5a79858
...@@ -195,20 +195,20 @@ ...@@ -195,20 +195,20 @@
#define ORIG_X_STEP_PIN 19 #define ORIG_X_STEP_PIN 19
#define ORIG_X_DIR_PIN 18 #define ORIG_X_DIR_PIN 18
#define ORIG_X_ENABLE_PIN 24 #define ORIG_X_ENABLE_PIN 24
#define X_STOP_PIN 7 #define X_STOP_PIN 7
//Y axis pins //Y axis pins
#define ORIG_Y_STEP_PIN 23 #define ORIG_Y_STEP_PIN 23
#define ORIG_Y_DIR_PIN 22 #define ORIG_Y_DIR_PIN 22
#define ORIG_Y_ENABLE_PIN 24 #define ORIG_Y_ENABLE_PIN 24
#define Y_STOP_PIN 5 #define Y_STOP_PIN 5
//Z axis pins //Z axis pins
#define ORIG_Z_STEP_PIN 26 #define ORIG_Z_STEP_PIN 26
#define ORIG_Z_DIR_PIN 25 #define ORIG_Z_DIR_PIN 25
#define ORIG_Z_ENABLE_PIN 24 #define ORIG_Z_ENABLE_PIN 24
#define Z_MIN_PIN 1 #define ORIG_Z_MIN_PIN 1
#define Z_MAX_PIN 0 #define ORIG_Z_MAX_PIN 0
//extruder pins //extruder pins
#define ORIG_E0_STEP_PIN 28 #define ORIG_E0_STEP_PIN 28
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
#define SDSS -1 // SCL pin of I2C header #define SDSS -1 // SCL pin of I2C header
#define LED_PIN -1 #define LED_PIN -1
#define ORIG_FAN_PIN 31 #define ORIG_FAN_PIN 31
#define PS_ON_PIN 15 #define PS_ON_PIN 15
//All these generations of Gen7 supply thermistor power //All these generations of Gen7 supply thermistor power
...@@ -282,8 +282,8 @@ ...@@ -282,8 +282,8 @@
#define ORIG_Z_STEP_PIN 26 #define ORIG_Z_STEP_PIN 26
#define ORIG_Z_DIR_PIN 25 #define ORIG_Z_DIR_PIN 25
#define ORIG_Z_ENABLE_PIN 24 #define ORIG_Z_ENABLE_PIN 24
#define Z_MIN_PIN 1 #define ORIG_Z_MIN_PIN 1
#define Z_MAX_PIN 0 #define ORIG_Z_MAX_PIN 0
//extruder pins //extruder pins
#define ORIG_E0_STEP_PIN 28 #define ORIG_E0_STEP_PIN 28
...@@ -413,8 +413,8 @@ ...@@ -413,8 +413,8 @@
#define ORIG_X_ENABLE_PIN 24 #define ORIG_X_ENABLE_PIN 24
//X endstop //X endstop
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN -1 #define ORIG_X_MAX_PIN -1
//Y motor stepper //Y motor stepper
#define ORIG_Y_STEP_PIN 35 #define ORIG_Y_STEP_PIN 35
...@@ -422,8 +422,8 @@ ...@@ -422,8 +422,8 @@
#define ORIG_Y_ENABLE_PIN 31 #define ORIG_Y_ENABLE_PIN 31
//Y endstop //Y endstop
#define Y_MIN_PIN 2 #define ORIG_Y_MIN_PIN 2
#define Y_MAX_PIN -1 #define ORIG_Y_MAX_PIN -1
//Z motor stepper //Z motor stepper
#define ORIG_Z_STEP_PIN 40 #define ORIG_Z_STEP_PIN 40
...@@ -431,8 +431,8 @@ ...@@ -431,8 +431,8 @@
#define ORIG_Z_ENABLE_PIN 37 #define ORIG_Z_ENABLE_PIN 37
//Z endstop //Z endstop
#define Z_MIN_PIN 5 #define ORIG_Z_MIN_PIN 5
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
//Extruder 0 stepper //Extruder 0 stepper
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
...@@ -523,8 +523,8 @@ ...@@ -523,8 +523,8 @@
#define ORIG_Z_STEP_PIN 26 #define ORIG_Z_STEP_PIN 26
#define ORIG_Z_DIR_PIN 25 #define ORIG_Z_DIR_PIN 25
#define ORIG_Z_ENABLE_PIN 24 #define ORIG_Z_ENABLE_PIN 24
#define Z_MIN_PIN 1 #define ORIG_Z_MIN_PIN 1
#define Z_MAX_PIN 0 #define ORIG_Z_MAX_PIN 0
//extruder pins //extruder pins
#define ORIG_E0_STEP_PIN 28 #define ORIG_E0_STEP_PIN 28
...@@ -584,80 +584,80 @@ ...@@ -584,80 +584,80 @@
#endif #endif
#define ORIG_X_STEP_PIN 49 #define ORIG_X_STEP_PIN 49
#define ORIG_X_DIR_PIN 13 #define ORIG_X_DIR_PIN 13
#define ORIG_X_ENABLE_PIN 48 #define ORIG_X_ENABLE_PIN 48
#define X_MIN_PIN 35 #define ORIG_X_MIN_PIN 35
#define X_MAX_PIN -1 //34 #define ORIG_X_MAX_PIN -1 // 34
#define ORIG_Y_STEP_PIN 11 #define ORIG_Y_STEP_PIN 11
#define ORIG_Y_DIR_PIN 9 #define ORIG_Y_DIR_PIN 9
#define ORIG_Y_ENABLE_PIN 12 #define ORIG_Y_ENABLE_PIN 12
#define Y_MIN_PIN 33 #define ORIG_Y_MIN_PIN 33
#define Y_MAX_PIN -1 //32 #define ORIG_Y_MAX_PIN -1 // 32
#define ORIG_Z_STEP_PIN 7 #define ORIG_Z_STEP_PIN 7
#define ORIG_Z_DIR_PIN 6 #define ORIG_Z_DIR_PIN 6
#define ORIG_Z_ENABLE_PIN 8 #define ORIG_Z_ENABLE_PIN 8
#define Z_MIN_PIN 31 #define ORIG_Z_MIN_PIN 31
#define Z_MAX_PIN -1 //30 #define ORIG_Z_MAX_PIN -1 // 30
#define ORIG_E2_STEP_PIN 43 #define ORIG_E2_STEP_PIN 43
#define ORIG_E2_DIR_PIN 47 #define ORIG_E2_DIR_PIN 47
#define ORIG_E2_ENABLE_PIN 42 #define ORIG_E2_ENABLE_PIN 42
#define ORIG_E1_STEP_PIN 18 #define ORIG_E1_STEP_PIN 18
#define ORIG_E1_DIR_PIN 19 #define ORIG_E1_DIR_PIN 19
#define ORIG_E1_ENABLE_PIN 38 #define ORIG_E1_ENABLE_PIN 38
#define ORIG_E0_STEP_PIN 40 #define ORIG_E0_STEP_PIN 40
#define ORIG_E0_DIR_PIN 41 #define ORIG_E0_DIR_PIN 41
#define ORIG_E0_ENABLE_PIN 37 #define ORIG_E0_ENABLE_PIN 37
#define SDPOWER -1 #define SDPOWER -1
#define LED_PIN -1 //Use +12V Aux port for LED Ring #define LED_PIN -1 // Use +12V Aux port for LED Ring
#define ORIG_FAN_PIN 16 //5V PWM #define ORIG_FAN_PIN 16 // 5V PWM
#define PS_ON_PIN 10 //Set to -1 if using a manual switch on the PWRSW Connector #define PS_ON_PIN 10 // Set to -1 if using a manual switch on the PWRSW Connector
#define SLEEP_WAKE_PIN 26 //This feature still needs work #define SLEEP_WAKE_PIN 26 // This feature still needs work
#define ORIG_HEATER_0_PIN 45 //12V PWM1 #define ORIG_HEATER_0_PIN 45 // 12V PWM1
#define ORIG_HEATER_1_PIN 46 //12V PWM2 #define ORIG_HEATER_1_PIN 46 // 12V PWM2
#define ORIG_HEATER_2_PIN 17 //12V PWM3 #define ORIG_HEATER_2_PIN 17 // 12V PWM3
#define ORIG_HEATER_BED_PIN 44 //DOUBLE 12V PWM #define ORIG_HEATER_BED_PIN 44 // DOUBLE 12V PWM
#define ORIG_TEMP_0_PIN 3 //ANALOG NUMBERING #define ORIG_TEMP_0_PIN 3 // ANALOG NUMBERING
#define ORIG_TEMP_1_PIN 2 //ANALOG NUMBERING #define ORIG_TEMP_1_PIN 2 // ANALOG NUMBERING
#define ORIG_TEMP_2_PIN 1 //ANALOG NUMBERING #define ORIG_TEMP_2_PIN 1 // ANALOG NUMBERING
#define ORIG_TEMP_BED_PIN 0 //ANALOG NUMBERING #define ORIG_TEMP_BED_PIN 0 // ANALOG NUMBERING
#define BEEPER_PIN 36 #define BEEPER_PIN 36
#define KILL_PIN -1 #define KILL_PIN -1
// M240 Triggers a camera by emulating a Canon RC-1 Remote // M240 Triggers a camera by emulating a Canon RC-1 Remote
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
#define PHOTOGRAPH_PIN 29 #define PHOTOGRAPH_PIN 29
#if ENABLED(RA_CONTROL_PANEL) #if ENABLED(RA_CONTROL_PANEL)
#define SDSS 53 #define SDSS 53
#define SD_DETECT_PIN 28 #define SD_DETECT_PIN 28
#define BTN_EN1 14 #define BTN_EN1 14
#define BTN_EN2 39 #define BTN_EN2 39
#define BTN_ENC 15 //the click #define BTN_ENC 15 // the click
#define BLEN_C 2 #define BLEN_C 2
#define BLEN_B 1 #define BLEN_B 1
#define BLEN_A 0 #define BLEN_A 0
#endif //RA_CONTROL_PANEL #endif // RA_CONTROL_PANEL
#if ENABLED(RA_DISCO) #if ENABLED(RA_DISCO)
//variables for which pins the TLC5947 is using //variables for which pins the TLC5947 is using
#define TLC_CLOCK_PIN 25 #define TLC_CLOCK_PIN 25
#define TLC_BLANK_PIN 23 #define TLC_BLANK_PIN 23
#define TLC_XLAT_PIN 22 #define TLC_XLAT_PIN 22
#define TLC_DATA_PIN 24 #define TLC_DATA_PIN 24
//We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet! //We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
//This currently only works with the RA Board. //This currently only works with the RA Board.
...@@ -706,55 +706,55 @@ ...@@ -706,55 +706,55 @@
#define DEBUG_PIN 0 #define DEBUG_PIN 0
// x axis // x axis
#define ORIG_X_STEP_PIN 15 #define ORIG_X_STEP_PIN 15
#define ORIG_X_DIR_PIN 18 #define ORIG_X_DIR_PIN 18
#define X_MIN_PIN 20 #define ORIG_X_MIN_PIN 20
//Alex Checar #define X_STOP_PIN 20 //Alex Checar #define X_STOP_PIN 20
#define ORIG_X_ENABLE_PIN 24 //actually uses ORIG_Y_DIR_PIN #define ORIG_X_ENABLE_PIN 24 // actually uses ORIG_Y_DIR_PIN
#define X_MAX_PIN -1 #define ORIG_X_MAX_PIN -1
// y axes // y axes
#define ORIG_Y_STEP_PIN 23 #define ORIG_Y_STEP_PIN 23
#define ORIG_Y_DIR_PIN 22 #define ORIG_Y_DIR_PIN 22
#define Y_MIN_PIN 25 #define ORIG_Y_MIN_PIN 25
//Alex Checar #define Y_STOP_PIN 25 //Alex Checar #define Y_STOP_PIN 25
#define ORIG_Y_ENABLE_PIN 24 //shared with ORIG_X_ENABLE_PIN #define ORIG_Y_ENABLE_PIN 24 // shared with ORIG_X_ENABLE_PIN
#define Y_MAX_PIN -1 #define ORIG_Y_MAX_PIN -1
// z axes // z axes
#define ORIG_Z_STEP_PIN 27 #define ORIG_Z_STEP_PIN 27
#define ORIG_Z_DIR_PIN 28 #define ORIG_Z_DIR_PIN 28
#define Z_MIN_PIN 30 #define ORIG_Z_MIN_PIN 30
//Alex Checar #define Z_STOP_PIN 30 //Alex Checar #define Z_STOP_PIN 30
#define ORIG_Z_ENABLE_PIN 29 #define ORIG_Z_ENABLE_PIN 29
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
//extruder pins //extruder pins
#define ORIG_E0_STEP_PIN 12 #define ORIG_E0_STEP_PIN 12
#define ORIG_E0_DIR_PIN 17 #define ORIG_E0_DIR_PIN 17
#define ORIG_E0_ENABLE_PIN 3 #define ORIG_E0_ENABLE_PIN 3
#define ORIG_HEATER_0_PIN 16 #define ORIG_HEATER_0_PIN 16
#define ORIG_TEMP_0_PIN 0 #define ORIG_TEMP_0_PIN 0
#define ORIG_FAN_PIN -1 #define ORIG_FAN_PIN -1
//bed pins //bed pins
#define ORIG_HEATER_BED_PIN -1 #define ORIG_HEATER_BED_PIN -1
#define ORIG_TEMP_BED_PIN -1 #define ORIG_TEMP_BED_PIN -1
#define SDSS -1 #define SDSS -1
#define SDPOWER -1 #define SDPOWER -1
#define LED_PIN -1 #define LED_PIN -1
//pin for controlling the PSU. //pin for controlling the PSU.
#define PS_ON_PIN 14 #define PS_ON_PIN 14
//Alex extras from Gen3+ //Alex extras from Gen3+
#define KILL_PIN -1 #define KILL_PIN -1
#define ORIG_TEMP_1_PIN -1 #define ORIG_TEMP_1_PIN -1
#define ORIG_TEMP_2_PIN -1 #define ORIG_TEMP_2_PIN -1
#define ORIG_HEATER_2_PIN -1 #define ORIG_HEATER_2_PIN -1
#endif // GEN3_MONOLITHIC #endif // GEN3_MONOLITHIC
/****************************************************************************************/ /****************************************************************************************/
...@@ -779,30 +779,30 @@ ...@@ -779,30 +779,30 @@
#define ORIG_X_STEP_PIN 26 #define ORIG_X_STEP_PIN 26
#define ORIG_X_DIR_PIN 28 #define ORIG_X_DIR_PIN 28
#define ORIG_X_ENABLE_PIN 24 #define ORIG_X_ENABLE_PIN 24
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 38 #define ORIG_Y_STEP_PIN 38
#define ORIG_Y_DIR_PIN 40 #define ORIG_Y_DIR_PIN 40
#define ORIG_Y_ENABLE_PIN 36 #define ORIG_Y_ENABLE_PIN 36
#define Y_MIN_PIN 16 #define ORIG_Y_MIN_PIN 16
#define Y_MAX_PIN 17 #define ORIG_Y_MAX_PIN 17
#define ORIG_Z_STEP_PIN 44 #define ORIG_Z_STEP_PIN 44
#define ORIG_Z_DIR_PIN 46 #define ORIG_Z_DIR_PIN 46
#define ORIG_Z_ENABLE_PIN 42 #define ORIG_Z_ENABLE_PIN 42
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define ORIG_E0_STEP_PIN 32 #define ORIG_E0_STEP_PIN 32
#define ORIG_E0_DIR_PIN 34 #define ORIG_E0_DIR_PIN 34
#define ORIG_E0_ENABLE_PIN 30 #define ORIG_E0_ENABLE_PIN 30
#define SDPOWER 48 #define SDPOWER 48
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
#if ENABLED(RAMPS_V_1_0) // RAMPS_V_1_0 #if ENABLED(RAMPS_V_1_0) // RAMPS_V_1_0
#define ORIG_HEATER_0_PIN 12 // RAMPS 1.0 #define ORIG_HEATER_0_PIN 12 // RAMPS 1.0
...@@ -823,16 +823,16 @@ ...@@ -823,16 +823,16 @@
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#if DISABLED(SDSUPPORT) #if DISABLED(SDSUPPORT)
#define MAX6675_SS 66// Do not use pin 53 if there is even the remote possibility of using Display/SD card #define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#else #else
#define MAX6675_SS 66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif #endif
#if DISABLED(SDSUPPORT) #if DISABLED(SDSUPPORT)
// these pins are defined in the SD library if building with SD support // these pins are defined in the SD library if building with SD support
#define SCK_PIN 52 #define SCK_PIN 52
#define MISO_PIN 50 #define MISO_PIN 50
#define MOSI_PIN 51 #define MOSI_PIN 51
#endif #endif
#endif // RAMPS_OLD #endif // RAMPS_OLD
...@@ -856,37 +856,36 @@ ...@@ -856,37 +856,36 @@
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins // X axis pins
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
//Y axis pins // Y axis pins
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
//Z axis pins // Z axis pins
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Z_PROBE_PIN 19
#define Z2_STEP_PIN 36 #define Z2_STEP_PIN 36
#define Z2_DIR_PIN 34 #define Z2_DIR_PIN 34
#define Z2_ENABLE_PIN 30 #define Z2_ENABLE_PIN 30
//E axis pins // E axis pins
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
#define ORIG_E0_DIR_PIN 28 #define ORIG_E0_DIR_PIN 28
#define ORIG_E0_ENABLE_PIN 24 #define ORIG_E0_ENABLE_PIN 24
...@@ -899,36 +898,36 @@ ...@@ -899,36 +898,36 @@
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define ORIG_FAN_PIN 9 #define ORIG_FAN_PIN 9
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define ORIG_HEATER_0_PIN 10 // Hotend 1 #define ORIG_HEATER_0_PIN 10 // Hotend 1
#define ORIG_HEATER_1_PIN -1 #define ORIG_HEATER_1_PIN -1
#define ORIG_HEATER_2_PIN -1 #define ORIG_HEATER_2_PIN -1
#define ORIG_HEATER_3_PIN -1 #define ORIG_HEATER_3_PIN -1
#define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING #define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING
#define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING #define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING
#define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING
#define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING
#define ORIG_HEATER_BED_PIN 8 // BED #define ORIG_HEATER_BED_PIN 8 // BED
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING #define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
#define KILL_PIN 41 #define KILL_PIN 41
#else #else
#define KILL_PIN -1 #define KILL_PIN -1
#endif #endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 5 #define SERVO2_PIN 5
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 4 #define SERVO3_PIN 4
#endif #endif
#endif #endif
#endif #endif
...@@ -937,86 +936,86 @@ ...@@ -937,86 +936,86 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
#define LCD_PINS_D5 66 #define LCD_PINS_D5 66
#define LCD_PINS_D6 44 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64 #define LCD_PINS_D7 64
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif //PANEL_ONE #endif // PANEL_ONE
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_PIN_BL 33
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER_PIN 33 // Beeper on AUX-4 #define BEEPER_PIN 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif ENABLED(PANEL_ONE) #elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 // the click
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#else #else
#define SD_DETECT_PIN -1 // Ramps does not use this port #define SD_DETECT_PIN -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else // old style panel with shift register
//arduino pin witch triggers an piezzo beeper // arduino pin witch triggers an piezo beeper
#define BEEPER_PIN 33 //No Beeper added #define BEEPER_PIN 33 // No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
...@@ -1040,9 +1039,9 @@ ...@@ -1040,9 +1039,9 @@
#define SCK_PIN 52 #define SCK_PIN 52
#define MISO_PIN 50 #define MISO_PIN 50
#define MOSI_PIN 51 #define MOSI_PIN 51
#define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card #define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#else #else
#define MAX6675_SS 66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif #endif
#endif // RAMPS_13_HFB #endif // RAMPS_13_HFB
...@@ -1066,66 +1065,65 @@ ...@@ -1066,66 +1065,65 @@
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins //X axis pins
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
//Y axis pins //Y axis pins
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
//Z axis pins //Z axis pins
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Z_PROBE_PIN 19
#define Z2_STEP_PIN 36 #define Z2_STEP_PIN 36
#define Z2_DIR_PIN 34 #define Z2_DIR_PIN 34
#define Z2_ENABLE_PIN 30 #define Z2_ENABLE_PIN 30
//E axis pins //E axis pins
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
#define ORIG_E0_DIR_PIN 28 #define ORIG_E0_DIR_PIN 28
#define ORIG_E0_ENABLE_PIN 24 #define ORIG_E0_ENABLE_PIN 24
#define ORIG_E1_STEP_PIN 36 #define ORIG_E1_STEP_PIN 36
#define ORIG_E1_DIR_PIN 34 #define ORIG_E1_DIR_PIN 34
#define ORIG_E1_ENABLE_PIN 30 #define ORIG_E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define ORIG_FAN_PIN 4 #define ORIG_FAN_PIN 4
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define ORIG_HEATER_0_PIN 10 // HOTEND 1 #define ORIG_HEATER_0_PIN 10 // HOTEND 1
#define ORIG_HEATER_1_PIN 9 // HOTEND 2 #define ORIG_HEATER_1_PIN 9 // HOTEND 2
#define ORIG_HEATER_2_PIN -1 #define ORIG_HEATER_2_PIN -1
#define ORIG_HEATER_3_PIN -1 #define ORIG_HEATER_3_PIN -1
#define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING #define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING
#define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING #define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING
#define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING
#define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING
#define ORIG_HEATER_BED_PIN 8 // BED #define ORIG_HEATER_BED_PIN 8 // BED
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING #define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
...@@ -1140,87 +1138,87 @@ ...@@ -1140,87 +1138,87 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
#define LCD_PINS_D5 66 #define LCD_PINS_D5 66
#define LCD_PINS_D6 44 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64 #define LCD_PINS_D7 64
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif //PANEL_ONE #endif // PANEL_ONE
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_PIN_BL 33
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER_PIN 33 // Beeper on AUX-4 #define BEEPER_PIN 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif ENABLED(PANEL_ONE) #elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 // the click
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#else #else
#define SD_DETECT_PIN -1 // Ramps does not use this port #define SD_DETECT_PIN -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else // old style panel with shift register
//arduino pin witch triggers an piezzo beeper // arduino pin witch triggers an piezo beeper
#define BEEPER_PIN 33 //No Beeper added #define BEEPER_PIN 33 // No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
...@@ -1269,72 +1267,71 @@ ...@@ -1269,72 +1267,71 @@
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins //X axis pins
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
//Y axis pins //Y axis pins
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
//Z axis pins //Z axis pins
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Z_PROBE_PIN 19
#define Z2_STEP_PIN 36 #define Z2_STEP_PIN 36
#define Z2_DIR_PIN 34 #define Z2_DIR_PIN 34
#define Z2_ENABLE_PIN 30 #define Z2_ENABLE_PIN 30
//E axis pins //E axis pins
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
#define ORIG_E0_DIR_PIN 28 #define ORIG_E0_DIR_PIN 28
#define ORIG_E0_ENABLE_PIN 24 #define ORIG_E0_ENABLE_PIN 24
#define ORIG_E1_STEP_PIN 36 #define ORIG_E1_STEP_PIN 36
#define ORIG_E1_DIR_PIN 34 #define ORIG_E1_DIR_PIN 34
#define ORIG_E1_ENABLE_PIN 30 #define ORIG_E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define ORIG_FAN_PIN 9 #define ORIG_FAN_PIN 9
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define ORIG_HEATER_0_PIN 10 // HOTEND 1 #define ORIG_HEATER_0_PIN 10 // HOTEND 1
#define ORIG_HEATER_1_PIN -1 #define ORIG_HEATER_1_PIN -1
#define ORIG_HEATER_2_PIN -1 #define ORIG_HEATER_2_PIN -1
#define ORIG_HEATER_3_PIN -1 #define ORIG_HEATER_3_PIN -1
#define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING #define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING
#define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING #define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING
#define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_2_PIN -1 // ANALOG NUMBERING
#define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING
#define ORIG_HEATER_BED_PIN -1 // BED #define ORIG_HEATER_BED_PIN -1 // BED
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING #define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 5 #define SERVO2_PIN 5
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 4 #define SERVO3_PIN 4
#endif #endif
#endif #endif
#endif #endif
...@@ -1343,87 +1340,87 @@ ...@@ -1343,87 +1340,87 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
#define LCD_PINS_D5 66 #define LCD_PINS_D5 66
#define LCD_PINS_D6 44 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64 #define LCD_PINS_D7 64
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif //PANEL_ONE #endif // PANEL_ONE
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_PIN_BL 33
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER_PIN 33 // Beeper on AUX-4 #define BEEPER_PIN 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif ENABLED(PANEL_ONE) #elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 // the click
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#else #else
#define SD_DETECT_PIN -1 // Ramps does not use this port #define SD_DETECT_PIN -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else // old style panel with shift register
//arduino pin witch triggers an piezzo beeper // arduino pin witch triggers an piezo beeper
#define BEEPER_PIN 33 //No Beeper added #define BEEPER_PIN 33 // No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
...@@ -1475,31 +1472,30 @@ ...@@ -1475,31 +1472,30 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
//Y axis pins //Y axis pins
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
//Z axis pins //Z axis pins
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Z_PROBE_PIN 19
#define Z2_STEP_PIN 36 #define Z2_STEP_PIN 36
#define Z2_DIR_PIN 34 #define Z2_DIR_PIN 34
#define Z2_ENABLE_PIN 30 #define Z2_ENABLE_PIN 30
//E axis pins //E axis pins
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
...@@ -1510,12 +1506,12 @@ ...@@ -1510,12 +1506,12 @@
#define ORIG_E1_DIR_PIN 34 #define ORIG_E1_DIR_PIN 34
#define ORIG_E1_ENABLE_PIN 30 #define ORIG_E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define ORIG_FAN_PIN 8 #define ORIG_FAN_PIN 8
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define ORIG_HEATER_0_PIN 10 // HOTEND 1 #define ORIG_HEATER_0_PIN 10 // HOTEND 1
#define ORIG_HEATER_1_PIN 9 // HOTEND 2 #define ORIG_HEATER_1_PIN 9 // HOTEND 2
...@@ -1533,11 +1529,11 @@ ...@@ -1533,11 +1529,11 @@
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 5 #define SERVO2_PIN 5
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 4 #define SERVO3_PIN 4
#endif #endif
#endif #endif
#endif #endif
...@@ -1546,87 +1542,87 @@ ...@@ -1546,87 +1542,87 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
#define LCD_PINS_D5 66 #define LCD_PINS_D5 66
#define LCD_PINS_D6 44 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64 #define LCD_PINS_D7 64
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif //PANEL_ONE #endif // PANEL_ONE
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_PIN_BL 33
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER_PIN 33 // Beeper on AUX-4 #define BEEPER_PIN 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif ENABLED(PANEL_ONE) #elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 // the click
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#else #else
#define SD_DETECT_PIN -1 // Ramps does not use this port #define SD_DETECT_PIN -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else // old style panel with shift register
//arduino pin witch triggers an piezzo beeper // arduino pin witch triggers an piezo beeper
#define BEEPER_PIN 33 //No Beeper added #define BEEPER_PIN 33 // No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
...@@ -1678,31 +1674,30 @@ ...@@ -1678,31 +1674,30 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
//Y axis pins //Y axis pins
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
//Z axis pins //Z axis pins
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Z_PROBE_PIN 18
#define Z2_STEP_PIN 36 #define Z2_STEP_PIN 36
#define Z2_DIR_PIN 34 #define Z2_DIR_PIN 34
#define Z2_ENABLE_PIN 30 #define Z2_ENABLE_PIN 30
//E axis pins //E axis pins
#define ORIG_E0_STEP_PIN 26 #define ORIG_E0_STEP_PIN 26
...@@ -1713,34 +1708,34 @@ ...@@ -1713,34 +1708,34 @@
#define ORIG_E1_DIR_PIN 34 #define ORIG_E1_DIR_PIN 34
#define ORIG_E1_ENABLE_PIN 30 #define ORIG_E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define ORIG_FAN_PIN 8 #define ORIG_FAN_PIN 8
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define ORIG_HEATER_0_PIN 10 // HOTEND 1 #define ORIG_HEATER_0_PIN 10 // HOTEND 1
#define ORIG_HEATER_1_PIN 9 // HOTEND 2 #define ORIG_HEATER_1_PIN 9 // HOTEND 2
#define ORIG_HEATER_2_PIN 8 // HOTEND 3 #define ORIG_HEATER_2_PIN 8 // HOTEND 3
#define ORIG_HEATER_3_PIN -1 #define ORIG_HEATER_3_PIN -1
#define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING #define ORIG_TEMP_0_PIN 13 // ANALOG NUMBERING
#define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING #define ORIG_TEMP_1_PIN 15 // ANALOG NUMBERING
#define ORIG_TEMP_2_PIN 14 // ANALOG NUMBERING #define ORIG_TEMP_2_PIN 14 // ANALOG NUMBERING
#define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_3_PIN -1 // ANALOG NUMBERING
#define ORIG_HEATER_BED_PIN -1 // BED #define ORIG_HEATER_BED_PIN -1 // BED
#define ORIG_TEMP_BED_PIN -1 // ANALOG NUMBERING #define ORIG_TEMP_BED_PIN -1 // ANALOG NUMBERING
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 5 #define SERVO2_PIN 5
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 4 #define SERVO3_PIN 4
#endif #endif
#endif #endif
#endif #endif
...@@ -1749,87 +1744,87 @@ ...@@ -1749,87 +1744,87 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
#define LCD_PINS_D5 66 #define LCD_PINS_D5 66
#define LCD_PINS_D6 44 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64 #define LCD_PINS_D7 64
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif //PANEL_ONE #endif // PANEL_ONE
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_PIN_BL 33
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER_PIN 33 // Beeper on AUX-4 #define BEEPER_PIN 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif ENABLED(PANEL_ONE) #elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 // the click
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#else #else
#define SD_DETECT_PIN -1 // Ramps does not use this port #define SD_DETECT_PIN -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else // old style panel with shift register
//arduino pin witch triggers an piezzo beeper // arduino pin witch triggers an piezo beeper
#define BEEPER_PIN 33 //No Beeper added #define BEEPER_PIN 33 // No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
...@@ -1878,24 +1873,24 @@ ...@@ -1878,24 +1873,24 @@
#define ORIG_X_STEP_PIN 37 #define ORIG_X_STEP_PIN 37
#define ORIG_X_DIR_PIN 48 #define ORIG_X_DIR_PIN 48
#define X_MIN_PIN 12 #define ORIG_X_MIN_PIN 12
#define X_MAX_PIN 24 #define ORIG_X_MAX_PIN 24
#define ORIG_X_ENABLE_PIN 29 #define ORIG_X_ENABLE_PIN 29
#define X_MS1_PIN 40 #define X_MS1_PIN 40
#define X_MS2_PIN 41 #define X_MS2_PIN 41
#define ORIG_Y_STEP_PIN 36 #define ORIG_Y_STEP_PIN 36
#define ORIG_Y_DIR_PIN 49 #define ORIG_Y_DIR_PIN 49
#define Y_MIN_PIN 11 #define ORIG_Y_MIN_PIN 11
#define Y_MAX_PIN 23 #define ORIG_Y_MAX_PIN 23
#define ORIG_Y_ENABLE_PIN 28 #define ORIG_Y_ENABLE_PIN 28
#define Y_MS1_PIN 69 #define Y_MS1_PIN 69
#define Y_MS2_PIN 39 #define Y_MS2_PIN 39
#define ORIG_Z_STEP_PIN 35 #define ORIG_Z_STEP_PIN 35
#define ORIG_Z_DIR_PIN 47 #define ORIG_Z_DIR_PIN 47
#define Z_MIN_PIN 10 #define ORIG_Z_MIN_PIN 10
#define Z_MAX_PIN 30 #define ORIG_Z_MAX_PIN 30
#define ORIG_Z_ENABLE_PIN 27 #define ORIG_Z_ENABLE_PIN 27
#define Z_MS1_PIN 68 #define Z_MS1_PIN 68
#define Z_MS2_PIN 67 #define Z_MS2_PIN 67
...@@ -2075,12 +2070,12 @@ ...@@ -2075,12 +2070,12 @@
#define ORIG_Z_DIR_PIN 3 #define ORIG_Z_DIR_PIN 3
#define ORIG_Z_ENABLE_PIN 15 #define ORIG_Z_ENABLE_PIN 15
#define X_MIN_PIN 28 #define ORIG_X_MIN_PIN 28
#define X_MAX_PIN -1 // 34 //Max endstops default to disabled "-1", set to commented value to enable. #define ORIG_X_MAX_PIN -1 // 34 //Max endstops default to disabled "-1", set to commented value to enable.
#define Y_MIN_PIN 30 #define ORIG_Y_MIN_PIN 30
#define Y_MAX_PIN -1 // 36 #define ORIG_Y_MAX_PIN -1 // 36
#define Z_MIN_PIN 32 #define ORIG_Z_MIN_PIN 32
#define Z_MAX_PIN -1 // 38 #define ORIG_Z_MAX_PIN -1 // 38
#define ORIG_E0_STEP_PIN 61 #define ORIG_E0_STEP_PIN 61
#define ORIG_E0_DIR_PIN 60 #define ORIG_E0_DIR_PIN 60
...@@ -2201,20 +2196,20 @@ ...@@ -2201,20 +2196,20 @@
#define ORIG_X_STEP_PIN 63 #define ORIG_X_STEP_PIN 63
#define ORIG_X_DIR_PIN 62 #define ORIG_X_DIR_PIN 62
#define ORIG_X_ENABLE_PIN 48 #define ORIG_X_ENABLE_PIN 48
#define X_MIN_PIN 22 #define ORIG_X_MIN_PIN 22
#define X_MAX_PIN 30 #define ORIG_X_MAX_PIN 30
#define ORIG_Y_STEP_PIN 65 #define ORIG_Y_STEP_PIN 65
#define ORIG_Y_DIR_PIN 64 #define ORIG_Y_DIR_PIN 64
#define ORIG_Y_ENABLE_PIN 46 #define ORIG_Y_ENABLE_PIN 46
#define Y_MIN_PIN 24 #define ORIG_Y_MIN_PIN 24
#define Y_MAX_PIN 38 #define ORIG_Y_MAX_PIN 38
#define ORIG_Z_STEP_PIN 67 #define ORIG_Z_STEP_PIN 67
#define ORIG_Z_DIR_PIN 66 #define ORIG_Z_DIR_PIN 66
#define ORIG_Z_ENABLE_PIN 44 #define ORIG_Z_ENABLE_PIN 44
#define Z_MIN_PIN 26 #define ORIG_Z_MIN_PIN 26
#define Z_MAX_PIN 34 #define ORIG_Z_MAX_PIN 34
#define ORIG_E0_STEP_PIN 36 #define ORIG_E0_STEP_PIN 36
#define ORIG_E0_DIR_PIN 28 #define ORIG_E0_DIR_PIN 28
...@@ -2325,22 +2320,22 @@ ...@@ -2325,22 +2320,22 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
// Note that on the Due pin A0 on the board is channel 2 on the ARM chip // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
...@@ -2386,20 +2381,20 @@ ...@@ -2386,20 +2381,20 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
...@@ -2514,24 +2509,24 @@ ...@@ -2514,24 +2509,24 @@
#define ORIG_X_STEP_PIN 96 // PB24 #define ORIG_X_STEP_PIN 96 // PB24
#define ORIG_X_DIR_PIN 2 // PB25 #define ORIG_X_DIR_PIN 2 // PB25
#define ORIG_X_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_X_ENABLE_PIN 24 // PA15, motor RESET pin
#define X_MIN_PIN 33 // PC1 #define ORIG_X_MIN_PIN 33 // PC1
#define X_MAX_PIN 34 // PC2 #define ORIG_X_MAX_PIN 34 // PC2
#define X_MS1_PIN 99 // PC10 #define X_MS1_PIN 99 // PC10
// Y AXIS // Y AXIS
#define ORIG_Y_STEP_PIN 94 // PB22 #define ORIG_Y_STEP_PIN 94 // PB22
#define ORIG_Y_DIR_PIN 95 // PB23 #define ORIG_Y_DIR_PIN 95 // PB23
#define ORIG_Y_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_Y_ENABLE_PIN 24 // PA15, motor RESET pin
#define Y_MIN_PIN 35 // PC3 #define ORIG_Y_MIN_PIN 35 // PC3
#define Y_MAX_PIN 37 // PC5 #define ORIG_Y_MAX_PIN 37 // PC5
#define Y_MS1_PIN 10 // PC29 #define Y_MS1_PIN 10 // PC29
// Z AXIS // Z AXIS
#define ORIG_Z_STEP_PIN 98 // PC27 #define ORIG_Z_STEP_PIN 98 // PC27
#define ORIG_Z_DIR_PIN 3 // PC28 #define ORIG_Z_DIR_PIN 3 // PC28
#define ORIG_Z_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_Z_ENABLE_PIN 24 // PA15, motor RESET pin
#define Z_MIN_PIN 38 // PC6 #define ORIG_Z_MIN_PIN 38 // PC6
#define Z_MAX_PIN 39 // PC7 #define ORIG_Z_MAX_PIN 39 // PC7
#define Z_MS1_PIN 44 // PC19 #define Z_MS1_PIN 44 // PC19
// E0 AXIS // E0 AXIS
...@@ -2846,20 +2841,20 @@ ...@@ -2846,20 +2841,20 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
...@@ -3039,20 +3034,20 @@ ...@@ -3039,20 +3034,20 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
...@@ -3256,20 +3251,20 @@ ...@@ -3256,20 +3251,20 @@
#define ORIG_X_STEP_PIN 25 #define ORIG_X_STEP_PIN 25
#define ORIG_X_DIR_PIN 23 #define ORIG_X_DIR_PIN 23
#define X_MIN_PIN 22 #define ORIG_X_MIN_PIN 22
#define X_MAX_PIN 24 #define ORIG_X_MAX_PIN 24
#define ORIG_X_ENABLE_PIN 27 #define ORIG_X_ENABLE_PIN 27
#define ORIG_Y_STEP_PIN 31 #define ORIG_Y_STEP_PIN 31
#define ORIG_Y_DIR_PIN 33 #define ORIG_Y_DIR_PIN 33
#define Y_MIN_PIN 26 #define ORIG_Y_MIN_PIN 26
#define Y_MAX_PIN 28 #define ORIG_Y_MAX_PIN 28
#define ORIG_Y_ENABLE_PIN 29 #define ORIG_Y_ENABLE_PIN 29
#define ORIG_Z_STEP_PIN 37 #define ORIG_Z_STEP_PIN 37
#define ORIG_Z_DIR_PIN 39 #define ORIG_Z_DIR_PIN 39
#define Z_MIN_PIN 30 #define ORIG_Z_MIN_PIN 30
#define Z_MAX_PIN 32 #define ORIG_Z_MAX_PIN 32
#define ORIG_Z_ENABLE_PIN 35 #define ORIG_Z_ENABLE_PIN 35
#define ORIG_HEATER_BED_PIN 4 #define ORIG_HEATER_BED_PIN 4
...@@ -3363,20 +3358,20 @@ ...@@ -3363,20 +3358,20 @@
#define ORIG_X_STEP_PIN 26 #define ORIG_X_STEP_PIN 26
#define ORIG_X_DIR_PIN 28 #define ORIG_X_DIR_PIN 28
#define ORIG_X_ENABLE_PIN 24 #define ORIG_X_ENABLE_PIN 24
#define X_MIN_PIN 41 #define ORIG_X_MIN_PIN 41
#define X_MAX_PIN 37 #define ORIG_X_MAX_PIN 37
#define ORIG_Y_STEP_PIN 60 // A6 #define ORIG_Y_STEP_PIN 60 // A6
#define ORIG_Y_DIR_PIN 61 // A7 #define ORIG_Y_DIR_PIN 61 // A7
#define ORIG_Y_ENABLE_PIN 22 #define ORIG_Y_ENABLE_PIN 22
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 54 // A0 #define ORIG_Z_STEP_PIN 54 // A0
#define ORIG_Z_DIR_PIN 55 // A1 #define ORIG_Z_DIR_PIN 55 // A1
#define ORIG_Z_ENABLE_PIN 56 // A2 #define ORIG_Z_ENABLE_PIN 56 // A2
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define ORIG_E0_STEP_PIN 31 #define ORIG_E0_STEP_PIN 31
#define ORIG_E0_DIR_PIN 32 #define ORIG_E0_DIR_PIN 32
...@@ -3462,20 +3457,20 @@ ...@@ -3462,20 +3457,20 @@
#define ORIG_X_STEP_PIN 26 #define ORIG_X_STEP_PIN 26
#define ORIG_X_DIR_PIN 27 #define ORIG_X_DIR_PIN 27
#define ORIG_X_ENABLE_PIN 25 #define ORIG_X_ENABLE_PIN 25
#define X_MIN_PIN 37 #define ORIG_X_MIN_PIN 37
#define X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable. #define ORIG_X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable.
#define ORIG_Y_STEP_PIN 4 // A6 #define ORIG_Y_STEP_PIN 4 // A6
#define ORIG_Y_DIR_PIN 54 // A0 #define ORIG_Y_DIR_PIN 54 // A0
#define ORIG_Y_ENABLE_PIN 5 #define ORIG_Y_ENABLE_PIN 5
#define Y_MIN_PIN 41 #define ORIG_Y_MIN_PIN 41
#define Y_MAX_PIN 38 //15 #define ORIG_Y_MAX_PIN 38 //15
#define ORIG_Z_STEP_PIN 56 // A2 #define ORIG_Z_STEP_PIN 56 // A2
#define ORIG_Z_DIR_PIN 60 // A6 #define ORIG_Z_DIR_PIN 60 // A6
#define ORIG_Z_ENABLE_PIN 55 // A1 #define ORIG_Z_ENABLE_PIN 55 // A1
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define ORIG_E0_STEP_PIN 35 #define ORIG_E0_STEP_PIN 35
#define ORIG_E0_DIR_PIN 36 #define ORIG_E0_DIR_PIN 36
...@@ -3575,20 +3570,20 @@ ...@@ -3575,20 +3570,20 @@
#define ORIG_X_STEP_PIN 48 #define ORIG_X_STEP_PIN 48
#define ORIG_X_DIR_PIN 47 #define ORIG_X_DIR_PIN 47
#define ORIG_X_ENABLE_PIN 49 #define ORIG_X_ENABLE_PIN 49
#define X_MIN_PIN 5 #define ORIG_X_MIN_PIN 5
#define X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable. #define ORIG_X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable.
#define ORIG_Y_STEP_PIN 39 // A6 #define ORIG_Y_STEP_PIN 39 // A6
#define ORIG_Y_DIR_PIN 40 // A0 #define ORIG_Y_DIR_PIN 40 // A0
#define ORIG_Y_ENABLE_PIN 38 #define ORIG_Y_ENABLE_PIN 38
#define Y_MIN_PIN 2 #define ORIG_Y_MIN_PIN 2
#define Y_MAX_PIN -1 //15 #define ORIG_Y_MAX_PIN -1 //15
#define ORIG_Z_STEP_PIN 42 // A2 #define ORIG_Z_STEP_PIN 42 // A2
#define ORIG_Z_DIR_PIN 43 // A6 #define ORIG_Z_DIR_PIN 43 // A6
#define ORIG_Z_ENABLE_PIN 41 // A1 #define ORIG_Z_ENABLE_PIN 41 // A1
#define Z_MIN_PIN 6 #define ORIG_Z_MIN_PIN 6
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
#define ORIG_E0_STEP_PIN 45 #define ORIG_E0_STEP_PIN 45
#define ORIG_E0_DIR_PIN 44 #define ORIG_E0_DIR_PIN 44
...@@ -3669,20 +3664,20 @@ ...@@ -3669,20 +3664,20 @@
#define ORIG_X_STEP_PIN 58 #define ORIG_X_STEP_PIN 58
#define ORIG_X_DIR_PIN 57 #define ORIG_X_DIR_PIN 57
#define ORIG_X_ENABLE_PIN 59 #define ORIG_X_ENABLE_PIN 59
#define X_MIN_PIN 37 #define ORIG_X_MIN_PIN 37
#define X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable. #define ORIG_X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable.
#define ORIG_Y_STEP_PIN 5 // A6 #define ORIG_Y_STEP_PIN 5 // A6
#define ORIG_Y_DIR_PIN 17 // A0 #define ORIG_Y_DIR_PIN 17 // A0
#define ORIG_Y_ENABLE_PIN 4 #define ORIG_Y_ENABLE_PIN 4
#define Y_MIN_PIN 41 #define ORIG_Y_MIN_PIN 41
#define Y_MAX_PIN 38 //15 #define ORIG_Y_MAX_PIN 38 //15
#define ORIG_Z_STEP_PIN 16 // A2 #define ORIG_Z_STEP_PIN 16 // A2
#define ORIG_Z_DIR_PIN 11 // A6 #define ORIG_Z_DIR_PIN 11 // A6
#define ORIG_Z_ENABLE_PIN 3 // A1 #define ORIG_Z_ENABLE_PIN 3 // A1
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN 19 #define ORIG_Z_MAX_PIN 19
#define ORIG_E0_STEP_PIN 28 #define ORIG_E0_STEP_PIN 28
#define ORIG_E0_DIR_PIN 27 #define ORIG_E0_DIR_PIN 27
...@@ -3799,20 +3794,20 @@ ...@@ -3799,20 +3794,20 @@
#define ORIG_X_STEP_PIN 25 #define ORIG_X_STEP_PIN 25
#define ORIG_X_DIR_PIN 23 #define ORIG_X_DIR_PIN 23
#define X_MIN_PIN 15 #define ORIG_X_MIN_PIN 15
#define X_MAX_PIN 14 #define ORIG_X_MAX_PIN 14
#define ORIG_X_ENABLE_PIN 27 #define ORIG_X_ENABLE_PIN 27
#define ORIG_Y_STEP_PIN 31 #define ORIG_Y_STEP_PIN 31
#define ORIG_Y_DIR_PIN 33 #define ORIG_Y_DIR_PIN 33
#define Y_MIN_PIN 17 #define ORIG_Y_MIN_PIN 17
#define Y_MAX_PIN 16 #define ORIG_Y_MAX_PIN 16
#define ORIG_Y_ENABLE_PIN 29 #define ORIG_Y_ENABLE_PIN 29
#define ORIG_Z_STEP_PIN 37 #define ORIG_Z_STEP_PIN 37
#define ORIG_Z_DIR_PIN 39 #define ORIG_Z_DIR_PIN 39
#define Z_MIN_PIN 19 #define ORIG_Z_MIN_PIN 19
#define Z_MAX_PIN 18 #define ORIG_Z_MAX_PIN 18
#define ORIG_Z_ENABLE_PIN 35 #define ORIG_Z_ENABLE_PIN 35
#define ORIG_HEATER_BED_PIN -1 #define ORIG_HEATER_BED_PIN -1
...@@ -3962,20 +3957,20 @@ ...@@ -3962,20 +3957,20 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 63 #define ORIG_Z_ENABLE_PIN 63
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
...@@ -4085,20 +4080,20 @@ ...@@ -4085,20 +4080,20 @@
#define ORIG_X_STEP_PIN 54 #define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55 #define ORIG_X_DIR_PIN 55
#define ORIG_X_ENABLE_PIN 38 #define ORIG_X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define ORIG_X_MIN_PIN 3
#define X_MAX_PIN 2 #define ORIG_X_MAX_PIN 2
#define ORIG_Y_STEP_PIN 60 #define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61 #define ORIG_Y_DIR_PIN 61
#define ORIG_Y_ENABLE_PIN 56 #define ORIG_Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define ORIG_Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define ORIG_Y_MAX_PIN 15
#define ORIG_Z_STEP_PIN 46 #define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48 #define ORIG_Z_DIR_PIN 48
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 #define ORIG_Z_MIN_PIN 18
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
...@@ -4289,14 +4284,14 @@ ...@@ -4289,14 +4284,14 @@
#define ORIG_X_STEP_PIN 17 #define ORIG_X_STEP_PIN 17
#define ORIG_X_DIR_PIN 16 #define ORIG_X_DIR_PIN 16
#define ORIG_X_ENABLE_PIN 48 #define ORIG_X_ENABLE_PIN 48
#define X_MIN_PIN 37 #define ORIG_X_MIN_PIN 37
#define X_MAX_PIN 36 #define ORIG_X_MAX_PIN 36
#define ORIG_Y_STEP_PIN 54 #define ORIG_Y_STEP_PIN 54
#define ORIG_Y_DIR_PIN 47 #define ORIG_Y_DIR_PIN 47
#define ORIG_Y_ENABLE_PIN 55 #define ORIG_Y_ENABLE_PIN 55
#define Y_MIN_PIN 35 #define ORIG_Y_MIN_PIN 35
#define Y_MAX_PIN 34 #define ORIG_Y_MAX_PIN 34
#define Y2_STEP_PIN 26 #define Y2_STEP_PIN 26
#define Y2_DIR_PIN 25 #define Y2_DIR_PIN 25
...@@ -4305,8 +4300,8 @@ ...@@ -4305,8 +4300,8 @@
#define ORIG_Z_STEP_PIN 57 #define ORIG_Z_STEP_PIN 57
#define ORIG_Z_DIR_PIN 56 #define ORIG_Z_DIR_PIN 56
#define ORIG_Z_ENABLE_PIN 62 #define ORIG_Z_ENABLE_PIN 62
#define Z_MIN_PIN 33 #define ORIG_Z_MIN_PIN 33
#define Z_MAX_PIN 32 #define ORIG_Z_MAX_PIN 32
#define Z2_STEP_PIN 26 #define Z2_STEP_PIN 26
#define Z2_DIR_PIN 25 #define Z2_DIR_PIN 25
...@@ -5006,20 +5001,20 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a ...@@ -5006,20 +5001,20 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
#define ORIG_X_STEP_PIN 28 #define ORIG_X_STEP_PIN 28
#define ORIG_X_DIR_PIN 63 #define ORIG_X_DIR_PIN 63
#define ORIG_X_ENABLE_PIN 29 #define ORIG_X_ENABLE_PIN 29
#define X_MIN_PIN 47 #define ORIG_X_MIN_PIN 47
#define X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable. #define ORIG_X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable.
#define ORIG_Y_STEP_PIN 14 // A6 #define ORIG_Y_STEP_PIN 14 // A6
#define ORIG_Y_DIR_PIN 15 // A0 #define ORIG_Y_DIR_PIN 15 // A0
#define ORIG_Y_ENABLE_PIN 39 #define ORIG_Y_ENABLE_PIN 39
#define Y_MIN_PIN 48 #define ORIG_Y_MIN_PIN 48
#define Y_MAX_PIN -1 //15 #define ORIG_Y_MAX_PIN -1 //15
#define ORIG_Z_STEP_PIN 31 // A2 #define ORIG_Z_STEP_PIN 31 // A2
#define ORIG_Z_DIR_PIN 32 // A6 #define ORIG_Z_DIR_PIN 32 // A6
#define ORIG_Z_ENABLE_PIN 30 // A1 #define ORIG_Z_ENABLE_PIN 30 // A1
#define Z_MIN_PIN 49 #define ORIG_Z_MIN_PIN 49
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
#define ORIG_E0_STEP_PIN 34 //34 #define ORIG_E0_STEP_PIN 34 //34
#define ORIG_E0_DIR_PIN 35 //35 #define ORIG_E0_DIR_PIN 35 //35
...@@ -5146,7 +5141,6 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a ...@@ -5146,7 +5141,6 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
********************************* END MOTHERBOARD *************************************** ********************************* END MOTHERBOARD ***************************************
/****************************************************************************************/ /****************************************************************************************/
#ifndef ORIG_HEATER_1_PIN #ifndef ORIG_HEATER_1_PIN
#define ORIG_HEATER_1_PIN -1 #define ORIG_HEATER_1_PIN -1
#endif #endif
...@@ -5168,120 +5162,93 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a ...@@ -5168,120 +5162,93 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
#if ENABLED(X_STOP_PIN) #if ENABLED(X_STOP_PIN)
#if X_HOME_DIR < 0 #if X_HOME_DIR < 0
#define X_MIN_PIN X_STOP_PIN #define ORIG_X_MIN_PIN X_STOP_PIN
#define X_MAX_PIN -1 #define ORIG_X_MAX_PIN -1
#else #else
#define X_MIN_PIN -1 #define ORIG_X_MIN_PIN -1
#define X_MAX_PIN X_STOP_PIN #define ORIG_X_MAX_PIN X_STOP_PIN
#endif #endif
#endif #endif
#if ENABLED(Y_STOP_PIN) #if ENABLED(Y_STOP_PIN)
#if Y_HOME_DIR < 0 #if Y_HOME_DIR < 0
#define Y_MIN_PIN Y_STOP_PIN #define ORIG_Y_MIN_PIN Y_STOP_PIN
#define Y_MAX_PIN -1 #define ORIG_Y_MAX_PIN -1
#else #else
#define Y_MIN_PIN -1 #define ORIG_Y_MIN_PIN -1
#define Y_MAX_PIN Y_STOP_PIN #define ORIG_Y_MAX_PIN Y_STOP_PIN
#endif #endif
#endif #endif
#if ENABLED(Z_STOP_PIN) #if ENABLED(Z_STOP_PIN)
#if Z_HOME_DIR < 0 #if Z_HOME_DIR < 0
#define Z_MIN_PIN Z_STOP_PIN #define ORIG_Z_MIN_PIN Z_STOP_PIN
#define Z_MAX_PIN -1 #define ORIG_Z_MAX_PIN -1
#else #else
#define Z_MIN_PIN -1 #define ORIG_Z_MIN_PIN -1
#define Z_MAX_PIN Z_STOP_PIN #define ORIG_Z_MAX_PIN Z_STOP_PIN
#endif #endif
#endif #endif
#if X_HOME_DIR > 0 //Home X to MAX
#define X_MIN_PIN -1 /****************************************************************************************/
#elif X_HOME_DIR < 0 //Home X to MIN #include "Configuration_Pins.h"
#define X_MAX_PIN -1 /****************************************************************************************/
#if X_HOME_DIR > 0 // Home X to MAX
#define X_MIN_PIN -1
#elif X_HOME_DIR < 0 // Home X to MIN
#define X_MAX_PIN -1
#endif //X_HOME_DIR > 0 #endif //X_HOME_DIR > 0
#if Y_HOME_DIR > 0 //Home Y to MAX #if Y_HOME_DIR > 0 // Home Y to MAX
#define Y_MIN_PIN -1 #define Y_MIN_PIN -1
#elif Y_HOME_DIR < 0 //Home Y to MIN #elif Y_HOME_DIR < 0 // Home Y to MIN
#define Y_MAX_PIN -1 #define Y_MAX_PIN -1
#endif //Y_HOME_DIR > 0 #endif //Y_HOME_DIR > 0
#if Z_HOME_DIR > 0 //Home Z to MAX #if Z_HOME_DIR > 0 // Home Z to MAX
#define Z_MIN_PIN -1 #define Z_MIN_PIN -1
#elif Z_HOME_DIR < 0 //Home Z to MIN #elif Z_HOME_DIR < 0 // Home Z to MIN
#define Z_MAX_PIN -1 #define Z_MAX_PIN -1
#endif //Z_HOME_DIR > 0 #endif //Z_HOME_DIR > 0
#if DISABLED(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting. #if DISABLED(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
#define Z_PROBE_PIN -1 #define Z_PROBE_PIN -1
#endif #endif
#if ENABLED(DISABLE_XMAX_ENDSTOP) #if ENABLED(DISABLE_XMAX_ENDSTOP)
#undef X_MAX_PIN #undef X_MAX_PIN
#define X_MAX_PIN -1 #define X_MAX_PIN -1
#endif #endif
#if ENABLED(DISABLE_XMIN_ENDSTOP) #if ENABLED(DISABLE_XMIN_ENDSTOP)
#undef X_MIN_PIN #undef X_MIN_PIN
#define X_MIN_PIN -1 #define X_MIN_PIN -1
#endif #endif
#if ENABLED(DISABLE_YMAX_ENDSTOP) #if ENABLED(DISABLE_YMAX_ENDSTOP)
#define Y_MAX_PIN -1 #define Y_MAX_PIN -1
#endif #endif
#if ENABLED(DISABLE_YMIN_ENDSTOP) #if ENABLED(DISABLE_YMIN_ENDSTOP)
#undef Y_MIN_PIN #undef Y_MIN_PIN
#define Y_MIN_PIN -1 #define Y_MIN_PIN -1
#endif #endif
#if ENABLED(DISABLE_ZMAX_ENDSTOP) #if ENABLED(DISABLE_ZMAX_ENDSTOP)
#undef Z_MAX_PIN #undef Z_MAX_PIN
#define Z_MAX_PIN -1 #define Z_MAX_PIN -1
#endif #endif
#if ENABLED(DISABLE_ZMIN_ENDSTOP) #if ENABLED(DISABLE_ZMIN_ENDSTOP)
#undef Z_MIN_PIN #undef Z_MIN_PIN
#define Z_MIN_PIN -1 #define Z_MIN_PIN -1
#endif #endif
/****************************************************************************************/ /****************************************************************************************/
#if HOTENDS == 1 // List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
#undef ORIG_HEATER_1_PIN
#undef ORIG_HEATER_2_PIN
#undef ORIG_HEATER_3_PIN
#define ORIG_HEATER_1_PIN -1
#define ORIG_HEATER_2_PIN -1
#define ORIG_HEATER_3_PIN -1
#undef ORIG_TEMP_1_PIN
#undef ORIG_TEMP_2_PIN
#undef ORIG_TEMP_3_PIN
#define ORIG_TEMP_1_PIN -1
#define ORIG_TEMP_2_PIN -1
#define ORIG_TEMP_3_PIN -1
#elif HOTENDS == 2
#undef ORIG_HEATER_2_PIN
#undef ORIG_HEATER_3_PIN
#define ORIG_HEATER_2_PIN -1
#define ORIG_HEATER_3_PIN -1
#undef ORIG_TEMP_2_PIN
#undef ORIG_TEMP_3_PIN
#define ORIG_TEMP_2_PIN -1
#define ORIG_TEMP_3_PIN -1
#elif HOTENDS == 3
#undef ORIG_HEATER_3_PIN
#define ORIG_HEATER_3_PIN -1
#undef ORIG_TEMP_3_PIN
#define ORIG_TEMP_3_PIN -1
#endif
/****************************************************************************************/
#include "Configuration_Pins.h"
/****************************************************************************************/
//List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
#define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, HEATER_0_PIN, analogInputToDigitalPin(TEMP_0_PIN), #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, HEATER_0_PIN, analogInputToDigitalPin(TEMP_0_PIN),
#if DRIVER_EXTRUDERS > 1 #if DRIVER_EXTRUDERS > 1
......
MarlinKimbra/stepper.cpp
View file @ e5a79858
...@@ -570,17 +570,24 @@ void set_stepper_direction() { ...@@ -570,17 +570,24 @@ void set_stepper_direction() {
#if DISABLED(ADVANCE) && ENABLED(DONDOLO) #if DISABLED(ADVANCE) && ENABLED(DONDOLO)
if (TEST(out_bits, E_AXIS)) { if (TEST(out_bits, E_AXIS)) {
if (active_extruder == 0) if (active_extruder == 0) {
REV_E_DIR(); REV_E_DIR();
else count_direction[E_AXIS] = -1;
}
else {
NORM_E_DIR(); NORM_E_DIR();
count_direction[E_AXIS] = -1; count_direction[E_AXIS] = -1;
}
}
else { else {
if (active_extruder == 0) if (active_extruder == 0) {
NORM_E_DIR(); NORM_E_DIR();
else count_direction[E_AXIS] = 1;
}
else {
REV_E_DIR(); REV_E_DIR();
count_direction[E_AXIS] = 1; count_direction[E_AXIS] = 1;
}
} }
#elif DISABLED(ADVANCE) #elif DISABLED(ADVANCE)
if (TEST(out_bits, E_AXIS)) { if (TEST(out_bits, E_AXIS)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment