MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Rename axis_is_at_home() to set_axis_is_at_home() (PR#2464)

Browse Source 
to make clear - it's not a question but an order.
This commit is contained in:
AnHardt 2015-07-18 16:05:43 +02:00 committed by Richard Wackerbarth
parent f209b755a5
commit d15d869267
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -1023,7 +1023,7 @@ XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR);
#endif //DUAL_X_CARRIAGE #endif //DUAL_X_CARRIAGE
static void axis_is_at_home(AxisEnum axis) { static void set_axis_is_at_home(AxisEnum axis) {
#ifdef DUAL_X_CARRIAGE #ifdef DUAL_X_CARRIAGE
if (axis == X_AXIS) { if (axis == X_AXIS) {
@ -1739,7 +1739,7 @@ static void homeaxis(AxisEnum axis) {
#endif #endif
// 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); set_axis_is_at_home(axis);
sync_plan_position(); sync_plan_position();
destination[axis] = current_position[axis]; destination[axis] = current_position[axis];
@ -2197,8 +2197,8 @@ inline void gcode_G28() {
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
axis_is_at_home(X_AXIS); set_axis_is_at_home(X_AXIS);
axis_is_at_home(Y_AXIS); set_axis_is_at_home(Y_AXIS);
sync_plan_position(); sync_plan_position();
destination[X_AXIS] = current_position[X_AXIS]; destination[X_AXIS] = current_position[X_AXIS];
@ -5246,7 +5246,7 @@ inline void gcode_T(uint8_t tmp_extruder) {
active_extruder = tmp_extruder; active_extruder = tmp_extruder;
// This function resets the max/min values - the current position may be overwritten below. // This function resets the max/min values - the current position may be overwritten below.
axis_is_at_home(X_AXIS); set_axis_is_at_home(X_AXIS);
if (dual_x_carriage_mode == DXC_FULL_CONTROL_MODE) { 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;