Skip to content

[2.0.x] Improvements to runout sensor, fix for screen size when using LIGHTWEIGHT_UI #12542 #12544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from
Nov 27, 2018
Merged

[2.0.x] Improvements to runout sensor, fix for screen size when using LIGHTWEIGHT_UI #12542 #12544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b75d6be
Improvements to filament runout sensor
marcio-ao Nov 27, 2018
2e9115e
Fix screen size when using LIGHTWEIGHT_UI (#12542)
marcio-ao Nov 27, 2018
9dd5e31
Update runout.h
thinkyhead Nov 27, 2018
d885a5a
Update runout.h
thinkyhead Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Marlin/src/feature/runout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ class FilamentSensorBase {
old_state = new_state;

#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

motion_detected |= change;
Expand Down Expand Up @@ -295,9 +296,12 @@ class FilamentSensorBase {
}

static inline void block_completed(const block_t* const b) {
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)];
if (b->steps[X_AXIS] || b->steps[Y_AXIS] || b->steps[Z_AXIS]) {
// Only trigger on extrusion with XYZ movement to allow filament change and retract/recover.
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)];
}
}
};

Expand Down
8 changes: 2 additions & 6 deletions Marlin/src/inc/Conditionals_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,9 +1641,7 @@

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