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

Merge pull request #7828 from thinkyhead/bf1_dualx_movex

Browse Source 
[1.1.x] Fix DUAL_X_CARRIAGE manual move
This commit is contained in:
Scott Lahteine 2017-10-02 23:49:46 -05:00 committed by GitHub
commit 5a674a8e10
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Marlin_main.cpp
View File

@ -12469,7 +12469,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
break; break;
} }
} }
return false; return prepare_move_to_destination_cartesian();
} }
#endif // DUAL_X_CARRIAGE #endif // DUAL_X_CARRIAGE
@ -12511,7 +12511,7 @@ void prepare_move_to_destination() {
#elif IS_KINEMATIC #elif IS_KINEMATIC
prepare_kinematic_move_to(destination) prepare_kinematic_move_to(destination)
#elif ENABLED(DUAL_X_CARRIAGE) #elif ENABLED(DUAL_X_CARRIAGE)
prepare_move_to_destination_dualx() || prepare_move_to_destination_cartesian() prepare_move_to_destination_dualx()
#else #else
prepare_move_to_destination_cartesian() prepare_move_to_destination_cartesian()
#endif #endif
@ -13041,9 +13041,6 @@ void disable_all_steppers() {
#if ENABLED(E4_IS_TMC2130) #if ENABLED(E4_IS_TMC2130)
automatic_current_control(stepperE4, "E4"); automatic_current_control(stepperE4, "E4");
#endif #endif
#if ENABLED(E4_IS_TMC2130)
automatic_current_control(stepperE4);
#endif
} }
} }

12
Marlin/ultralcd.cpp
View File

@ -137,6 +137,7 @@ uint16_t max_display_update_time = 0;
// Function pointer to menu functions. // Function pointer to menu functions.
typedef void (*screenFunc_t)(); typedef void (*screenFunc_t)();
typedef void (*menuAction_t)();
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
extern bool powersupply_on; extern bool powersupply_on;
@ -206,7 +207,7 @@ uint16_t max_display_update_time = 0;
void _menu_action_back(); void _menu_action_back();
void menu_action_submenu(screenFunc_t data); void menu_action_submenu(screenFunc_t data);
void menu_action_gcode(const char* pgcode); void menu_action_gcode(const char* pgcode);
void menu_action_function(screenFunc_t data); void menu_action_function(menuAction_t data);
#define DECLARE_MENU_EDIT_TYPE(_type, _name) \ #define DECLARE_MENU_EDIT_TYPE(_type, _name) \
bool _menu_edit_ ## _name(); \ bool _menu_edit_ ## _name(); \
@ -2751,8 +2752,11 @@ void kill_screen(const char* lcd_msg) {
, int8_t eindex=-1 , int8_t eindex=-1
#endif #endif
) { ) {
#if E_MANUAL > 1 #if ENABLED(DUAL_X_CARRIAGE) || E_MANUAL > 1
if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder; #if E_MANUAL > 1
if (axis == E_AXIS)
#endif
manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
#endif #endif
manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves
manual_move_axis = (int8_t)axis; manual_move_axis = (int8_t)axis;
@ -2964,7 +2968,7 @@ void kill_screen(const char* lcd_msg) {
else else
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(DUAL_X_CARRIAGE)
if (active_extruder) if (active_extruder)
MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0")); MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0"));
else else