Skip to content

Commit

Permalink
🐛 Fix Arduino build issues (#23510)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored Jan 12, 2022
1 parent 84ed749 commit a058a8a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
6 changes: 3 additions & 3 deletions Marlin/src/module/probe.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,14 @@ class Probe {

// 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) {
Expand Down

0 comments on commit a058a8a

Please sign in to comment.