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

Remove class LcdUpdateDisabler 

Calling lcd_update_enable directly gives us more control

This also save a bit of flash memory
This commit is contained in:
Guðni Már Gilbert 2022-05-07 16:00:09 +00:00 committed by D.R.racer
parent 1ba314d95b
commit 74ea9a7e43
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Firmware/lcd.h
View File

@ -127,30 +127,6 @@ extern void lcd_update_enable(uint8_t enabled);
extern void lcd_buttons_update(void); extern void lcd_buttons_update(void);
//! @brief Helper class to temporarily disable LCD updates
//!
//! When constructed (on stack), original state state of lcd_update_enabled is stored
//! and LCD updates are disabled.
//! When destroyed (gone out of scope), original state of LCD update is restored.
//! It has zero overhead compared to storing bool saved = lcd_update_enabled
//! and calling lcd_update_enable(false) and lcd_update_enable(saved).
class LcdUpdateDisabler
{
public:
LcdUpdateDisabler(): m_updateEnabled(lcd_update_enabled)
{
lcd_update_enable(false);
}
~LcdUpdateDisabler()
{
lcd_update_enable(m_updateEnabled);
}
private:
bool m_updateEnabled;
};
//////////////////////////////////// ////////////////////////////////////
// Setup button and encode mappings for each panel (into 'lcd_buttons' variable // Setup button and encode mappings for each panel (into 'lcd_buttons' variable
// //

2
Firmware/ultralcd.cpp
View File

@ -3117,7 +3117,7 @@ const char* lcd_display_message_fullscreen_P(const char *msg)
*/ */
void lcd_show_fullscreen_message_and_wait_P(const char *msg) void lcd_show_fullscreen_message_and_wait_P(const char *msg)
{ {
LcdUpdateDisabler lcdUpdateDisabler; lcd_update_enable(false);
const char *msg_next = lcd_display_message_fullscreen_P(msg); const char *msg_next = lcd_display_message_fullscreen_P(msg);
bool multi_screen = msg_next != NULL; bool multi_screen = msg_next != NULL;
lcd_set_custom_characters_nextpage(); lcd_set_custom_characters_nextpage();