From 05932e445883c4fdf5620f90d503a3745639ffbc Mon Sep 17 00:00:00 2001 From: Alex Borro Date: Thu, 16 Jan 2014 18:13:46 -0200 Subject: [PATCH] Add Z Probe Offset to EEPROM and Ultra LCD --- Marlin/ConfigurationStore.cpp | 5 +- Marlin/Marlin.h | 1 + Marlin/Marlin_main.cpp | 160 +++++++++++++++++----------------- Marlin/language.h | 10 ++- Marlin/ultralcd.cpp | 2 + 5 files changed, 97 insertions(+), 81 deletions(-) diff --git a/Marlin/ConfigurationStore.cpp b/Marlin/ConfigurationStore.cpp index 1fb72450c6..0b169fe7a4 100644 --- a/Marlin/ConfigurationStore.cpp +++ b/Marlin/ConfigurationStore.cpp @@ -37,7 +37,7 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size) // the default values are used whenever there is a change to the data, to prevent // wrong data being written to the variables. // ALSO: always make sure the variables in the Store and retrieve sections are in the same order. -#define EEPROM_VERSION "V09" +#define EEPROM_VERSION "V10" #ifdef EEPROM_SETTINGS void Config_StoreSettings() @@ -70,6 +70,7 @@ void Config_StoreSettings() EEPROM_WRITE_VAR(i,absPreheatHotendTemp); EEPROM_WRITE_VAR(i,absPreheatHPBTemp); EEPROM_WRITE_VAR(i,absPreheatFanSpeed); + EEPROM_WRITE_VAR(i,zprobe_zoffset); #ifdef PIDTEMP EEPROM_WRITE_VAR(i,Kp); EEPROM_WRITE_VAR(i,Ki); @@ -210,6 +211,7 @@ void Config_RetrieveSettings() EEPROM_READ_VAR(i,absPreheatHotendTemp); EEPROM_READ_VAR(i,absPreheatHPBTemp); EEPROM_READ_VAR(i,absPreheatFanSpeed); + EEPROM_READ_VAR(i,zprobe_zoffset); #ifndef PIDTEMP float Kp,Ki,Kd; #endif @@ -272,6 +274,7 @@ void Config_ResetDefault() absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP; absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED; #endif + zprobe_zoffset = -Z_PROBE_OFFSET_FROM_EXTRUDER; #ifdef DOGLCD lcd_contrast = DEFAULT_LCD_CONTRAST; #endif diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index be4115e068..af3325be41 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -210,6 +210,7 @@ extern float endstop_adj[3]; extern float min_pos[3]; extern float max_pos[3]; extern bool axis_known_position[3]; +extern float zprobe_zoffset; extern int fanSpeed; #ifdef BARICUDA extern int ValvePressure; diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c3b75516af..26bc66f7de 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -196,6 +196,7 @@ float endstop_adj[3]={0,0,0}; float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS }; float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS }; bool axis_known_position[3] = {false, false, false}; +float zprobe_zoffset; // Extruder offset #if EXTRUDERS > 1 @@ -240,6 +241,7 @@ int EtoPPressure=0; float delta[3] = {0.0, 0.0, 0.0}; #endif + //=========================================================================== //=============================private variables============================= //=========================================================================== @@ -779,7 +781,7 @@ static unsigned long delayed_move_time = 0; // used in mode 1 static float duplicate_extruder_x_offset = DEFAULT_DUPLICATION_X_OFFSET; // used in mode 2 static float duplicate_extruder_temp_offset = 0; // used in mode 2 bool extruder_duplication_enabled = false; // used in mode 2 -#endif //DUAL_X_CARRIAGE +#endif //DUAL_X_CARRIAGE static void axis_is_at_home(int axis) { #ifdef DUAL_X_CARRIAGE @@ -792,8 +794,8 @@ static void axis_is_at_home(int axis) { } else if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && active_extruder == 0) { current_position[X_AXIS] = base_home_pos(X_AXIS) + add_homeing[X_AXIS]; - min_pos[X_AXIS] = base_min_pos(X_AXIS) + add_homeing[X_AXIS]; - max_pos[X_AXIS] = min(base_max_pos(X_AXIS) + add_homeing[X_AXIS], + min_pos[X_AXIS] = base_min_pos(X_AXIS) + add_homeing[X_AXIS]; + max_pos[X_AXIS] = min(base_max_pos(X_AXIS) + add_homeing[X_AXIS], max(extruder_offset[X_AXIS][1], X2_MAX_POS) - duplicate_extruder_x_offset); return; } @@ -824,7 +826,7 @@ static void set_bed_level_equation_lsq(double *plane_equation_coefficients) current_position[Z_AXIS] = corrected_position.z; // but the bed at 0 so we don't go below it. - current_position[Z_AXIS] = -Z_PROBE_OFFSET_FROM_EXTRUDER; + current_position[Z_AXIS] = zprobe_zoffset; // in the lsq we reach here after raising the extruder due to the loop structure plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); } @@ -860,7 +862,7 @@ static void set_bed_level_equation(float z_at_xLeft_yFront, float z_at_xRight_yF current_position[Z_AXIS] = corrected_position.z; // but the bed at 0 so we don't go below it. - current_position[Z_AXIS] = -Z_PROBE_OFFSET_FROM_EXTRUDER; + current_position[Z_AXIS] = zprobe_zoffset; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); } @@ -885,7 +887,7 @@ static void run_z_probe() { st_synchronize(); // move back down slowly to find bed - feedrate = homing_feedrate[Z_AXIS]/4; + feedrate = homing_feedrate[Z_AXIS]/4; zPosition -= home_retract_mm(Z_AXIS) * 2; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], zPosition, current_position[E_AXIS], feedrate/60, active_extruder); st_synchronize(); @@ -982,7 +984,7 @@ static void homeaxis(int axis) { current_position[axis] = 0; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); - + // Engage Servo endstop if enabled #ifdef SERVO_ENDSTOPS @@ -1040,7 +1042,7 @@ static void homeaxis(int axis) { #if defined (ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0) if (axis==Z_AXIS) retract_z_probe(); #endif - + } } #define HOMEAXIS(LETTER) homeaxis(LETTER##_AXIS) @@ -1114,7 +1116,7 @@ void process_commands() destination[Y_AXIS]=current_position[Y_AXIS]; destination[Z_AXIS]=current_position[Z_AXIS]; current_position[Z_AXIS]+=retract_zlift; - destination[E_AXIS]=current_position[E_AXIS]+retract_length+retract_recover_length; + destination[E_AXIS]=current_position[E_AXIS]+retract_length+retract_recover_length; feedrate=retract_recover_feedrate; retracted=false; prepare_move(); @@ -1228,10 +1230,10 @@ void process_commands() // reset state used by the different modes memcpy(raised_parked_position, current_position, sizeof(raised_parked_position)); delayed_move_time = 0; - active_extruder_parked = true; - #else + active_extruder_parked = true; + #else HOMEAXIS(X); - #endif + #endif } if((home_all_axis) || (code_seen(axis_codes[Y_AXIS]))) { @@ -1250,7 +1252,7 @@ void process_commands() current_position[Y_AXIS]=code_value()+add_homeing[1]; } } - + #if Z_HOME_DIR < 0 // If homing towards BED do Z last #ifndef Z_SAFE_HOMING if((home_all_axis) || (code_seen(axis_codes[Z_AXIS]))) { @@ -1262,14 +1264,14 @@ void process_commands() #endif HOMEAXIS(Z); } - #else // Z Safe mode activated. + #else // Z Safe mode activated. if(home_all_axis) { destination[X_AXIS] = round(Z_SAFE_HOMING_X_POINT - X_PROBE_OFFSET_FROM_EXTRUDER); destination[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - Y_PROBE_OFFSET_FROM_EXTRUDER); destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed feedrate = XY_TRAVEL_SPEED; current_position[Z_AXIS] = 0; - + plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder); st_synchronize(); @@ -1287,7 +1289,7 @@ void process_commands() && (current_position[Y_AXIS]+Y_PROBE_OFFSET_FROM_EXTRUDER <= Y_MAX_POS)) { current_position[Z_AXIS] = 0; - plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); + plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed feedrate = max_feedrate[Z_AXIS]; plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder); @@ -1307,8 +1309,8 @@ void process_commands() #endif #endif - - + + if(code_seen(axis_codes[Z_AXIS])) { if(code_value_long() != 0) { current_position[Z_AXIS]=code_value()+add_homeing[2]; @@ -1316,7 +1318,7 @@ void process_commands() } #ifdef ENABLE_AUTO_BED_LEVELING if((home_all_axis) || (code_seen(axis_codes[Z_AXIS]))) { - current_position[Z_AXIS] -= Z_PROBE_OFFSET_FROM_EXTRUDER; //Add Z_Probe offset (the distance is negative) + current_position[Z_AXIS] += zprobe_zoffset; //Add Z_Probe offset (the distance is negative) } #endif plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); @@ -1471,7 +1473,7 @@ void process_commands() run_z_probe(); float z_at_xLeft_yFront = current_position[Z_AXIS]; retract_z_probe(); - + SERIAL_PROTOCOLPGM("Bed x: "); SERIAL_PROTOCOL(LEFT_PROBE_BED_POSITION); SERIAL_PROTOCOLPGM(" y: "); @@ -1489,7 +1491,7 @@ void process_commands() run_z_probe(); float z_at_xRight_yFront = current_position[Z_AXIS]; retract_z_probe(); // Retract Z Servo endstop if available - + SERIAL_PROTOCOLPGM("Bed x: "); SERIAL_PROTOCOL(RIGHT_PROBE_BED_POSITION); SERIAL_PROTOCOLPGM(" y: "); @@ -1504,10 +1506,10 @@ void process_commands() #endif // ACCURATE_BED_LEVELING - st_synchronize(); + st_synchronize(); // The following code correct the Z height difference from z-probe position and hotend tip position. - // The Z height on homing is measured by Z-Probe, but the probe is quite far from the hotend. + // The Z height on homing is measured by Z-Probe, but the probe is quite far from the hotend. // When the bed is uneven, this height must be corrected. real_z = float(st_get_position(Z_AXIS))/axis_steps_per_unit[Z_AXIS]; //get the real Z (since the auto bed leveling is already correcting the plane) x_tmp = current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER; @@ -1519,11 +1521,11 @@ void process_commands() plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); } break; - + case 30: // G30 Single Z Probe { engage_z_probe(); // Engage Z Servo endstop if available - + st_synchronize(); // TODO: make sure the bed_level_rotation_matrix is identity or the planner will get set incorectly setup_for_endstop_move(); @@ -1674,14 +1676,14 @@ void process_commands() card.removeFile(strchr_pointer + 4); } break; - case 32: //M32 - Select file and start SD print + case 32: //M32 - Select file and start SD print { if(card.sdprinting) { st_synchronize(); } - starpos = (strchr(strchr_pointer + 4,'*')); - + starpos = (strchr(strchr_pointer + 4,'*')); + char* namestartpos = (strchr(strchr_pointer + 4,'!')); //find ! to indicate filename string start. if(namestartpos==NULL) { @@ -1689,16 +1691,16 @@ void process_commands() } else namestartpos++; //to skip the '!' - + if(starpos!=NULL) *(starpos-1)='\0'; - + bool call_procedure=(code_seen('P')); - - if(strchr_pointer>namestartpos) + + if(strchr_pointer>namestartpos) call_procedure=false; //false alert, 'P' found within filename - - if( card.cardOK ) + + if( card.cardOK ) { card.openFile(namestartpos,true,!call_procedure); if(code_seen('S')) @@ -1771,7 +1773,7 @@ void process_commands() #ifdef DUAL_X_CARRIAGE if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && tmp_extruder == 0) setTargetHotend1(code_value() == 0.0 ? 0.0 : code_value() + duplicate_extruder_temp_offset); -#endif +#endif setWatch(); break; case 140: // M140 set bed temp @@ -1827,7 +1829,7 @@ void process_commands() SERIAL_PROTOCOL_F(rawHotendTemp(cur_extruder)/OVERSAMPLENR,0); } #endif - + SERIAL_PROTOCOLLN(""); return; break; @@ -1845,14 +1847,14 @@ void process_commands() #ifdef DUAL_X_CARRIAGE if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && tmp_extruder == 0) setTargetHotend1(code_value() == 0.0 ? 0.0 : code_value() + duplicate_extruder_temp_offset); -#endif +#endif CooldownNoWait = true; } else if (code_seen('R')) { setTargetHotend(code_value(), tmp_extruder); #ifdef DUAL_X_CARRIAGE if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && tmp_extruder == 0) setTargetHotend1(code_value() == 0.0 ? 0.0 : code_value() + duplicate_extruder_temp_offset); -#endif +#endif CooldownNoWait = false; } #ifdef AUTOTEMP @@ -2016,7 +2018,7 @@ void process_commands() SET_OUTPUT(SUICIDE_PIN); WRITE(SUICIDE_PIN, HIGH); #endif - + #ifdef ULTIPANEL powersupply = true; LCD_MESSAGEPGM(WELCOME_MSG); @@ -2173,18 +2175,18 @@ void process_commands() #endif break; //TODO: update for all axis, use for loop - #ifdef BLINKM + #ifdef BLINKM case 150: // M150 { byte red; byte grn; byte blu; - + if(code_seen('R')) red = code_value(); if(code_seen('U')) grn = code_value(); if(code_seen('B')) blu = code_value(); - - SendColors(red,grn,blu); + + SendColors(red,grn,blu); } break; #endif //BLINKM @@ -2306,7 +2308,7 @@ void process_commands() { extruder_offset[Z_AXIS][tmp_extruder] = code_value(); } - #endif + #endif SERIAL_ECHO_START; SERIAL_ECHOPGM(MSG_HOTEND_OFFSET); for(tmp_extruder = 0; tmp_extruder < EXTRUDERS; tmp_extruder++) @@ -2339,17 +2341,17 @@ void process_commands() } } break; - + case 226: // M226 P S- Wait until the specified pin reaches the state required { if(code_seen('P')){ int pin_number = code_value(); // pin number int pin_state = -1; // required pin state - default is inverted - + if(code_seen('S')) pin_state = code_value(); // required pin state - + if(pin_state >= -1 && pin_state <= 1){ - + for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++) { if (sensitive_pins[i] == pin_number) @@ -2358,28 +2360,28 @@ void process_commands() break; } } - + if (pin_number > -1) { st_synchronize(); - + pinMode(pin_number, INPUT); - + int target; switch(pin_state){ case 1: target = HIGH; break; - + case 0: target = LOW; break; - + case -1: target = !digitalRead(pin_number); break; } - + while(digitalRead(pin_number) != target){ manage_heater(); manage_inactivity(); @@ -2389,7 +2391,7 @@ void process_commands() } } } - break; + break; #if NUM_SERVOS > 0 case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds @@ -2565,13 +2567,13 @@ void process_commands() engage_z_probe(); // Engage Z Servo endstop if available } break; - + case 402: { retract_z_probe(); // Retract Z Servo endstop if enabled } break; -#endif +#endif case 500: // M500 Store settings in EEPROM { Config_StoreSettings(); @@ -2729,14 +2731,14 @@ void process_commands() // M605 S0: Full control mode. The slicer has full control over x-carriage movement // M605 S1: Auto-park mode. The inactive head will auto park/unpark without slicer involvement // M605 S2 [Xnnn] [Rmmm]: Duplication mode. The second extruder will duplicate the first with nnn - // millimeters x-offset and an optional differential hotend temperature of + // millimeters x-offset and an optional differential hotend temperature of // mmm degrees. E.g., with "M605 S2 X100 R2" the second extruder will duplicate // the first with a spacing of 100mm in the x direction and 2 degrees hotter. // // Note: the X axis should be homed after changing dual x-carriage mode. { st_synchronize(); - + if (code_seen('S')) dual_x_carriage_mode = code_value(); @@ -2747,7 +2749,7 @@ void process_commands() if (code_seen('R')) duplicate_extruder_temp_offset = code_value(); - + SERIAL_ECHO_START; SERIAL_ECHOPGM(MSG_HOTEND_OFFSET); SERIAL_ECHO(" "); @@ -2763,13 +2765,13 @@ void process_commands() { dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE; } - + active_extruder_parked = false; extruder_duplication_enabled = false; delayed_move_time = 0; } break; - #endif //DUAL_X_CARRIAGE + #endif //DUAL_X_CARRIAGE case 907: // M907 Set digital trimpot motor current using axis codes. { @@ -2859,19 +2861,19 @@ void process_commands() // Save current position to return to after applying extruder offset memcpy(destination, current_position, sizeof(destination)); #ifdef DUAL_X_CARRIAGE - if (dual_x_carriage_mode == DXC_AUTO_PARK_MODE && Stopped == false && + if (dual_x_carriage_mode == DXC_AUTO_PARK_MODE && Stopped == false && (delayed_move_time != 0 || current_position[X_AXIS] != x_home_pos(active_extruder))) { // Park old head: 1) raise 2) move to park position 3) lower - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT, + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT, current_position[E_AXIS], max_feedrate[Z_AXIS], active_extruder); - plan_buffer_line(x_home_pos(active_extruder), current_position[Y_AXIS], current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT, + plan_buffer_line(x_home_pos(active_extruder), current_position[Y_AXIS], current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT, current_position[E_AXIS], max_feedrate[X_AXIS], active_extruder); - plan_buffer_line(x_home_pos(active_extruder), current_position[Y_AXIS], current_position[Z_AXIS], + plan_buffer_line(x_home_pos(active_extruder), current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], max_feedrate[Z_AXIS], active_extruder); st_synchronize(); } - + // apply Y & Z extruder offset (x offset is already used in determining home pos) current_position[Y_AXIS] = current_position[Y_AXIS] - extruder_offset[Y_AXIS][active_extruder] + @@ -2879,7 +2881,7 @@ void process_commands() current_position[Z_AXIS] = current_position[Z_AXIS] - extruder_offset[Z_AXIS][active_extruder] + extruder_offset[Z_AXIS][tmp_extruder]; - + active_extruder = tmp_extruder; // This function resets the max/min values - the current position may be overwritten below. @@ -2887,18 +2889,18 @@ void process_commands() if (dual_x_carriage_mode == DXC_FULL_CONTROL_MODE) { - current_position[X_AXIS] = inactive_extruder_x_pos; + current_position[X_AXIS] = inactive_extruder_x_pos; inactive_extruder_x_pos = destination[X_AXIS]; } else if (dual_x_carriage_mode == DXC_DUPLICATION_MODE) { active_extruder_parked = (active_extruder == 0); // this triggers the second extruder to move into the duplication position if (active_extruder == 0 || active_extruder_parked) - current_position[X_AXIS] = inactive_extruder_x_pos; + current_position[X_AXIS] = inactive_extruder_x_pos; else - current_position[X_AXIS] = destination[X_AXIS] + duplicate_extruder_x_offset; + current_position[X_AXIS] = destination[X_AXIS] + duplicate_extruder_x_offset; inactive_extruder_x_pos = destination[X_AXIS]; - extruder_duplication_enabled = false; + extruder_duplication_enabled = false; } else { @@ -2908,7 +2910,7 @@ void process_commands() active_extruder_parked = true; delayed_move_time = 0; } - #else + #else // Offset extruder (only by XY) int i; for(i = 0; i < 2; i++) { @@ -3121,13 +3123,13 @@ void prepare_move() { // move duplicate extruder into correct duplication position. plan_set_position(inactive_extruder_x_pos, current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); - plan_buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset, current_position[Y_AXIS], current_position[Z_AXIS], + plan_buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset, current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], max_feedrate[X_AXIS], 1); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); st_synchronize(); extruder_duplication_enabled = true; active_extruder_parked = false; - } + } else if (dual_x_carriage_mode == DXC_AUTO_PARK_MODE) // handle unparking of head { if (current_position[E_AXIS] == destination[E_AXIS]) @@ -3136,7 +3138,7 @@ void prepare_move() // be used as start of first non-travel move) if (delayed_move_time != 0xFFFFFFFFUL) { - memcpy(current_position, destination, sizeof(current_position)); + memcpy(current_position, destination, sizeof(current_position)); if (destination[Z_AXIS] > raised_parked_position[Z_AXIS]) raised_parked_position[Z_AXIS] = destination[Z_AXIS]; delayed_move_time = millis(); @@ -3146,9 +3148,9 @@ void prepare_move() delayed_move_time = 0; // unpark extruder: 1) raise, 2) move into starting XY position, 3) lower plan_buffer_line(raised_parked_position[X_AXIS], raised_parked_position[Y_AXIS], raised_parked_position[Z_AXIS], current_position[E_AXIS], max_feedrate[Z_AXIS], active_extruder); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], raised_parked_position[Z_AXIS], + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], raised_parked_position[Z_AXIS], current_position[E_AXIS], min(max_feedrate[X_AXIS],max_feedrate[Y_AXIS]), active_extruder); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], max_feedrate[Z_AXIS], active_extruder); active_extruder_parked = false; } @@ -3314,7 +3316,7 @@ void manage_inactivity() // travel moves have been received so enact them delayed_move_time = 0xFFFFFFFFUL; // force moves to be done memcpy(destination,current_position,sizeof(destination)); - prepare_move(); + prepare_move(); } #endif #ifdef TEMP_STAT_LEDS diff --git a/Marlin/language.h b/Marlin/language.h index d1527d5e9d..52b1b16059 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -138,7 +138,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" - + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages #define MSG_Enqueing "enqueing \"" @@ -305,6 +305,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -471,6 +472,7 @@ #define MSG_CNG_SDCARD "Changer de carte SD" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -640,6 +642,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -813,6 +816,7 @@ #define MSG_STEPPER_RELEASED "Desacoplada." #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -976,6 +980,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -1139,6 +1144,7 @@ #define MSG_CNG_SDCARD "Cambia SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -1311,6 +1317,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "Sonda fora da mesa" #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages @@ -1479,6 +1486,7 @@ #define MSG_CNG_SDCARD "Change SD-Card" #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" + #define MSG_ZPROBE_ZOFFSET "Z Offset" // Serial Console Messages diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index fe8cab0860..77be8e8e35 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -19,6 +19,7 @@ int absPreheatHotendTemp; int absPreheatHPBTemp; int absPreheatFanSpeed; + #ifdef ULTIPANEL static float manual_feedrate[] = MANUAL_FEEDRATE; #endif // ULTIPANEL @@ -705,6 +706,7 @@ static void lcd_control_motion_menu() { START_MENU(); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); + MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, 0.5, 50); MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 500, 99000); MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990); MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &max_z_jerk, 0.1, 990);