Browse Source

Hotfix for first round of post-release hiccups

Scott Lahteine 5 years ago
parent
commit
84b96d3d47

+ 1
- 1
Marlin/src/core/serial.cpp View File

@@ -68,7 +68,7 @@ void print_bin(uint16_t val) {
68 68
 extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];
69 69
 
70 70
 void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
71
-  serialprintPGM(prefix);
71
+  if (prefix) serialprintPGM(prefix);
72 72
   SERIAL_ECHOPAIR_P(SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z);
73 73
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
74 74
 }

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

@@ -3047,8 +3047,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
3047 3047
 /**
3048 3048
  * Sanity check for WIFI
3049 3049
  */
3050
-#if ENABLED(ESP3D_WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32) 
3051
-  #error "ESP3D_WIFISUPPORT requires an ESP32 controller. Use WIFISUPPORT for standalone ESP3D modules."
3050
+#if EITHER(ESP3D_WIFISUPPORT, WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32)
3051
+  #error "ESP3D_WIFISUPPORT or WIFISUPPORT requires an ESP32 controller."
3052 3052
 #endif
3053 3053
 
3054 3054
 // Misc. Cleanup

+ 1
- 1
Marlin/src/inc/Version.h View File

@@ -42,7 +42,7 @@
42 42
  * version was tagged.
43 43
  */
44 44
 #ifndef STRING_DISTRIBUTION_DATE
45
-  #define STRING_DISTRIBUTION_DATE "2020-07-27"
45
+  #define STRING_DISTRIBUTION_DATE "2020-07-28"
46 46
 #endif
47 47
 
48 48
 /**

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

@@ -242,11 +242,9 @@ void home_delta() {
242 242
 
243 243
   // Disable stealthChop if used. Enable diag1 pin on driver.
244 244
   #if ENABLED(SENSORLESS_HOMING)
245
-    sensorless_t stealth_states {
246
-      tmc_enable_stallguard(stepperX),
247
-      tmc_enable_stallguard(stepperY),
248
-      tmc_enable_stallguard(stepperZ)
249
-    };
245
+  TERN_(X_SENSORLESS, sensorless_t stealth_states_x = start_sensorless_homing_per_axis(X_AXIS));
246
+  TERN_(Y_SENSORLESS, sensorless_t stealth_states_y = start_sensorless_homing_per_axis(Y_AXIS));
247
+  TERN_(Z_SENSORLESS, sensorless_t stealth_states_z = start_sensorless_homing_per_axis(Z_AXIS));
250 248
   #endif
251 249
 
252 250
   // Move all carriages together linearly until an endstop is hit.
@@ -256,9 +254,9 @@ void home_delta() {
256 254
 
257 255
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
258 256
   #if ENABLED(SENSORLESS_HOMING)
259
-    tmc_disable_stallguard(stepperX, stealth_states.x);
260
-    tmc_disable_stallguard(stepperY, stealth_states.y);
261
-    tmc_disable_stallguard(stepperZ, stealth_states.z);
257
+  TERN_(X_SENSORLESS, end_sensorless_homing_per_axis(X_AXIS, stealth_states_x));
258
+  TERN_(Y_SENSORLESS, end_sensorless_homing_per_axis(Y_AXIS, stealth_states_y));
259
+  TERN_(Z_SENSORLESS, end_sensorless_homing_per_axis(Z_AXIS, stealth_states_z));
262 260
   #endif
263 261
 
264 262
   endstops.validate_homing_move();

+ 6
- 0
Marlin/src/module/motion.h View File

@@ -395,3 +395,9 @@ void homeaxis(const AxisEnum axis);
395 395
 #if HAS_M206_COMMAND
396 396
   void set_home_offset(const AxisEnum axis, const float v);
397 397
 #endif
398
+
399
+#if USE_SENSORLESS
400
+  struct sensorless_t;
401
+  sensorless_t start_sensorless_homing_per_axis(const AxisEnum axis);
402
+  void end_sensorless_homing_per_axis(const AxisEnum axis, sensorless_t enable_stealth);
403
+#endif

Loading…
Cancel
Save