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

optimisation: only check feedrate if knob is rotated 

Guard the feedmultiply code with
lcd_encoder.

if lcd_encoder = 0, then there is no need to check if
feedmultiply should be updated.

Also set lcd_encoder to zero in one line to consume the rotation event.

Change in memory:
Flash: -40 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-04-30 23:31:16 +00:00
parent a354aad762
commit b3f52f95c7
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Firmware/ultralcd.cpp
View File

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