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

✨ MKS Mini12864 v3 for Robin E3/E3D (#22368)

Browse source
This commit is contained in:
mks-viva 2021-07-15 20:57:34 -05:00 committed by Scott Lahteine
parent 165ae139d5
commit 6e7c20e78e
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -156,7 +156,6 @@
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI PB15
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(MKS_MINI_12864_V3)
#define ENABLE_SPI3
#define DOGLCD_CS PA4 #define DOGLCD_CS PA4
#define DOGLCD_A0 PA5 #define DOGLCD_A0 PA5
#define LCD_PINS_DC DOGLCD_A0 #define LCD_PINS_DC DOGLCD_A0
@ -165,6 +164,8 @@
#define NEOPIXEL_PIN PA7 #define NEOPIXEL_PIN PA7
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI PB15
#define DOGLCD_SCK PB13 #define DOGLCD_SCK PB13
#define FORCE_SOFT_SPI
#define SOFTWARE_SPI
#else #else

24
buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
View file

@ -101,11 +101,24 @@ extern "C" {
#endif #endif
// Override default Arduino configuration // Override default Arduino configuration
// SPI Definitions // SPI Definitions
#define PIN_SPI_SS PA4 #if DEFAULT_SPI == 3
#define PIN_SPI_MOSI PA7 #define PIN_SPI_SS PA15
#define PIN_SPI_MISO PA6 #define PIN_SPI_MOSI PB3
#define PIN_SPI_SCK PA5 #define PIN_SPI_MISO PB4
#define PIN_SPI_SCK PB5
#elif DEFAULT_SPI == 2
#define PIN_SPI_SS PB12
#define PIN_SPI_MOSI PB13
#define PIN_SPI_MISO PB14
#define PIN_SPI_SCK PB15
#else
#define PIN_SPI_SS PA4
#define PIN_SPI_MOSI PA7
#define PIN_SPI_MISO PA6
#define PIN_SPI_SCK PA5
#endif
// I2C Definitions // I2C Definitions
#define PIN_WIRE_SDA PB7 #define PIN_WIRE_SDA PB7
@ -118,6 +131,7 @@ extern "C" {
#ifndef TIMER_SERVO #ifndef TIMER_SERVO
#define TIMER_SERVO TIM2 #define TIMER_SERVO TIM2
#endif #endif
// UART Definitions // UART Definitions
// Define here Serial instance number to map on Serial generic name // Define here Serial instance number to map on Serial generic name
#define SERIAL_UART_INSTANCE 1 #define SERIAL_UART_INSTANCE 1
@ -126,7 +140,7 @@ extern "C" {
#define PIN_SERIAL_RX PA10 #define PIN_SERIAL_RX PA10
#define PIN_SERIAL_TX PA9 #define PIN_SERIAL_TX PA9
/* Extra HAL modules */ // Extra HAL modules
#if defined(STM32F103xE) || defined(STM32F103xG) #if defined(STM32F103xE) || defined(STM32F103xG)
#define HAL_DAC_MODULE_ENABLED #define HAL_DAC_MODULE_ENABLED
#endif #endif

3
ini/stm32f1.ini
View file

@ -125,8 +125,7 @@ lib_deps =
[env:mks_robin_e3] [env:mks_robin_e3]
platform = ${common_stm32.platform} platform = ${common_stm32.platform}
extends = common_STM32F103RC extends = common_STM32F103RC
build_flags = ${common_stm32.build_flags} build_flags = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
-DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
monitor_speed = 115200 monitor_speed = 115200
board_build.offset = 0x5000 board_build.offset = 0x5000