thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Malyan M200 core fixes (#13927)

J.C. Nelson 5 years ago
parent
a36782ac1d
commit
172abc305b
2 changed files with 10 additions and 3 deletions
Split View Show Diff Stats
  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 View File 

@@ -52,8 +52,8 @@
52 52 
 #define END_FLASH_ADDR    0x00020000
53 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 57 
 //  SRAM  (0x20000000 - 0x20010000) (64kb)
58 58 
 //  FLASH (0x00000000 - 0x00080000) (512kb)
59 59 
 //

+ 8
- 1
Marlin/src/pins/pins_MALYAN_M200.h View File 

@@ -24,7 +24,7 @@
24 24 
  * MALYAN M200 pin assignments
25 25 
  */
26 26
27 
-#ifndef __STM32F1__
27 
+#if !defined(__STM32F1__) && !defined(STM32F1xx) && !defined(STM32F0xx)
28 28 
   #error "Oops! You must be compiling for STM32."
29 29 
 #endif
30 30 
 
@@ -37,6 +37,13 @@
37 37
38 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 48 
 // Limit Switches
42 49 
 //

Write Preview
Loading…
Cancel
Save