瀏覽代碼

Remove class LcdUpdateDisabler

Calling lcd_update_enable directly gives us more control

This also save a bit of flash memory
Guðni Már Gilbert 2 年之前
父節點
當前提交
74ea9a7e43
共有 2 個文件被更改,包括 1 次插入25 次删除
  1. 0 24
      Firmware/lcd.h
  2. 1 1
      Firmware/ultralcd.cpp

+ 0 - 24
Firmware/lcd.h

@@ -127,30 +127,6 @@ extern void lcd_update_enable(uint8_t enabled);
 
 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
 //

+ 1 - 1
Firmware/ultralcd.cpp

@@ -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)
 {
-    LcdUpdateDisabler lcdUpdateDisabler;
+    lcd_update_enable(false);
     const char *msg_next = lcd_display_message_fullscreen_P(msg);
     bool multi_screen = msg_next != NULL;
 	lcd_set_custom_characters_nextpage();