zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix Arduino build issues (#23510)

Browse source
This commit is contained in:
ellensp 2022-01-13 04:53:36 +13:00 committed by Scott Lahteine
parent 0470fbe0a1
commit c91d033b5d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
View file

@ -27,6 +27,10 @@
* Date: 2021/11/06 * Date: 2021/11/06
*/ */
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#include "dwin.h" #include "dwin.h"
#include "dwin_popup.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); Draw_Select_Highlight(true);
DWIN_UpdateLCD(); DWIN_UpdateLCD();
} }
#endif // DWIN_CREALITY_LCD_ENHANCED

6
Marlin/src/module/probe.h
View file

@ -212,14 +212,14 @@ public:
// constexpr helpers used in build-time static_asserts, relying on default probe offsets. // constexpr helpers used in build-time static_asserts, relying on default probe offsets.
class build_time { 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 #if HAS_BED_PROBE
NOZZLE_TO_PROBE_OFFSET NOZZLE_TO_PROBE_OFFSET
#else #else
{ 0 } { 0 }
#endif #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: public:
static constexpr bool can_reach(float x, float y) { static constexpr bool can_reach(float x, float y) {