From 290a55ced1071eaf9daf6f8191902f48f1b2ea4d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 8 Jan 2023 04:18:24 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20ProUI=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp | 4 ++-- Marlin/src/lcd/e3v2/proui/bedlevel_tools.h | 2 +- Marlin/src/lcd/e3v2/proui/menus.cpp | 8 ++++---- Marlin/src/lcd/e3v2/proui/printstats.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp index c4f43eab10..760582c76a 100644 --- a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp +++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp @@ -19,13 +19,13 @@ * along with this program. If not, see . * */ - + /** * Bed Level Tools for Pro UI * Extended by: Miguel A. Risco-Castillo (MRISCOC) * Version: 2.1.0 * Date: 2022/08/27 - * + * * Based on the original work of: Henri-J-Norden * https://github.com/Jyers/Marlin/pull/126 * diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h index b476cb38b6..6e642f030c 100644 --- a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h +++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h @@ -25,7 +25,7 @@ * Extended by: Miguel A. Risco-Castillo (MRISCOC) * Version: 2.1.0 * Date: 2022/08/27 - * + * * Based on the original work of: Henri-J-Norden * https://github.com/Jyers/Marlin/pull/126 * diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp index 32c19acb69..3267eec60d 100644 --- a/Marlin/src/lcd/e3v2/proui/menus.cpp +++ b/Marlin/src/lcd/e3v2/proui/menus.cpp @@ -399,7 +399,7 @@ void MenuClass::onScroll(bool dir) { } void MenuClass::onClick() { - if (MenuItems[selected]->onClick != nullptr) (*MenuItems[selected]->onClick)(); + if (MenuItems[selected]->onClick != nullptr) (*MenuItems[selected]->onClick)(); } CustomMenuItemClass *MenuClass::SelectedItem() { @@ -410,8 +410,8 @@ CustomMenuItemClass** MenuClass::Items() { return MenuItems; } -int8_t MenuClass::count() { - return MenuItemCount; +int8_t MenuClass::count() { + return MenuItemCount; }; /* MenuItem Class ===========================================================*/ @@ -510,7 +510,7 @@ MenuItemClass* MenuItemAdd(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, return MenuItemAdd(menuitem); } else return nullptr; -} +} MenuItemClass* EditItemAdd(uint8_t cicon, const char * const text, OnDrawItem ondraw, OnClickItem onclick, void* val) { if (MenuItemCount < MenuItemTotal) { diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp index fc07e3387d..638cd34208 100644 --- a/Marlin/src/lcd/e3v2/proui/printstats.cpp +++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp @@ -81,9 +81,9 @@ void Goto_PrintStats() { // Print Stats Reset popup void Popup_ResetStats() { DWIN_Popup_ConfirmCancel(ICON_Info_0, GET_TEXT_F(MSG_RESET_STATS)); } -void OnClick_ResetStats() { +void OnClick_ResetStats() { if (HMI_flag.select_flag) PrintStatsClass::Reset(); - HMI_ReturnScreen(); + HMI_ReturnScreen(); } void PrintStatsReset() { Goto_Popup(Popup_ResetStats, OnClick_ResetStats); }