use ui.lcd_clicked

MarlinFirmware · Jun 14, 2021 · 36030c7 · 36030c7
1 parent b877ce1
commit 36030c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
@@ -892,10 +892,6 @@ namespace ExtUI {
 
   #endif // HAS_LEVELING
 
-  bool ui_cancel_operation;
-  void ui_setUICancelOperation(const bool state) { ui_cancel_operation = state; }
-  bool get_isUICanceled() { return ui_cancel_operation; }
-
   #if ENABLED(HOST_PROMPT_SUPPORT)
     void setHostResponse(const uint8_t response) { host_response_handler(response); }
   #endif

diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
@@ -190,8 +190,7 @@ namespace ExtUI {
     void setHostResponse(const uint8_t);
   #endif
 
-  void ui_setUICancelOperation(const bool);
-  bool get_isUICanceled();
+  inline void simulateUserClick() { ui.lcd_clicked = true; }
 
   #if ENABLED(PRINTCOUNTER)
     char* getFailedPrints_str(char buffer[21]);

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -223,6 +223,10 @@ millis_t MarlinUI::next_button_update_ms; // = 0
 
 #endif
 
+#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+  bool MarlinUI::lcd_clicked;
+#endif
+
 #if HAS_LCD_MENU
   #include "menu/menu.h"
 
@@ -247,14 +251,6 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     uint8_t MarlinUI::repeat_delay;
   #endif
 
-  bool MarlinUI::lcd_clicked;
-
-  bool MarlinUI::use_click() {
-    const bool click = lcd_clicked;
-    lcd_clicked = false;
-    return click;
-  }
-
   #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
 
     bool MarlinUI::external_control; // = false
@@ -1458,14 +1454,6 @@ void MarlinUI::update() {
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
   }
 
-  #if ENABLED(EXTENSIBLE_UI)
-    bool MarlinUI::use_click() {
-      const bool click = ExtUI::get_isUICanceled();
-      ExtUI::ui_setUICancelOperation(false);
-      return click;
-    }
-  #endif
-
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
 
     void MarlinUI::advance_status_scroll() {

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -474,9 +474,6 @@ class MarlinUI {
     static void set_selection(const bool sel) { selection = sel; }
     static bool update_selection();
 
-    static bool lcd_clicked;
-    static bool use_click();
-
     static void synchronize(PGM_P const msg=nullptr);
 
     static screenFunc_t currentScreen;
@@ -527,13 +524,21 @@ class MarlinUI {
 
   #elif HAS_WIRED_LCD
 
-    static constexpr bool lcd_clicked = false;
     static constexpr bool on_status_screen() { return true; }
     FORCE_INLINE static void run_current_screen() { status_screen(); }
 
-  #elif ENABLED(EXTENSIBLE_UI)
+  #endif
+
+  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
     static bool lcd_clicked;
-    static bool use_click();
+    static bool use_click() {
+      const bool click = lcd_clicked;
+      lcd_clicked = false;
+      return click;
+    }
+  #else
+    static constexpr bool lcd_clicked = false;
+    static inline bool use_click() { return false; }
   #endif
 
   #if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)