Преглед изворни кода

🐛 Fix Arduino build issues (#23510)

ellensp пре 3 година
родитељ
комит
a058a8a8b2
No account linked to committer's email address
2 измењених фајлова са 9 додато и 3 уклоњено
  1. 6
    0
      Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
  2. 3
    3
      Marlin/src/module/probe.h

+ 6
- 0
Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp Прегледај датотеку

27
  * Date: 2021/11/06
27
  * Date: 2021/11/06
28
  */
28
  */
29
 
29
 
30
+#include "../../../inc/MarlinConfigPre.h"
31
+
32
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
33
+
30
 #include "dwin.h"
34
 #include "dwin.h"
31
 #include "dwin_popup.h"
35
 #include "dwin_popup.h"
32
 
36
 
53
   Draw_Select_Highlight(true);
57
   Draw_Select_Highlight(true);
54
   DWIN_UpdateLCD();
58
   DWIN_UpdateLCD();
55
 }
59
 }
60
+
61
+#endif // DWIN_CREALITY_LCD_ENHANCED

+ 3
- 3
Marlin/src/module/probe.h Прегледај датотеку

212
 
212
 
213
     // constexpr helpers used in build-time static_asserts, relying on default probe offsets.
213
     // constexpr helpers used in build-time static_asserts, relying on default probe offsets.
214
     class build_time {
214
     class build_time {
215
-      static constexpr xyz_pos_t default_probe_xyz_offset =
215
+      static constexpr xyz_pos_t default_probe_xyz_offset = xyz_pos_t(
216
         #if HAS_BED_PROBE
216
         #if HAS_BED_PROBE
217
           NOZZLE_TO_PROBE_OFFSET
217
           NOZZLE_TO_PROBE_OFFSET
218
         #else
218
         #else
219
           { 0 }
219
           { 0 }
220
         #endif
220
         #endif
221
-      ;
222
-      static constexpr xy_pos_t default_probe_xy_offset = { default_probe_xyz_offset.x,  default_probe_xyz_offset.y };
221
+      );
222
+      static constexpr xy_pos_t default_probe_xy_offset = xy_pos_t({ default_probe_xyz_offset.x,  default_probe_xyz_offset.y });
223
 
223
 
224
     public:
224
     public:
225
       static constexpr bool can_reach(float x, float y) {
225
       static constexpr bool can_reach(float x, float y) {

Loading…
Откажи
Сачувај