Browse Source

Misc build fixes (#21413)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
kpishere 4 years ago
parent
commit
fd8207dd9a
No account linked to committer's email address

+ 2
- 1
Marlin/src/core/bug_on.h View File

@@ -30,7 +30,8 @@
30 30
   #define BUG_ON(V...) do { SERIAL_ECHOPAIR(ONLY_FILENAME, __LINE__, ": "); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); *(char*)0 = 42; } while(0)
31 31
 #elif ENABLED(MARLIN_DEV_MODE)
32 32
   // Don't stop the CPU here, but at least dump the bug on the serial port
33
-  #define BUG_ON(V...) do { SERIAL_ECHOPAIR(ONLY_FILENAME, __LINE__, ": BUG!\n"); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); } while(0)
33
+  //#define BUG_ON(V...) do { SERIAL_ECHOPAIR(ONLY_FILENAME, __LINE__, ": BUG!\n"); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); } while(0)
34
+  #define BUG_ON(V...) NOOP
34 35
 #else
35 36
   // Release mode, let's ignore the bug
36 37
   #define BUG_ON(V...) NOOP

+ 1
- 1
Marlin/src/gcode/bedlevel/mbl/G29.cpp View File

@@ -98,7 +98,7 @@ void GcodeSuite::G29() {
98 98
       // For each G29 S2...
99 99
       if (mbl_probe_index == 0) {
100 100
         // Move close to the bed before the first point
101
-        do_blocking_move_to_z(0);
101
+        do_blocking_move_to_z(MANUAL_PROBE_START_Z);
102 102
       }
103 103
       else {
104 104
         // Save Z for the previous mesh position

+ 4
- 3
Marlin/src/pins/ramps/pins_RAMPS.h View File

@@ -45,6 +45,10 @@
45 45
  *         7 | 11
46 46
  */
47 47
 
48
+#if ENABLED(AZSMZ_12864) && DISABLED(ALLOW_SAM3X8E)
49
+  #error "No pins defined for RAMPS with AZSMZ_12864."
50
+#endif
51
+
48 52
 #include "env_validate.h"
49 53
 
50 54
 // Custom flags and defines for the build
@@ -720,9 +724,6 @@
720 724
     #elif ENABLED(AZSMZ_12864)
721 725
 
722 726
       // Pins only defined for RAMPS_SMART currently
723
-      #if DISABLED(IS_RAMPS_SMART)
724
-        #error "No pins defined for RAMPS with AZSMZ_12864."
725
-      #endif
726 727
 
727 728
     #elif IS_TFTGLCD_PANEL
728 729
 

Loading…
Cancel
Save