zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Malyan M200 core fixes (#13927)

Browse source
This commit is contained in:
J.C. Nelson 2019-05-06 16:07:13 -07:00 committed by Scott Lahteine
parent a36782ac1d
commit 172abc305b
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
View file

@ -52,8 +52,8 @@
#define END_FLASH_ADDR 0x00020000 #define END_FLASH_ADDR 0x00020000
#endif #endif
#ifdef __STM32F1__ #if defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx)
// For STM32F103ZET6/STM32F103VET6 // For STM32F103ZET6/STM32F103VET6/STM32F0xx
// SRAM (0x20000000 - 0x20010000) (64kb) // SRAM (0x20000000 - 0x20010000) (64kb)
// FLASH (0x00000000 - 0x00080000) (512kb) // FLASH (0x00000000 - 0x00080000) (512kb)
// //

9
Marlin/src/pins/pins_MALYAN_M200.h
View file

@ -24,7 +24,7 @@
* MALYAN M200 pin assignments * MALYAN M200 pin assignments
*/ */
#ifndef __STM32F1__ #if !defined(__STM32F1__) && !defined(STM32F1xx) && !defined(STM32F0xx)
#error "Oops! You must be compiling for STM32." #error "Oops! You must be compiling for STM32."
#endif #endif
@ -37,6 +37,13 @@
#define SDSS SS_PIN #define SDSS SS_PIN
// Based on PWM timer usage, we have to use these timers and soft PWM for the fans
// On STM32F103:
// PB3, PB6, PB7, and PB8 can be used with pwm, which rules out TIM2 and TIM4.
// On STM32F070, 16 and 17 are in use, but 1 and 3 are available.
#define STEP_TIMER 1
#define TEMP_TIMER 3
// //
// Limit Switches // Limit Switches
// //