melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4468 from thinkyhead/rc_fix_manual_move

Browse Source 
Specify manual-movable E axes by extruder type
This commit is contained in:
Scott Lahteine 2016-07-30 03:21:43 -07:00 committed by GitHub
commit 2f76138645
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Conditionals_post.h
View File

@ -322,6 +322,7 @@
#if ENABLED(SINGLENOZZLE) // One hotend, multi-extruder #if ENABLED(SINGLENOZZLE) // One hotend, multi-extruder
#define HOTENDS 1 #define HOTENDS 1
#define E_STEPPERS EXTRUDERS #define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder #define TOOL_E_INDEX current_block->active_extruder
#undef TEMP_SENSOR_1_AS_REDUNDANT #undef TEMP_SENSOR_1_AS_REDUNDANT
#undef HOTEND_OFFSET_X #undef HOTEND_OFFSET_X
@ -329,6 +330,7 @@
#elif ENABLED(SWITCHING_EXTRUDER) // One E stepper, unified E axis, two hotends #elif ENABLED(SWITCHING_EXTRUDER) // One E stepper, unified E axis, two hotends
#define HOTENDS EXTRUDERS #define HOTENDS EXTRUDERS
#define E_STEPPERS 1 #define E_STEPPERS 1
#define E_MANUAL 1
#define TOOL_E_INDEX 0 #define TOOL_E_INDEX 0
#ifndef HOTEND_OFFSET_Z #ifndef HOTEND_OFFSET_Z
#define HOTEND_OFFSET_Z { 0 } #define HOTEND_OFFSET_Z { 0 }
@ -336,10 +338,12 @@
#elif ENABLED(MIXING_EXTRUDER) // Multi-stepper, unified E axis, one hotend #elif ENABLED(MIXING_EXTRUDER) // Multi-stepper, unified E axis, one hotend
#define HOTENDS 1 #define HOTENDS 1
#define E_STEPPERS MIXING_STEPPERS #define E_STEPPERS MIXING_STEPPERS
#define E_MANUAL 1
#define TOOL_E_INDEX 0 #define TOOL_E_INDEX 0
#else // One stepper, E axis, and hotend per tool #else // One stepper, E axis, and hotend per tool
#define HOTENDS EXTRUDERS #define HOTENDS EXTRUDERS
#define E_STEPPERS EXTRUDERS #define E_STEPPERS EXTRUDERS
#define E_MANUAL EXTRUDERS
#define TOOL_E_INDEX current_block->active_extruder #define TOOL_E_INDEX current_block->active_extruder
#endif #endif

33
Marlin/ultralcd.cpp
View File

@ -1316,11 +1316,11 @@ void kill_screen(const char* lcd_msg) {
* to "current_position" after a short delay. * to "current_position" after a short delay.
*/ */
inline void manual_move_to_current(AxisEnum axis inline void manual_move_to_current(AxisEnum axis
#if EXTRUDERS > 1 #if E_MANUAL > 1
, int8_t eindex=-1 , int8_t eindex=-1
#endif #endif
) { ) {
#if EXTRUDERS > 1 #if E_MANUAL > 1
if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder; if (axis == E_AXIS) 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
@ -1357,9 +1357,9 @@ void kill_screen(const char* lcd_msg) {
static void lcd_move_y() { _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS, sw_endstop_min[Y_AXIS], sw_endstop_max[Y_AXIS]); } static void lcd_move_y() { _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS, sw_endstop_min[Y_AXIS], sw_endstop_max[Y_AXIS]); }
#endif #endif
static void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS, sw_endstop_min[Z_AXIS], sw_endstop_max[Z_AXIS]); } static void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS, sw_endstop_min[Z_AXIS], sw_endstop_max[Z_AXIS]); }
static void lcd_move_e( static void _lcd_move_e(
#if E_STEPPERS > 1 #if E_MANUAL > 1
int8_t eindex = -1 int8_t eindex
#endif #endif
) { ) {
if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; } if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; }
@ -1368,7 +1368,7 @@ void kill_screen(const char* lcd_msg) {
current_position[E_AXIS] += float((int32_t)encoderPosition) * move_menu_scale; current_position[E_AXIS] += float((int32_t)encoderPosition) * move_menu_scale;
encoderPosition = 0; encoderPosition = 0;
manual_move_to_current(E_AXIS manual_move_to_current(E_AXIS
#if E_STEPPERS > 1 #if E_MANUAL > 1
, eindex , eindex
#endif #endif
); );
@ -1376,15 +1376,15 @@ void kill_screen(const char* lcd_msg) {
} }
if (lcdDrawUpdate) { if (lcdDrawUpdate) {
PGM_P pos_label; PGM_P pos_label;
#if E_STEPPERS == 1 #if E_MANUAL == 1
pos_label = PSTR(MSG_MOVE_E); pos_label = PSTR(MSG_MOVE_E);
#else #else
switch (eindex) { switch (eindex) {
default: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break; default: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break; case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
#if E_STEPPERS > 2 #if E_MANUAL > 2
case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break; case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
#if E_STEPPERS > 3 #if E_MANUAL > 3
case 3: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E4); break; case 3: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E4); break;
#endif #endif
#endif #endif
@ -1394,13 +1394,14 @@ void kill_screen(const char* lcd_msg) {
} }
} }
#if E_STEPPERS > 1 static void lcd_move_e() { _lcd_move_e(); }
static void lcd_move_e0() { lcd_move_e(0); } #if E_MANUAL > 1
static void lcd_move_e1() { lcd_move_e(1); } static void lcd_move_e0() { _lcd_move_e(0); }
#if E_STEPPERS > 2 static void lcd_move_e1() { _lcd_move_e(1); }
static void lcd_move_e2() { lcd_move_e(2); } #if E_MANUAL > 2
#if E_STEPPERS > 3 static void lcd_move_e2() { _lcd_move_e(2); }
static void lcd_move_e3() { lcd_move_e(3); } #if E_MANUAL > 3
static void lcd_move_e3() { _lcd_move_e(3); }
#endif #endif
#endif #endif
#endif #endif