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

Improve runout sensor, fix LIGHTWEIGHT_UI screen size (#12544)

Browse source
This commit is contained in:
Marcio Teixeira 2018-11-27 12:45:25 -07:00 committed by Scott Lahteine
parent 5b24ce9024
commit 439a3e8463
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/src/feature/runout.h
View file

@ -186,7 +186,8 @@ class FilamentSensorBase {
old_state = new_state; old_state = new_state;
#ifdef FILAMENT_RUNOUT_SENSOR_DEBUG #ifdef FILAMENT_RUNOUT_SENSOR_DEBUG
if (change) SERIAL_PROTOCOLLNPAIR("Motion detected: ", int(change)); for (uint8_t e = 0; e < EXTRUDERS; e++)
if (TEST(change, e)) SERIAL_PROTOCOLLNPAIR("Motion detected T", e);
#endif #endif
motion_detected |= change; motion_detected |= change;
@ -295,9 +296,12 @@ class FilamentSensorBase {
} }
static inline void block_completed(const block_t* const b) { static inline void block_completed(const block_t* const b) {
const uint8_t e = b->extruder; if (b->steps[X_AXIS] || b->steps[Y_AXIS] || b->steps[Z_AXIS]) {
const int32_t steps = b->steps[E_AXIS]; // Only trigger on extrusion with XYZ movement to allow filament change and retract/recover.
runout_mm_countdown[e] -= (TEST(b->direction_bits, E_AXIS) ? -steps : steps) * planner.steps_to_mm[E_AXIS_N(e)]; const uint8_t e = b->extruder;
const int32_t steps = b->steps[E_AXIS];
runout_mm_countdown[e] -= (TEST(b->direction_bits, E_AXIS) ? -steps : steps) * planner.steps_to_mm[E_AXIS_N(e)];
}
} }
}; };

8
Marlin/src/inc/Conditionals_post.h
View file

@ -1641,9 +1641,7 @@
// Get LCD character width/height, which may be overridden by pins, configs, etc. // Get LCD character width/height, which may be overridden by pins, configs, etc.
#ifndef LCD_WIDTH #ifndef LCD_WIDTH
#if ENABLED(LIGHTWEIGHT_UI) #if HAS_GRAPHICAL_LCD
#define LCD_WIDTH 16
#elif HAS_GRAPHICAL_LCD
#define LCD_WIDTH 22 #define LCD_WIDTH 22
#elif ENABLED(ULTIPANEL) #elif ENABLED(ULTIPANEL)
#define LCD_WIDTH 20 #define LCD_WIDTH 20
@ -1652,9 +1650,7 @@
#endif #endif
#endif #endif
#ifndef LCD_HEIGHT #ifndef LCD_HEIGHT
#if ENABLED(LIGHTWEIGHT_UI) #if HAS_GRAPHICAL_LCD
#define LCD_HEIGHT 4
#elif HAS_GRAPHICAL_LCD
#define LCD_HEIGHT 5 #define LCD_HEIGHT 5
#elif ENABLED(ULTIPANEL) #elif ENABLED(ULTIPANEL)
#define LCD_HEIGHT 4 #define LCD_HEIGHT 4