浏览代码

Malyan M200 core fixes (#13927)

J.C. Nelson 6 年前
父节点
当前提交
172abc305b
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 2
    2
      Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
  2. 8
    1
      Marlin/src/pins/pins_MALYAN_M200.h

+ 2
- 2
Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp 查看文件

52
 #define END_FLASH_ADDR    0x00020000
52
 #define END_FLASH_ADDR    0x00020000
53
 #endif
53
 #endif
54
 
54
 
55
-#ifdef __STM32F1__
56
-// For STM32F103ZET6/STM32F103VET6
55
+#if defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx)
56
+// For STM32F103ZET6/STM32F103VET6/STM32F0xx
57
 //  SRAM  (0x20000000 - 0x20010000) (64kb)
57
 //  SRAM  (0x20000000 - 0x20010000) (64kb)
58
 //  FLASH (0x00000000 - 0x00080000) (512kb)
58
 //  FLASH (0x00000000 - 0x00080000) (512kb)
59
 //
59
 //

+ 8
- 1
Marlin/src/pins/pins_MALYAN_M200.h 查看文件

24
  * MALYAN M200 pin assignments
24
  * MALYAN M200 pin assignments
25
  */
25
  */
26
 
26
 
27
-#ifndef __STM32F1__
27
+#if !defined(__STM32F1__) && !defined(STM32F1xx) && !defined(STM32F0xx)
28
   #error "Oops! You must be compiling for STM32."
28
   #error "Oops! You must be compiling for STM32."
29
 #endif
29
 #endif
30
 
30
 
37
 
37
 
38
 #define SDSS SS_PIN
38
 #define SDSS SS_PIN
39
 
39
 
40
+// Based on PWM timer usage, we have to use these timers and soft PWM for the fans
41
+// On STM32F103:
42
+// PB3, PB6, PB7, and PB8 can be used with pwm, which rules out TIM2 and TIM4.
43
+// On STM32F070, 16 and 17 are in use, but 1 and 3 are available.
44
+#define STEP_TIMER 1
45
+#define TEMP_TIMER 3
46
+
40
 //
47
 //
41
 // Limit Switches
48
 // Limit Switches
42
 //
49
 //

正在加载...
取消
保存