3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

whitespace correction

Browse source
This commit is contained in:
PavelSindler 2018-04-24 14:33:48 +02:00
parent cc74edfa13
commit ffe93b2ca9
1 changed files with 199 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Firmware/Marlin_main.cpp
View file

@ -3015,12 +3015,12 @@ void process_commands()
memcpy(destination, current_position, sizeof(destination)); memcpy(destination, current_position, sizeof(destination));
feedrate = 0.0; feedrate = 0.0;
#if Z_HOME_DIR > 0 // If homing away from BED do Z first #if Z_HOME_DIR > 0 // If homing away from BED do Z first
if(home_z) if(home_z)
homeaxis(Z_AXIS); homeaxis(Z_AXIS);
#endif #endif
#ifdef QUICK_HOME #ifdef QUICK_HOME
// In the quick mode, if both x and y are to be homed, a diagonal move will be performed initially. // In the quick mode, if both x and y are to be homed, a diagonal move will be performed initially.
if(home_x && home_y) //first diagonal move if(home_x && home_y) //first diagonal move
{ {
@ -3055,7 +3055,7 @@ void process_commands()
current_position[Y_AXIS] = destination[Y_AXIS]; current_position[Y_AXIS] = destination[Y_AXIS];
current_position[Z_AXIS] = destination[Z_AXIS]; current_position[Z_AXIS] = destination[Z_AXIS];
} }
#endif /* QUICK_HOME */ #endif /* QUICK_HOME */
#ifdef TMC2130 #ifdef TMC2130
if(home_x) if(home_x)
@ -3082,16 +3082,16 @@ void process_commands()
if(code_seen(axis_codes[Y_AXIS]) && code_value_long() != 0) if(code_seen(axis_codes[Y_AXIS]) && code_value_long() != 0)
current_position[Y_AXIS]=code_value()+add_homing[Y_AXIS]; current_position[Y_AXIS]=code_value()+add_homing[Y_AXIS];
#if Z_HOME_DIR < 0 // If homing towards BED do Z last #if Z_HOME_DIR < 0 // If homing towards BED do Z last
#ifndef Z_SAFE_HOMING #ifndef Z_SAFE_HOMING
if(home_z) { if(home_z) {
#if defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0) #if defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0)
destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed
feedrate = max_feedrate[Z_AXIS]; feedrate = max_feedrate[Z_AXIS];
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder);
st_synchronize(); st_synchronize();
#endif // defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0) #endif // defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0)
#if (defined(MESH_BED_LEVELING) && !defined(MK1BP)) // If Mesh bed leveling, moxve X&Y to safe position for home #if (defined(MESH_BED_LEVELING) && !defined(MK1BP)) // If Mesh bed leveling, moxve X&Y to safe position for home
if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] )) if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] ))
{ {
homeaxis(X_AXIS); homeaxis(X_AXIS);
@ -3115,11 +3115,11 @@ void process_commands()
enable_endstops(true); enable_endstops(true);
endstops_hit_on_purpose(); endstops_hit_on_purpose();
homeaxis(Z_AXIS); homeaxis(Z_AXIS);
#else // MESH_BED_LEVELING #else // MESH_BED_LEVELING
homeaxis(Z_AXIS); homeaxis(Z_AXIS);
#endif // MESH_BED_LEVELING #endif // MESH_BED_LEVELING
} }
#else // defined(Z_SAFE_HOMING): Z Safe mode activated. #else // defined(Z_SAFE_HOMING): Z Safe mode activated.
if(home_all_axes) { if(home_all_axes) {
destination[X_AXIS] = round(Z_SAFE_HOMING_X_POINT - X_PROBE_OFFSET_FROM_EXTRUDER); 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[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - Y_PROBE_OFFSET_FROM_EXTRUDER);
@ -3161,24 +3161,24 @@ void process_commands()
SERIAL_ECHOLNRPGM(MSG_ZPROBE_OUT); SERIAL_ECHOLNRPGM(MSG_ZPROBE_OUT);
} }
} }
#endif // Z_SAFE_HOMING #endif // Z_SAFE_HOMING
#endif // Z_HOME_DIR < 0 #endif // Z_HOME_DIR < 0
if(code_seen(axis_codes[Z_AXIS]) && code_value_long() != 0) if(code_seen(axis_codes[Z_AXIS]) && code_value_long() != 0)
current_position[Z_AXIS]=code_value()+add_homing[Z_AXIS]; current_position[Z_AXIS]=code_value()+add_homing[Z_AXIS];
#ifdef ENABLE_AUTO_BED_LEVELING #ifdef ENABLE_AUTO_BED_LEVELING
if(home_z) if(home_z)
current_position[Z_AXIS] += zprobe_zoffset; //Add Z_Probe offset (the distance is negative) current_position[Z_AXIS] += zprobe_zoffset; //Add Z_Probe offset (the distance is negative)
#endif #endif
// Set the planner and stepper routine positions. // Set the planner and stepper routine positions.
// At this point the mesh bed leveling and world2machine corrections are disabled and current_position // At this point the mesh bed leveling and world2machine corrections are disabled and current_position
// contains the machine coordinates. // contains the machine coordinates.
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]);
#ifdef ENDSTOPS_ONLY_FOR_HOMING #ifdef ENDSTOPS_ONLY_FOR_HOMING
enable_endstops(false); enable_endstops(false);
#endif #endif
feedrate = saved_feedrate; feedrate = saved_feedrate;
feedmultiply = saved_feedmultiply; feedmultiply = saved_feedmultiply;