Skip to content

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

Fix Homeaxis DELTA

parent e2a2c5c1
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 54 deletions
MarlinKimbra/Marlin_main.cpp
View file @ 41537618
...@@ -1420,11 +1420,15 @@ inline void set_destination_to_current() { memcpy(destination, current_position, ...@@ -1420,11 +1420,15 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
current_position[axis] = 0; current_position[axis] = 0;
sync_plan_position(); sync_plan_position();
enable_endstops(false); // Disable endstops while moving away
// Move away from the endstop by the axis HOME_BUMP_MM // Move away from the endstop by the axis HOME_BUMP_MM
destination[axis] = -home_bump_mm(axis) * axis_home_dir; destination[axis] = -home_bump_mm(axis) * axis_home_dir;
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
enable_endstops(true); // Enable endstops for next homing move
// Slow down the feedrate for the next move // Slow down the feedrate for the next move
set_homing_bump_feedrate(axis); set_homing_bump_feedrate(axis);
...@@ -1460,6 +1464,7 @@ inline void set_destination_to_current() { memcpy(destination, current_position, ...@@ -1460,6 +1464,7 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
// Set the axis position to its home position (plus home offsets) // Set the axis position to its home position (plus home offsets)
axis_is_at_home(axis); axis_is_at_home(axis);
sync_plan_position();
destination[axis] = current_position[axis]; destination[axis] = current_position[axis];
feedrate = 0.0; feedrate = 0.0;
...@@ -1502,24 +1507,36 @@ inline void set_destination_to_current() { memcpy(destination, current_position, ...@@ -1502,24 +1507,36 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
current_position[axis] = 0; current_position[axis] = 0;
sync_plan_position(); sync_plan_position();
enable_endstops(false); // Disable endstops while moving away
// Move away from the endstop by the axis HOME_BUMP_MM // Move away from the endstop by the axis HOME_BUMP_MM
destination[axis] = -home_bump_mm(axis) * axis_home_dir; destination[axis] = -home_bump_mm(axis) * axis_home_dir;
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
enable_endstops(true); // Enable endstops for next homing move
// Slow down the feedrate for the next move // Slow down the feedrate for the next move
set_homing_bump_feedrate(axis); set_homing_bump_feedrate(axis);
// Move slowly towards the endstop until triggered
destination[axis] = 2 * home_bump_mm(axis) * axis_home_dir;
line_to_destination();
st_synchronize();
// retrace by the amount specified in endstop_adj // retrace by the amount specified in endstop_adj
if (endstop_adj[axis] * axis_home_dir < 0) { if (endstop_adj[axis] * axis_home_dir < 0) {
enable_endstops(false); // Disable endstops while moving away
sync_plan_position(); sync_plan_position();
destination[axis] = endstop_adj[axis]; destination[axis] = endstop_adj[axis];
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
enable_endstops(true); // Enable endstops for next homing move
} }
// Set the axis position to its home position (plus home offsets) // Set the axis position to its home position (plus home offsets)
axis_is_at_home(axis); axis_is_at_home(axis);
sync_plan_position();
destination[axis] = current_position[axis]; destination[axis] = current_position[axis];
feedrate = 0.0; feedrate = 0.0;
......
MarlinKimbra/language.h
View file @ 41537618
...@@ -107,13 +107,15 @@ ...@@ -107,13 +107,15 @@
#define MSG_FILE_PRINTED "Done printing file" #define MSG_FILE_PRINTED "Done printing file"
#define MSG_BEGIN_FILE_LIST "Begin file list" #define MSG_BEGIN_FILE_LIST "Begin file list"
#define MSG_END_FILE_LIST "End file list" #define MSG_END_FILE_LIST "End file list"
#define MSG_M104_INVALID_EXTRUDER "M104 Invalid extruder " #define MSG_INVALID_EXTRUDER "Invalid extruder"
#define MSG_M105_INVALID_EXTRUDER "M105 Invalid extruder " #define MSG_INVALID_SOLENOID "Invalid solenoid"
#define MSG_M200_INVALID_EXTRUDER "M200 Invalid extruder " #define MSG_M104_INVALID_EXTRUDER "M104 " MSG_INVALID_EXTRUDER " "
#define MSG_M218_INVALID_EXTRUDER "M218 Invalid extruder " #define MSG_M105_INVALID_EXTRUDER "M105 " MSG_INVALID_EXTRUDER " "
#define MSG_M221_INVALID_EXTRUDER "M221 Invalid extruder " #define MSG_M109_INVALID_EXTRUDER "M109 " MSG_INVALID_EXTRUDER " "
#define MSG_M200_INVALID_EXTRUDER "M200 " MSG_INVALID_EXTRUDER " "
#define MSG_M218_INVALID_EXTRUDER "M218 " MSG_INVALID_EXTRUDER " "
#define MSG_M221_INVALID_EXTRUDER "M221 " MSG_INVALID_EXTRUDER " "
#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define MSG_M109_INVALID_EXTRUDER "M109 Invalid extruder "
#define MSG_HEATING "Heating..." #define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done." #define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating." #define MSG_BED_HEATING "Bed Heating."
...@@ -126,8 +128,6 @@ ...@@ -126,8 +128,6 @@
#define MSG_ACTIVE_DRIVER "Active Driver: " #define MSG_ACTIVE_DRIVER "Active Driver: "
#define MSG_ACTIVE_EXTRUDER "Active Extruder: " #define MSG_ACTIVE_EXTRUDER "Active Extruder: "
#define MSG_ACTIVE_COLOR "Active Color: " #define MSG_ACTIVE_COLOR "Active Color: "
#define MSG_INVALID_EXTRUDER "Invalid extruder"
#define MSG_INVALID_SOLENOID "Invalid solenoid"
#define MSG_X_MIN "x_min: " #define MSG_X_MIN "x_min: "
#define MSG_X_MAX "x_max: " #define MSG_X_MAX "x_max: "
#define MSG_Y_MIN "y_min: " #define MSG_Y_MIN "y_min: "
......
MarlinKimbra/pins.h
View file @ 41537618
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*401 BOARD_RADDS - Radds Arduino DUE *401 BOARD_RADDS - Radds Arduino DUE
*403 BOARD_RAMPS_FD_V1 - Ramps FD version 1 Arduino DUE *403 BOARD_RAMPS_FD_V1 - Ramps FD version 1 Arduino DUE
*404 BOARD_RAMPS_FD_V2 - Ramps FD version 2 Arduino DUE *404 BOARD_RAMPS_FD_V2 - Ramps FD version 2 Arduino DUE
*433 BOARD_RAMPS4DUE - Ramps for Arduino DUE
* *
* 5 BOARD_GEN6 - Gen6 * 5 BOARD_GEN6 - Gen6
* 51 BOARD_GEN6_DELUXE - Gen6 deluxe * 51 BOARD_GEN6_DELUXE - Gen6 deluxe
...@@ -1963,7 +1964,7 @@ ...@@ -1963,7 +1964,7 @@
* Arduino Due pin assignment * Arduino Due pin assignment
* Ramps - FD v1 & v2 * Ramps - FD v1 & v2
****************************************************************************************/ ****************************************************************************************/
#if MB(RAMPS_FDV1) || MB(RAMPS_FDV2) #if MB(RAMPS_FD_V1) || MB(RAMPS_FD_V2)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
#ifndef __SAM3X8E__ #ifndef __SAM3X8E__
...@@ -1971,14 +1972,14 @@ ...@@ -1971,14 +1972,14 @@
#endif #endif
#if MB(RAMPS_FDV1) #if MB(RAMPS_FD_V1)
#define INVERTED_HEATER_PINS #define INVERTED_HEATER_PINS
#define RAMPS_FDV1 #define RAMPS_FD_V1
#define INVERTED_HEATER_PINS #define INVERTED_HEATER_PINS
// No EEPROM // No EEPROM
// Use 4k7 thermistor tables // Use 4k7 thermistor tables
#else #else
#define RAMPS_FDV2 #define RAMPS_FD_V2
// EEPROM supported // EEPROM supported
// Use 1k thermistor tables // Use 1k thermistor tables
#endif #endif
...@@ -1986,20 +1987,20 @@ ...@@ -1986,20 +1987,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 X_MIN_PIN 22
#define X_MAX_PIN 2 #define X_MAX_PIN 2
#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 Y_MIN_PIN 24
#define Y_MAX_PIN 15 #define Y_MAX_PIN 15
#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 Z_MIN_PIN 26
#define Z_MAX_PIN -1 #define Z_MAX_PIN -1
#define ORIG_E0_STEP_PIN 36 #define ORIG_E0_STEP_PIN 36
#define ORIG_E0_DIR_PIN 28 #define ORIG_E0_DIR_PIN 28
...@@ -2013,72 +2014,72 @@ ...@@ -2013,72 +2014,72 @@
#define ORIG_E2_DIR_PIN 47 #define ORIG_E2_DIR_PIN 47
#define ORIG_E2_ENABLE_PIN 45 #define ORIG_E2_ENABLE_PIN 45
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 4 #define SDSS 4
#define LED_PIN 13 #define LED_PIN 13
#define BEEPER -1 #define BEEPER -1
#define ORIG_FAN_PIN -1 #define ORIG_FAN_PIN -1
#define CONTROLLERORIG_FAN_PIN -1 //Pin used for the fan to cool controller #define CONTROLLERORIG_FAN_PIN -1 //Pin used for the fan to cool controller
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
#define HEATER_BED_PIN 8 // BED #define HEATER_BED_PIN 8 // BED
#define HEATER_0_PIN 9 #define HEATER_0_PIN 9
#define HEATER_1_PIN 10 #define HEATER_1_PIN 10
#define HEATER_2_PIN 11 #define HEATER_2_PIN 11
#define TEMP_BED_PIN 0 // ANALOG NUMBERING #define TEMP_BED_PIN 0 // ANALOG NUMBERING
#define TEMP_0_PIN 1 // ANALOG NUMBERING #define TEMP_0_PIN 1 // ANALOG NUMBERING
#define TEMP_1_PIN -1 // 2 // ANALOG NUMBERING #define TEMP_1_PIN -1 // 2 // ANALOG NUMBERING
#define TEMP_2_PIN -1 // 3 // ANALOG NUMBERING #define TEMP_2_PIN -1 // 3 // ANALOG NUMBERING
#define TEMP_3_PIN -1 // ANALOG NUMBERING #define TEMP_3_PIN -1 // ANALOG NUMBERING
#define TEMP_4_PIN -1 // ANALOG NUMBERING #define TEMP_4_PIN -1 // ANALOG NUMBERING
#ifdef NUM_SERVOS #ifdef NUM_SERVOS
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 6 #define SERVO1_PIN 6
#endif #endif
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 5 #define SERVO2_PIN 5
#endif #endif
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 4 #define SERVO3_PIN 4
#endif #endif
#endif #endif
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
// ramps-fd lcd adaptor // ramps-fd lcd adaptor
#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
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37 #define BEEPER 37
#define BTN_EN1 33 #define BTN_EN1 33
#define BTN_EN2 31 #define BTN_EN2 31
#define BTN_ENC 35 #define BTN_ENC 35
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#endif #endif
#endif #endif
#endif //ULTRA_LCD #endif //ULTRA_LCD
...@@ -2087,12 +2088,12 @@ ...@@ -2087,12 +2088,12 @@
#ifndef SDSUPPORT #ifndef 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 MAX_SCK_PIN 52 #define MAX_SCK_PIN 52
#define MAX_MISO_PIN 50 #define MAX_MISO_PIN 50
#define MAX_MOSI_PIN 51 #define MAX_MOSI_PIN 51
#define MAX6675_SS 53 #define MAX6675_SS 53
#else #else
#define MAX6675_SS 49 #define MAX6675_SS 49
#endif #endif
#endif //RAMPS-FD #endif //RAMPS-FD
......
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