Commit a00a83f3 authored by MagoKimbra's avatar MagoKimbra

Fix Delta

parent 7e90c0c1
...@@ -540,9 +540,9 @@ your extruder heater takes 2 minutes to hit the target on heating. ...@@ -540,9 +540,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. // M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support //define this to enable EEPROM support
//#define EEPROM_SETTINGS //#define EEPROM_SETTINGS
//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: // to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
// please keep turned on if you can. // please keep turned on if you can.
//#define EEPROM_CHITCHAT #define EEPROM_CHITCHAT
//========================= Bowden Filament management ====================== //========================= Bowden Filament management ======================
//#define EASY_LOAD //#define EASY_LOAD
......
...@@ -142,7 +142,7 @@ void Config_StoreSettings() { ...@@ -142,7 +142,7 @@ void Config_StoreSettings() {
#endif //EEPROM_SETTINGS #endif //EEPROM_SETTINGS
#ifndef DISABLE_M503 #ifdef EEPROM_CHITCHAT
void Config_PrintSettings() { // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown void Config_PrintSettings() { // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOPAIR("Baudrate: ", baudrate); SERIAL_ECHOPAIR("Baudrate: ", baudrate);
...@@ -365,7 +365,7 @@ void Config_PrintSettings() { // Always have this function, even with EEPROM_SE ...@@ -365,7 +365,7 @@ void Config_PrintSettings() { // Always have this function, even with EEPROM_SE
} }
#endif //FWRETRACT #endif //FWRETRACT
} }
#endif //DISABLE_M503 #endif //EEPROM_CHITCHAT
#ifdef EEPROM_SETTINGS #ifdef EEPROM_SETTINGS
......
...@@ -22,24 +22,21 @@ ...@@ -22,24 +22,21 @@
// Horizontal offset of the universal joints on the carriages. // Horizontal offset of the universal joints on the carriages.
#define DELTA_CARRIAGE_OFFSET 20.0 // mm #define DELTA_CARRIAGE_OFFSET 20.0 // mm
// Printer radius // Bed Printer radius
#define PRINTER_RADIUS 70 // mm #define PRINTER_RADIUS 70 // mm
// Effective horizontal distance bridged by diagonal push rods.
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
//Uncomment to enable autocalibration debug messages //Uncomment to enable autocalibration debug messages
#define DEBUG_MESSAGES #define DEBUG_MESSAGES
// Precision for G30 delta autocalibration function // Precision for G30 delta autocalibration function
#define AUTOCALIBRATION_PRECISION 0.1 // mm #define AUTOCALIBRATION_PRECISION 0.1 // mm
// Diameter of print bed - this is used to set the distance that autocalibration probes the bed at. // Effective horizontal distance bridged by diagonal push rods.
#define BED_DIAMETER 140 // mm #define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
// Z-Probe variables // Z-Probe variables
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again) // Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
#define PROBING_FEEDRATE 600 // Speed for individual probe Use: G30 A F600 #define PROBING_FEEDRATE 500 // Speed for individual probe Use: G30 A F600
#define Z_PROBE_OFFSET {0,0,-1,0} // X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe. #define Z_PROBE_OFFSET {0,0,-1,0} // X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe.
#define Z_PROBE_DEPLOY_START_LOCATION {0,0,30,0} // X, Y, Z, E start location for z-probe deployment sequence #define Z_PROBE_DEPLOY_START_LOCATION {0,0,30,0} // X, Y, Z, E start location for z-probe deployment sequence
#define Z_PROBE_DEPLOY_END_LOCATION {0,0,30,0} // X, Y, Z, E end location for z-probe deployment sequence #define Z_PROBE_DEPLOY_END_LOCATION {0,0,30,0} // X, Y, Z, E end location for z-probe deployment sequence
...@@ -108,7 +105,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o ...@@ -108,7 +105,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//Manual homing switch locations: //Manual homing switch locations:
#define MANUAL_X_HOME_POS 0 #define MANUAL_X_HOME_POS 0
#define MANUAL_Y_HOME_POS 0 #define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 210 // Distance between nozzle and print surface after homing. #define MANUAL_Z_HOME_POS 205 // Distance between nozzle and print surface after homing.
// Travel limits after homing // Travel limits after homing
#define X_MAX_POS PRINTER_RADIUS #define X_MAX_POS PRINTER_RADIUS
......
...@@ -271,7 +271,7 @@ float delta_radius; // = DEFAULT_delta_radius; ...@@ -271,7 +271,7 @@ float delta_radius; // = DEFAULT_delta_radius;
float delta_diagonal_rod; // = DEFAULT_DELTA_DIAGONAL_ROD; float delta_diagonal_rod; // = DEFAULT_DELTA_DIAGONAL_ROD;
float DELTA_DIAGONAL_ROD_2; float DELTA_DIAGONAL_ROD_2;
float ac_prec = AUTOCALIBRATION_PRECISION / 2; float ac_prec = AUTOCALIBRATION_PRECISION / 2;
float bed_radius = BED_DIAMETER / 2; float bed_radius = PRINTER_RADIUS;
float delta_tower1_x, delta_tower1_y; float delta_tower1_x, delta_tower1_y;
float delta_tower2_x, delta_tower2_y; float delta_tower2_x, delta_tower2_y;
float delta_tower3_x, delta_tower3_y; float delta_tower3_x, delta_tower3_y;
...@@ -2589,6 +2589,11 @@ void process_commands() ...@@ -2589,6 +2589,11 @@ void process_commands()
if (code_seen('A')) { if (code_seen('A')) {
SERIAL_ECHOLN("Starting Auto Calibration.."); SERIAL_ECHOLN("Starting Auto Calibration..");
LCD_MESSAGEPGM("Auto Calibration...");
if (code_value() != 0) ac_prec = code_value();
SERIAL_ECHO("Calibration precision: +/-");
SERIAL_PROTOCOL_F(ac_prec,3);
SERIAL_ECHOLN("mm");
//Zero the bedlevel array in case this affects bed probing //Zero the bedlevel array in case this affects bed probing
for (int y = 0; y >=6; y++) { for (int y = 0; y >=6; y++) {
...@@ -2963,6 +2968,7 @@ void process_commands() ...@@ -2963,6 +2968,7 @@ void process_commands()
while(loopcount < iterations); while(loopcount < iterations);
SERIAL_ECHOLN("Auto Calibration Complete"); SERIAL_ECHOLN("Auto Calibration Complete");
LCD_MESSAGEPGM("Complete");
SERIAL_ECHOLN("Issue M500 Command to save calibration settings to EPROM (if enabled)"); SERIAL_ECHOLN("Issue M500 Command to save calibration settings to EPROM (if enabled)");
/* /*
if ((abs(delta_diagonal_rod - saved_delta_diagonal_rod) > 1) and (adj_dr_allowed == true)) { if ((abs(delta_diagonal_rod - saved_delta_diagonal_rod) > 1) and (adj_dr_allowed == true)) {
......
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