sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Status Screen flow adjustment (#26627)

Browse Source
This commit is contained in:
German Borisov
2024-01-19 22:17:36 +03:00
committed by GitHub
parent 9f7d5bbc86
commit 7d751a20b1
5 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration_adv.h
View File

@@ -1474,6 +1474,7 @@
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen #define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
//#define ULTIPANEL_FLOWPERCENT // Encoder sets the flow percentage on the Status Screen
#endif #endif
#endif #endif

1
Marlin/src/inc/Conditionals_LCD.h
View File

@@ -972,6 +972,7 @@
#define DETECT_I2C_LCD_DEVICE 1 #define DETECT_I2C_LCD_DEVICE 1
#endif #endif
// Encoder behavior
#ifndef STD_ENCODER_PULSES_PER_STEP #ifndef STD_ENCODER_PULSES_PER_STEP
#if ENABLED(TOUCH_SCREEN) #if ENABLED(TOUCH_SCREEN)
#define STD_ENCODER_PULSES_PER_STEP 2 #define STD_ENCODER_PULSES_PER_STEP 2

4
Marlin/src/inc/SanityCheck.h
View File

@@ -4147,6 +4147,10 @@ static_assert(WITHIN(MULTISTEPPING_LIMIT, 1, 128) && IS_POWER_OF_2(MULTISTEPPING
#endif #endif
#endif #endif
#if ALL(ULTIPANEL_FEEDMULTIPLY, ULTIPANEL_FLOWPERCENT)
#error "Only enable ULTIPANEL_FEEDMULTIPLY or ULTIPANEL_FLOWPERCENT, but not both."
#endif
// Misc. Cleanup // Misc. Cleanup
#undef _TEST_PWM #undef _TEST_PWM
#undef _NUM_AXES_STR #undef _NUM_AXES_STR

7
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@@ -888,7 +888,12 @@ void MarlinUI::draw_status_screen() {
lcd_put_lchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]); lcd_put_lchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
set_font(FONT_STATUSMENU); set_font(FONT_STATUSMENU);
lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
#if ENABLED(ULTIPANEL_FLOWPERCENT)
lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(planner.flow_percentage[active_extruder]));
#else
lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
#endif
lcd_put_u8str(F("%")); lcd_put_u8str(F("%"));
// //

28
Marlin/src/lcd/marlinui.cpp
View File

@@ -700,7 +700,7 @@ void MarlinUI::init() {
else else
new_frm = old_frm; new_frm = old_frm;
} }
else if ((old_frm < 100 && new_frm > 100) || (old_frm > 100 && new_frm < 100)) else if ((old_frm < 100) == (new_frm > 100)) // Crossing 100? Stick at 100.
new_frm = 100; new_frm = 100;
LIMIT(new_frm, SPEED_EDIT_MIN, SPEED_EDIT_MAX); LIMIT(new_frm, SPEED_EDIT_MIN, SPEED_EDIT_MAX);
@@ -720,7 +720,31 @@ void MarlinUI::init() {
#endif #endif
} }
#endif // ULTIPANEL_FEEDMULTIPLY #elif ENABLED(ULTIPANEL_FLOWPERCENT)
const int16_t old_fp = planner.flow_percentage[active_extruder];
int16_t new_fp = old_fp + int16_t(encoderPosition);
// Dead zone at 100% flow percentage
if (old_fp == 100) {
if (int16_t(encoderPosition) > ENCODER_FEEDRATE_DEADZONE)
new_fp -= ENCODER_FEEDRATE_DEADZONE;
else if (int16_t(encoderPosition) < -(ENCODER_FEEDRATE_DEADZONE))
new_fp += ENCODER_FEEDRATE_DEADZONE;
else
new_fp = old_fp;
}
else if ((old_fp < 100) == (new_fp > 100)) // Crossing 100? Stick at 100.
new_fp = 100;
LIMIT(new_fp, FLOW_EDIT_MIN, FLOW_EDIT_MAX);
if (old_fp != new_fp) {
planner.set_flow(active_extruder, new_fp);
encoderPosition = 0;
}
#endif // ULTIPANEL_FLOWPERCENT
draw_status_screen(); draw_status_screen();
} }