Skip to content

Add support mks mini12864 v3 for e3/e3d board #22368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from
Jul 16, 2021
Merged

Add support mks mini12864 v3 for e3/e3d board #22368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62339d4
Add support mks mini12864 v3 for e3/e3d board
mks-viva Jul 15, 2021
78999d2
Fix bad #ifdef
thinkyhead Jul 16, 2021
8c2d775
etc.
thinkyhead Jul 16, 2021
db6f5c1
define as integer
thinkyhead Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
#define DOGLCD_MOSI PB15

#elif ENABLED(MKS_MINI_12864_V3)
#define ENABLE_SPI3
#define DOGLCD_CS PA4
#define DOGLCD_A0 PA5
#define LCD_PINS_DC DOGLCD_A0
Expand All @@ -165,7 +164,9 @@
#define NEOPIXEL_PIN PA7
#define DOGLCD_MOSI PB15
#define DOGLCD_SCK PB13

#define FORCE_SOFT_SPI
#define SOFTWARE_SPI

#else

#define LCD_PINS_D4 PA6
Expand Down
24 changes: 19 additions & 5 deletions buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,24 @@ extern "C" {
#endif

// Override default Arduino configuration

// SPI Definitions
#define PIN_SPI_SS PA4
#define PIN_SPI_MOSI PA7
#define PIN_SPI_MISO PA6
#define PIN_SPI_SCK PA5
#if DEFAULT_SPI == 3
#define PIN_SPI_SS PA15
#define PIN_SPI_MOSI PB3
#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
#define PIN_WIRE_SDA PB7
Expand All @@ -118,6 +131,7 @@ extern "C" {
#ifndef TIMER_SERVO
#define TIMER_SERVO TIM2
#endif

// UART Definitions
// Define here Serial instance number to map on Serial generic name
#define SERIAL_UART_INSTANCE 1
Expand All @@ -126,7 +140,7 @@ extern "C" {
#define PIN_SERIAL_RX PA10
#define PIN_SERIAL_TX PA9

/* Extra HAL modules */
// Extra HAL modules
#if defined(STM32F103xE) || defined(STM32F103xG)
#define HAL_DAC_MODULE_ENABLED
#endif
Expand Down
3 changes: 1 addition & 2 deletions ini/stm32f1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ lib_deps =
[env:mks_robin_e3]
platform = ${common_stm32.platform}
extends = common_STM32F103RC
build_flags = ${common_stm32.build_flags}
-DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
build_flags = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
monitor_speed = 115200
board_build.offset = 0x5000
Expand Down