josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4181 from gudnimg/status-screen-feedrate 

optimisation: only check feedrate if knob is rotated
This commit is contained in:
3d-gussner 2023-05-05 12:37:46 +02:00 committed by GitHub
parent fd2184801f b3f52f95c7
commit 12d9070c03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Firmware/ultralcd.cpp
View File

@ -689,34 +689,29 @@ void lcd_status_screen() // NOT static due to using ins
{
static uint8_t lcd_status_update_delay = 0;
#ifdef ULTIPANEL_FEEDMULTIPLY
// Dead zone at 100% feedrate
if ((feedmultiply < 100 && (feedmultiply + lcd_encoder) > 100) ||
(feedmultiply > 100 && (feedmultiply + lcd_encoder) < 100))
{
lcd_encoder = 0;
feedmultiply = 100;
}
if (feedmultiply == 100 && lcd_encoder > ENCODER_FEEDRATE_DEADZONE)
{
feedmultiply += lcd_encoder - ENCODER_FEEDRATE_DEADZONE;
lcd_encoder = 0;
}
else if (feedmultiply == 100 && lcd_encoder < -ENCODER_FEEDRATE_DEADZONE)
{
feedmultiply += lcd_encoder + ENCODER_FEEDRATE_DEADZONE;
lcd_encoder = 0;
}
else if (feedmultiply != 100)
{
feedmultiply += lcd_encoder;
lcd_encoder = 0;
}
#endif //ULTIPANEL_FEEDMULTIPLY
if (lcd_encoder)
{
const int16_t initial_feedmultiply = feedmultiply;
// Dead zone at 100% feedrate
if ((feedmultiply < 100 && (feedmultiply + lcd_encoder) > 100) ||
(feedmultiply > 100 && (feedmultiply + lcd_encoder) < 100))
{
feedmultiply = 100;
}
else if (feedmultiply == 100 && lcd_encoder > ENCODER_FEEDRATE_DEADZONE) {
feedmultiply += lcd_encoder - ENCODER_FEEDRATE_DEADZONE;
}
else if (feedmultiply == 100 && lcd_encoder < -ENCODER_FEEDRATE_DEADZONE) {
feedmultiply += lcd_encoder + ENCODER_FEEDRATE_DEADZONE;
}
else if (feedmultiply != 100) feedmultiply += lcd_encoder;
if (feedmultiply < 10)
feedmultiply = 10;
else if (feedmultiply > 999)
feedmultiply = 999;
if (initial_feedmultiply != feedmultiply) {
feedmultiply = constrain(feedmultiply, 10, 999);
lcd_encoder = 0; // Consume rotation event
}
}
#endif //ULTIPANEL_FEEDMULTIPLY
if (lcd_draw_update) {
// Update the status screen immediately