sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

change to better (more clear) names (#8049)

Browse Source 
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
This commit is contained in:
Roxy-3D
2017-10-21 10:58:17 -05:00
committed by GitHub
parent fa44130734
commit e9bc9a2ab4
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/G26_Mesh_Validation_Tool.cpp
View File

@@ -134,10 +134,10 @@
extern char lcd_status_message[];
#endif
extern float destination[XYZE];
void set_destination_to_current();
void set_destination_from_current();
void prepare_move_to_destination();
inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
inline void set_current_to_destination() { COPY(current_position, destination); }
inline void set_current_from_destination() { COPY(current_position, destination); }
#if ENABLED(NEWPANEL)
void lcd_setstatusPGM(const char* const message, const int8_t level);
void chirp_at_user();
@@ -225,7 +225,7 @@
if (current_position[Z_AXIS] < Z_CLEARANCE_BETWEEN_PROBES) {
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
stepper.synchronize();
set_current_to_destination();
set_current_from_destination();
}
if (turn_on_heaters()) goto LEAVE;
@@ -250,7 +250,7 @@
ZERO(vertical_mesh_line_flags);
// Move nozzle to the specified height for the first layer
set_destination_to_current();
set_destination_from_current();
destination[Z_AXIS] = g26_layer_height;
move_to(destination, 0.0);
move_to(destination, g26_ooze_amount);
@@ -534,7 +534,7 @@
G26_line_to_destination(feed_value);
stepper.synchronize();
set_destination_to_current();
set_destination_from_current();
}
// Check if X or Y is involved in the movement.
@@ -550,7 +550,7 @@
G26_line_to_destination(feed_value);
stepper.synchronize();
set_destination_to_current();
set_destination_from_current();
}
@@ -832,7 +832,7 @@
lcd_setstatusPGM(PSTR("User-Controlled Prime"), 99);
chirp_at_user();
set_destination_to_current();
set_destination_from_current();
recover_filament(destination); // Make sure G26 doesn't think the filament is retracted().
@@ -849,7 +849,7 @@
// but because the planner has a buffer, we won't be able
// to stop as quickly. So we put up with the less smooth
// action to give the user a more responsive 'Stop'.
set_destination_to_current();
set_destination_from_current();
idle();
}
@@ -873,11 +873,11 @@
lcd_setstatusPGM(PSTR("Fixed Length Prime."), 99);
lcd_quick_feedback();
#endif
set_destination_to_current();
set_destination_from_current();
destination[E_AXIS] += g26_prime_length;
G26_line_to_destination(planner.max_feedrate_mm_s[E_AXIS] / 15.0);
stepper.synchronize();
set_destination_to_current();
set_destination_from_current();
retract_filament(destination);
}