From a058a8a8b224de5e0878cc009e76a5578350b734 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Thu, 13 Jan 2022 04:53:36 +1300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Arduino=20build=20issues?= =?UTF-8?q?=20(#23510)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp | 6 ++++++ Marlin/src/module/probe.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp index 89909e5c27..cf1ab8c0ad 100644 --- a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp +++ b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp @@ -27,6 +27,10 @@ * Date: 2021/11/06 */ +#include "../../../inc/MarlinConfigPre.h" + +#if ENABLED(DWIN_CREALITY_LCD_ENHANCED) + #include "dwin.h" #include "dwin_popup.h" @@ -53,3 +57,5 @@ void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) { Draw_Select_Highlight(true); DWIN_UpdateLCD(); } + +#endif // DWIN_CREALITY_LCD_ENHANCED diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h index 3c97afcb89..d9c50b0125 100644 --- a/Marlin/src/module/probe.h +++ b/Marlin/src/module/probe.h @@ -212,14 +212,14 @@ public: // constexpr helpers used in build-time static_asserts, relying on default probe offsets. class build_time { - static constexpr xyz_pos_t default_probe_xyz_offset = + static constexpr xyz_pos_t default_probe_xyz_offset = xyz_pos_t( #if HAS_BED_PROBE NOZZLE_TO_PROBE_OFFSET #else { 0 } #endif - ; - static constexpr xy_pos_t default_probe_xy_offset = { default_probe_xyz_offset.x, default_probe_xyz_offset.y }; + ); + static constexpr xy_pos_t default_probe_xy_offset = xy_pos_t({ default_probe_xyz_offset.x, default_probe_xyz_offset.y }); public: static constexpr bool can_reach(float x, float y) {