Browse Source

Fix probeless delta build (#16537)

Jason Smith 4 years ago
parent
commit
d22eb261cf

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

@@ -1020,6 +1020,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1020 1020
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
1021 1021
   #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_LCD_MENU)
1022 1022
     #error "DELTA_AUTO_CALIBRATION requires a probe or LCD Controller."
1023
+  #elif ENABLED(DELTA_CALIBRATION_MENU) && !HAS_LCD_MENU
1024
+    #error "DELTA_CALIBRATION_MENU requires an LCD Controller."
1023 1025
   #elif ABL_GRID
1024 1026
     #if (GRID_MAX_POINTS_X & 1) == 0 || (GRID_MAX_POINTS_Y & 1) == 0
1025 1027
       #error "DELTA requires GRID_MAX_POINTS_X and GRID_MAX_POINTS_Y to be odd numbers."

+ 16
- 6
Marlin/src/module/delta.cpp View File

@@ -86,13 +86,23 @@ void recalc_delta_settings() {
86 86
  * Get a safe radius for calibration
87 87
  */
88 88
 
89
-#if ENABLED(DELTA_AUTO_CALIBRATION)
90
-  float calibration_radius_factor = 1;
91
-#endif
89
+#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
92 90
 
93
-float delta_calibration_radius() {
94
-  return FLOOR((DELTA_PRINTABLE_RADIUS - _MAX(HYPOT(probe_offset_xy.x, probe_offset_xy.y), MIN_PROBE_EDGE)) * calibration_radius_factor);
95
-}
91
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
92
+    float calibration_radius_factor = 1;
93
+  #endif
94
+
95
+  float delta_calibration_radius() {
96
+    return calibration_radius_factor * (
97
+      #if HAS_BED_PROBE
98
+        FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe_offset_xy.x, probe_offset_xy.y), MIN_PROBE_EDGE))
99
+      #else
100
+        DELTA_PRINTABLE_RADIUS
101
+      #endif
102
+    );
103
+  }
104
+
105
+#endif
96 106
 
97 107
 /**
98 108
  * Delta Inverse Kinematics

+ 3
- 1
Marlin/src/module/delta.h View File

@@ -52,7 +52,9 @@ void recalc_delta_settings();
52 52
   constexpr float calibration_radius_factor = 1;
53 53
 #endif
54 54
 
55
-float delta_calibration_radius();
55
+#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
56
+  float delta_calibration_radius();
57
+#endif
56 58
 
57 59
 /**
58 60
  * Delta Inverse Kinematics

+ 7
- 0
buildroot/share/tests/megaatmega2560-tests View File

@@ -310,6 +310,13 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EE
310 310
 exec_test $1 $2 "RAMPS | DELTA | OLED_PANEL_TINYBOY2 | UBL | Allen Key | EEPROM"
311 311
 
312 312
 #
313
+# Delta Config (generic) + Probeless
314
+#
315
+use_example_configs delta/generic
316
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
317
+exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
318
+
319
+#
313 320
 # Delta Config (FLSUN AC because it's complex)
314 321
 #
315 322
 use_example_configs delta/FLSUN/auto_calibrate

Loading…
Cancel
Save