SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7829 from thinkyhead/bf2_fix_dualx_manual

Browse source 
[2.0.x] Fix DUAL_X_CARRIAGE manual move
This commit is contained in:
Scott Lahteine 2017-10-02 23:50:00 -05:00 committed by GitHub
parent 200f971ef7 ca3c9baf1b
commit ab4943e24c
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/feature/tmc2130.cpp
View file

@ -125,9 +125,6 @@ void tmc2130_checkOverTemp(void) {
#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/src/lcd/ultralcd.cpp
View file

@ -212,7 +212,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(); \
@ -2750,9 +2750,13 @@ 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;
} }
@ -2963,7 +2967,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

1
Marlin/src/lcd/ultralcd.h
View file

@ -84,6 +84,7 @@
// Function pointer to menu functions. // Function pointer to menu functions.
typedef void (*screenFunc_t)(); typedef void (*screenFunc_t)();
typedef void (*menuAction_t)();
void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder=0); void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder=0);

4
Marlin/src/module/motion.cpp
View file

@ -769,7 +769,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
break; break;
} }
} }
return false; return prepare_move_to_destination_cartesian();
} }
#endif // DUAL_X_CARRIAGE #endif // DUAL_X_CARRIAGE
@ -811,7 +811,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