瀏覽代碼

🩹 Fix Malyan M300 with S-Curve compile

Fixes #24548
Scott Lahteine 3 年之前
父節點
當前提交
1c4fc4603a
共有 2 個檔案被更改,包括 8 行新增5 行删除
  1. 1
    1
      Marlin/src/module/stepper.cpp
  2. 7
    4
      Marlin/src/pins/stm32f0/pins_MALYAN_M300.h

+ 1
- 1
Marlin/src/module/stepper.cpp 查看文件

@@ -1345,7 +1345,7 @@ void Stepper::set_directions() {
1345 1345
     }
1346 1346
 
1347 1347
     FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
1348
-      #if (defined(__arm__) || defined(__thumb__)) && !defined(STM32G0B1xx) // TODO: Test define STM32G0xx versus STM32G0B1xx
1348
+      #if (defined(__arm__) || defined(__thumb__)) && __ARM_ARCH >= 6 && !defined(STM32G0B1xx) // TODO: Test define STM32G0xx versus STM32G0B1xx
1349 1349
 
1350 1350
         // For ARM Cortex M3/M4 CPUs, we have the optimized assembler version, that takes 43 cycles to execute
1351 1351
         uint32_t flo = 0;

+ 7
- 4
Marlin/src/pins/stm32f0/pins_MALYAN_M300.h 查看文件

@@ -51,10 +51,13 @@
51 51
 //
52 52
 // Limit Switches
53 53
 //
54
-#define X_MAX_PIN                           PC13
55
-#define Y_MAX_PIN                           PC14
56
-#define Z_MAX_PIN                           PC15
57
-#define Z_MIN_PIN                           PB7
54
+#define X_STOP_PIN                          PC13
55
+#define Y_STOP_PIN                          PC14
56
+#define Z_STOP_PIN                          PC15
57
+
58
+#ifndef Z_MIN_PROBE_PIN
59
+  #define Z_MIN_PROBE_PIN                   PB7
60
+#endif
58 61
 
59 62
 //
60 63
 // Steppers

Loading…
取消
儲存