Merge branch 'bugfix-2.0.x' of https://github.com/Foxies-CSTL/Marlin_2.0.x into bugfix-2.0.x
This commit is contained in:
Foxies
commit
7cde38bf67
2 changed files with 167 additions and 170 deletions
|
|
@ -21,17 +21,18 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* FLSUN HiSpeed V1 (STM32F103VET6) board pin assignments
|
* FLSUN HiSpeed V1 (STM32F103VET6) board pin assignments
|
||||||
* FLSun Hispeed (clone MKS_Robin_miniV2) board.
|
* FLSun Hispeed (clone MKS_Robin_miniV2) board.
|
||||||
* MKS Robin Mini USB Use UART3(PB10-TX,PB11-RX)
|
*
|
||||||
|
* MKS Robin Mini USB uses UART3 (PB10-TX, PB11-RX)
|
||||||
* #define SERIAL_PORT_2 3
|
* #define SERIAL_PORT_2 3
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__, STM32F1xx)
|
#if NOT_TARGET(__STM32F1__, STM32F1xx)
|
||||||
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#elif HOTENDS > 1 || E_STEPPERS > 1
|
#elif HOTENDS > 1 || E_STEPPERS > 1
|
||||||
#error "FLSUN hispeed supports 1 hotends / E-steppers. Comment out this line to continue."
|
#error "FLSUN HiSpeedV1 supports 1 hotend / E-stepper. Comment out this line to continue."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_INFO_NAME "FLSun HiSpeedV1"
|
#define BOARD_INFO_NAME "FLSun HiSpeedV1"
|
||||||
|
|
@ -49,128 +50,152 @@
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// SPI
|
||||||
|
// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
|
||||||
|
//
|
||||||
|
#define ENABLE_SPI2
|
||||||
|
|
||||||
|
// SPI Flash
|
||||||
|
#define HAS_SPI_FLASH 1
|
||||||
|
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
||||||
|
|
||||||
|
#if HAS_SPI_FLASH
|
||||||
|
// SPI 2
|
||||||
|
#define W25QXX_CS_PIN PB12 // SPI2_NSS / Flash chip-select
|
||||||
|
#define W25QXX_MOSI_PIN PB15
|
||||||
|
#define W25QXX_MISO_PIN PB14
|
||||||
|
#define W25QXX_SCK_PIN PB13
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//
|
||||||
|
// Servos
|
||||||
|
//
|
||||||
|
//#define SERVO0_PIN PA8 // use IO0 to enable BLTOUCH support/remove Mks_Wifi
|
||||||
|
|
||||||
//
|
//
|
||||||
// Limit Switches
|
// Limit Switches
|
||||||
//
|
//
|
||||||
#define X_STOP_PIN PA15 ///-X
|
#define X_STOP_PIN PA15 // -X
|
||||||
#define Y_STOP_PIN PA12 ///-Y
|
#define Y_STOP_PIN PA12 // -Y
|
||||||
#define Z_MIN_PIN PA11 ///-Z
|
#define Z_MIN_PIN PA11 // -Z
|
||||||
#define Z_MAX_PIN PC4 ///+Z
|
#define Z_MAX_PIN PC4 // +Z
|
||||||
|
|
||||||
|
#ifndef FIL_RUNOUT_PIN
|
||||||
|
#define FIL_RUNOUT_PIN MT_DET_1_PIN
|
||||||
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// Steppers
|
// Steppers
|
||||||
//
|
//
|
||||||
#define X_ENABLE_PIN PE4 //X_EN
|
#define X_ENABLE_PIN PE4 // X_EN
|
||||||
#define X_STEP_PIN PE3 //X_STEP
|
#define X_STEP_PIN PE3 // X_STEP
|
||||||
#define X_DIR_PIN PE2 //X_DIR
|
#define X_DIR_PIN PE2 // X_DIR
|
||||||
|
|
||||||
#define Y_ENABLE_PIN PE1 //Y_EN
|
#define Y_ENABLE_PIN PE1 // Y_EN
|
||||||
#define Y_STEP_PIN PE0 //Y_STEP
|
#define Y_STEP_PIN PE0 // Y_STEP
|
||||||
#define Y_DIR_PIN PB9 //Y_DIR
|
#define Y_DIR_PIN PB9 // Y_DIR
|
||||||
|
|
||||||
#define Z_ENABLE_PIN PB8 //Z_EN
|
#define Z_ENABLE_PIN PB8 // Z_EN
|
||||||
#define Z_STEP_PIN PB5 //Z_STEP
|
#define Z_STEP_PIN PB5 // Z_STEP
|
||||||
#define Z_DIR_PIN PB4 //Z_DIR
|
#define Z_DIR_PIN PB4 // Z_DIR
|
||||||
|
|
||||||
#define E0_ENABLE_PIN PB3 //E0_EN
|
#define E0_ENABLE_PIN PB3 // E0_EN
|
||||||
#define E0_STEP_PIN PD6 //E0_STEP
|
#define E0_STEP_PIN PD6 // E0_STEP
|
||||||
#define E0_DIR_PIN PD3 //E0_DIR
|
#define E0_DIR_PIN PD3 // E0_DIR
|
||||||
|
|
||||||
//
|
//
|
||||||
// Drivers
|
// Drivers
|
||||||
//
|
//
|
||||||
#if HAS_TMC220x
|
#if HAS_TMC220x
|
||||||
|
|
||||||
#if ENABLED(HARDWARE_SERIAL) /* TMC2209 */
|
|
||||||
#define X_SLAVE_ADDRESS 3 // | | :
|
|
||||||
#define Y_SLAVE_ADDRESS 2 // : | :
|
|
||||||
#define Z_SLAVE_ADDRESS 1 // | : :
|
|
||||||
//#define E0_SLAVE_ADDRESS 0 // : : :
|
|
||||||
|
|
||||||
#define X_SERIAL_TX_PIN PA9 //TXD1
|
#if ENABLED(HARDWARE_SERIAL) /* TMC2209 */
|
||||||
#define X_SERIAL_RX_PIN PA9 //TXD1
|
#define X_SLAVE_ADDRESS 3 // | | :
|
||||||
|
#define Y_SLAVE_ADDRESS 2 // : | :
|
||||||
|
#define Z_SLAVE_ADDRESS 1 // | : :
|
||||||
|
//#define E0_SLAVE_ADDRESS 0 // : : :
|
||||||
|
|
||||||
#define Y_SERIAL_TX_PIN PA9 //TXD1
|
#define X_SERIAL_TX_PIN PA9 // TXD1
|
||||||
#define Y_SERIAL_RX_PIN PA9 //TXD1
|
#define X_SERIAL_RX_PIN PA9 // TXD1
|
||||||
|
|
||||||
#define Z_SERIAL_TX_PIN PA9 //TXD1
|
#define Y_SERIAL_TX_PIN PA9 // TXD1
|
||||||
#define Z_SERIAL_RX_PIN PA9 //TXD1
|
#define Y_SERIAL_RX_PIN PA9 // TXD1
|
||||||
|
|
||||||
/*
|
#define Z_SERIAL_TX_PIN PA9 // TXD1
|
||||||
* TMC2208 stepper UART-configurable by PDN_UART pin
|
#define Z_SERIAL_RX_PIN PA9 // TXD1
|
||||||
* Software serial
|
|
||||||
*/
|
|
||||||
|
|
||||||
#elif ENABLED(SOFTWARE_SERIAL) /* TMC220x */
|
#elif ENABLED(SOFTWARE_SERIAL) /* TMC220x */
|
||||||
#define X_SLAVE_ADDRESS 0
|
/**
|
||||||
#define Y_SLAVE_ADDRESS 0
|
* TMC2208 stepper UART-configurable by PDN_UART pin
|
||||||
#define Z_SLAVE_ADDRESS 0
|
* Software serial
|
||||||
|
*/
|
||||||
|
#define X_SLAVE_ADDRESS 0
|
||||||
|
#define Y_SLAVE_ADDRESS 0
|
||||||
|
#define Z_SLAVE_ADDRESS 0
|
||||||
|
|
||||||
#define X_SERIAL_TX_PIN PA10 //RXD1
|
#define X_SERIAL_TX_PIN PA10 // RXD1
|
||||||
#define X_SERIAL_RX_PIN PA10 //RXD1
|
#define X_SERIAL_RX_PIN PA10 // RXD1
|
||||||
|
|
||||||
#define Y_SERIAL_TX_PIN PA9 //TXD1
|
#define Y_SERIAL_TX_PIN PA9 // TXD1
|
||||||
#define Y_SERIAL_RX_PIN PA9 //TXD1
|
#define Y_SERIAL_RX_PIN PA9 // TXD1
|
||||||
|
|
||||||
#define Z_SERIAL_TX_PIN PC7 //IO1
|
#define Z_SERIAL_TX_PIN PC7 // IO1
|
||||||
#define Z_SERIAL_RX_PIN PC7 //IO1
|
#define Z_SERIAL_RX_PIN PC7 // IO1
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// Reduce baud rate to improve software serial reliability
|
// Reduce baud rate to improve software serial reliability
|
||||||
#define TMC_BAUD_RATE 19200
|
#define TMC_BAUD_RATE 19200
|
||||||
#else
|
#else
|
||||||
|
|
||||||
// Motor current PWM pins
|
// Motor current PWM pins
|
||||||
#define MOTOR_CURRENT_PWM_XY_PIN PA6 //VREF2/3 CONTROL XY
|
#define MOTOR_CURRENT_PWM_XY_PIN PA6 // VREF2/3 CONTROL XY
|
||||||
#define MOTOR_CURRENT_PWM_Z_PIN PA7 //VREF4 CONTROL Z
|
#define MOTOR_CURRENT_PWM_Z_PIN PA7 // VREF4 CONTROL Z
|
||||||
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
|
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
|
||||||
#ifndef DEFAULT_PWM_MOTOR_CURRENT
|
#ifndef DEFAULT_PWM_MOTOR_CURRENT
|
||||||
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
|
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* src: MKS Robin_Mini V2
|
* src: MKS Robin_Mini V2
|
||||||
* __ESP(M1)__ -J1-
|
* __ESP(M1)__ -J1-
|
||||||
* GND| 15 | | 08 |+3v3 (22)=>RXD1(PA10) //
|
* GND| 15 | | 08 |+3v3 (22)=>RXD1(PA10) //
|
||||||
* | 16 | | 07 |MOSI (21)=>TXD1(PA9) // active low, probably OK to leave floating
|
* | 16 | | 07 |MOSI (21)=>TXD1(PA9) // active low, probably OK to leave floating
|
||||||
* IO2| 17 | | 06 |MISO (19)=>IO1(PC7) // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
|
* IO2| 17 | | 06 |MISO (19)=>IO1(PC7) // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
|
||||||
* IO0| 18 | | 05 |CLK (18)=>IO0(PA8) // must be high (ESP3D software configures this with a pullup so OK to leave as floating)
|
* IO0| 18 | | 05 |CLK (18)=>IO0(PA8) // must be high (ESP3D software configures this with a pullup so OK to leave as floating)
|
||||||
* IO1| 19 | | 03 |EN (03)=>WIFI_EN() // Must be high for module to run
|
* IO1| 19 | | 03 |EN (03)=>WIFI_EN() // Must be high for module to run
|
||||||
* | nc | | nc | (01)=>WIFI_CTRL(PA5)
|
* | nc | | nc | (01)=>WIFI_CTRL(PA5)
|
||||||
* RX| 21 | | nc |
|
* RX| 21 | | nc |
|
||||||
* TX| 22 | | 01 |RST
|
* TX| 22 | | 01 |RST
|
||||||
* ￣￣ AE￣￣
|
* ￣￣ AE￣￣
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#ifdef ESP_WIFI
|
#ifdef ESP_WIFI
|
||||||
#define WIFI_IO0_PIN PA8 // PC13 MKS ESP WIFI IO0 PIN
|
#define WIFI_IO0_PIN PA8 // PC13 MKS ESP WIFI IO0 PIN
|
||||||
#define WIFI_IO1_PIN PC7 // MKS ESP WIFI IO1 PIN
|
#define WIFI_IO1_PIN PC7 // MKS ESP WIFI IO1 PIN
|
||||||
#define WIFI_RESET_PIN PA5 // MKS ESP WIFI RESET PIN
|
#define WIFI_RESET_PIN PA5 // MKS ESP WIFI RESET PIN
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
///=================EXTRUDER=======================//
|
// EXTRUDER
|
||||||
//
|
//
|
||||||
#if AXIS_DRIVER_TYPE(E0,TMC2208)||AXIS_DRIVER_TYPE(E0,TMC2209)
|
#if AXIS_DRIVER_TYPE(E0,TMC2208)||AXIS_DRIVER_TYPE(E0,TMC2209)
|
||||||
#define E0_SLAVE_ADDRESS 0
|
#define E0_SLAVE_ADDRESS 0
|
||||||
|
|
||||||
#define E0_SERIAL_TX_PIN PA8 //IO0
|
#define E0_SERIAL_TX_PIN PA8 // IO0
|
||||||
#define E0_SERIAL_RX_PIN PA8 //IO0
|
#define E0_SERIAL_RX_PIN PA8 // IO0
|
||||||
#define TMC_BAUD_RATE 19200
|
#define TMC_BAUD_RATE 19200
|
||||||
#else
|
#else
|
||||||
// Motor current PWM pins
|
// Motor current PWM pins
|
||||||
#define MOTOR_CURRENT_PWM_E_PIN PB0 // VREF1 CONTROL E
|
#define MOTOR_CURRENT_PWM_E_PIN PB0 // VREF1 CONTROL E
|
||||||
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
|
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
|
||||||
#ifndef DEFAULT_PWM_MOTOR_CURRENT
|
#ifndef DEFAULT_PWM_MOTOR_CURRENT
|
||||||
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
|
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Temperature Sensors(THM)
|
// Temperature Sensors(THM)
|
||||||
//
|
//
|
||||||
|
|
@ -184,61 +209,53 @@
|
||||||
#define HEATER_BED_PIN PA0 // HEATER_BED-WKUP
|
#define HEATER_BED_PIN PA0 // HEATER_BED-WKUP
|
||||||
|
|
||||||
#define FAN_PIN PB1 // E_FAN
|
#define FAN_PIN PB1 // E_FAN
|
||||||
//#define CONTROLLER_FAN_PIN PD6 // BOARD FAN
|
//#define CONTROLLER_FAN_PIN PD6 // BOARD FAN
|
||||||
|
|
||||||
//
|
//
|
||||||
// Misc. Functions
|
// Misc. Functions
|
||||||
//
|
//
|
||||||
//#define POWER_LOSS_PIN PA1 // PW_SO
|
//#define POWER_LOSS_PIN PA1 // PW_SO
|
||||||
#ifdef BACKUP_POWER_SUPPLY
|
#if ENABLED(BACKUP_POWER_SUPPLY)
|
||||||
#define POWER_LOSS_PIN PA2 // PW_DET (UPS) MKSPWC
|
#define POWER_LOSS_PIN PA2 // PW_DET (UPS) MKSPWC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Enable Power Supply Control
|
|
||||||
#ifdef PSU_CONTROL
|
|
||||||
#define KILL_PIN PA2 // PW_DET
|
|
||||||
#define KILL_PIN_INVERTING true //
|
|
||||||
//#define PS_ON_PIN PA3 // PW_CN /PW_OFF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MT_DET_1_PIN PA4 // MT_DET
|
|
||||||
#define MT_DET_2_PIN PE6 // FALA_CRTL
|
|
||||||
#define MT_DET_PIN_INVERTING false
|
|
||||||
|
|
||||||
#ifndef FIL_RUNOUT_PIN
|
|
||||||
#define FIL_RUNOUT_PIN MT_DET_1_PIN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#define SERVO0_PIN PA8 // use IO0 to enable BLTOUCH support/remove Mks_Wifi
|
|
||||||
|
|
||||||
//
|
//
|
||||||
|
// Power Supply Control
|
||||||
|
//
|
||||||
|
#if ENABLED(PSU_CONTROL)
|
||||||
|
#define KILL_PIN PA2 // PW_DET
|
||||||
|
#define KILL_PIN_INVERTING true //
|
||||||
|
//#define PS_ON_PIN PA3 // PW_CN /PW_OFF
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define MT_DET_1_PIN PA4 // MT_DET
|
||||||
|
#define MT_DET_2_PIN PE6 // FALA_CRTL
|
||||||
|
#define MT_DET_PIN_INVERTING false
|
||||||
|
|
||||||
//
|
//
|
||||||
// LED / NEOPixel
|
// LED / NEOPixel
|
||||||
//
|
//
|
||||||
//
|
//#define LED_PIN PB2 // BOOT1
|
||||||
//#define LED_PIN PB2 //BOOT1
|
|
||||||
|
|
||||||
|
#if ENABLED(NEOPIXEL_LED)
|
||||||
#ifdef NEOPIXEL_LED
|
#define LED_PWM PA8
|
||||||
#define LED_PWM PA8
|
|
||||||
#ifndef NEOPIXEL_PIN
|
#ifndef NEOPIXEL_PIN
|
||||||
#define NEOPIXEL_PIN PA8 // USED WIFI IO0/IO1/TX/RX PIN
|
#define NEOPIXEL_PIN LED_PWM // USED WIFI IO0/IO1/TX/RX PIN
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Others test.
|
//Others test.
|
||||||
//#define SERVO0_PIN PA5 //WIFI CRTL
|
//#define SERVO0_PIN PA5 // WIFI CRTL
|
||||||
//#define GPIO_CLEAR PA8 //IO0
|
//#define GPIO_CLEAR PA8 // IO0
|
||||||
//#define GPIO_SET PA5
|
//#define GPIO_SET PA5
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// SD Card
|
// SD Card
|
||||||
//
|
//
|
||||||
#define SDIO_SUPPORT
|
#define SDIO_SUPPORT
|
||||||
#define SDIO_CLOCK 4500000 // 4.5 MHz /* 18 MHz (18000000) or 4.5MHz (450000) */
|
#define SDIO_CLOCK 4500000 // 4.5 MHz /* 18 MHz (18000000) or 4.5MHz (450000) */
|
||||||
//#define SDIO_CLOCK 18000000 // 18 MHz (18000000)
|
//#define SDIO_CLOCK 18000000 // 18 MHz (18000000)
|
||||||
#ifdef SDIO_SUPPORT
|
#if ENABLED(SDIO_SUPPORT)
|
||||||
#define SCK_PIN PB13 // SPI2
|
#define SCK_PIN PB13 // SPI2
|
||||||
#define MISO_PIN PB14 // SPI2
|
#define MISO_PIN PB14 // SPI2
|
||||||
#define MOSI_PIN PB15 // SPI2
|
#define MOSI_PIN PB15 // SPI2
|
||||||
|
|
@ -263,32 +280,32 @@
|
||||||
*
|
*
|
||||||
* Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
|
* Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
|
||||||
* because Marlin uses the reset as a failsafe to revive a glitchy LCD.
|
* because Marlin uses the reset as a failsafe to revive a glitchy LCD.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* MKS Robin TFT v2.0 with ILI9341 */
|
// MKS Robin TFT v2.0 with ILI9341
|
||||||
// Read display identification information (0xD3 on ILI9341)
|
// Read display identification information (0xD3 on ILI9341)
|
||||||
//#define XPT2046_X_CALIBRATION 12013
|
//#define XPT2046_X_CALIBRATION 12013
|
||||||
//#define XPT2046_Y_CALIBRATION -8711
|
//#define XPT2046_Y_CALIBRATION -8711
|
||||||
//#define XPT2046_X_OFFSET -32
|
//#define XPT2046_X_OFFSET -32
|
||||||
//#define XPT2046_Y_OFFSET 256
|
//#define XPT2046_Y_OFFSET 256
|
||||||
|
|
||||||
/* MKS Robin TFT v1.1 with ILI9328 */
|
// MKS Robin TFT v1.1 with ILI9328
|
||||||
//#define XPT2046_X_CALIBRATION -11792
|
//#define XPT2046_X_CALIBRATION -11792
|
||||||
//#define XPT2046_Y_CALIBRATION 8947
|
//#define XPT2046_Y_CALIBRATION 8947
|
||||||
//#define XPT2046_X_OFFSET 342
|
//#define XPT2046_X_OFFSET 342
|
||||||
//#define XPT2046_Y_OFFSET -19
|
//#define XPT2046_Y_OFFSET -19
|
||||||
|
|
||||||
|
// MKS Robin TFT v1.1 with R61505
|
||||||
|
//#define XPT2046_X_CALIBRATION 12489
|
||||||
|
//#define XPT2046_Y_CALIBRATION 9210
|
||||||
|
//#define XPT2046_X_OFFSET -52
|
||||||
|
//#define XPT2046_Y_OFFSET -17
|
||||||
|
|
||||||
|
// QQS-Pro uses MKS Robin TFT v2.0
|
||||||
|
|
||||||
/* MKS Robin TFT v1.1 with R61505 */
|
|
||||||
//#define XPT2046_X_CALIBRATION 12489
|
|
||||||
//#define XPT2046_Y_CALIBRATION 9210
|
|
||||||
//#define XPT2046_X_OFFSET -52
|
|
||||||
//#define XPT2046_Y_OFFSET -17
|
|
||||||
|
|
||||||
/* QQS-Pro use MKS Robin TFT v2.0 */
|
|
||||||
//+++++++++++++++++++++++//
|
|
||||||
// Shared FSMC Configs
|
// Shared FSMC Configs
|
||||||
#if HAS_FSMC_TFT
|
#if HAS_FSMC_TFT
|
||||||
#define DOGLCD_MOSI -1 // prevent redefine Conditionals_post.h
|
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
|
||||||
#define DOGLCD_SCK -1
|
#define DOGLCD_SCK -1
|
||||||
|
|
||||||
#define FSMC_CS_PIN PD7 // NE4
|
#define FSMC_CS_PIN PD7 // NE4
|
||||||
|
|
@ -303,7 +320,6 @@
|
||||||
|
|
||||||
#define TOUCH_BUTTONS_HW_SPI
|
#define TOUCH_BUTTONS_HW_SPI
|
||||||
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
|
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// XPT2046 Touch Screen calibration
|
// XPT2046 Touch Screen calibration
|
||||||
|
|
@ -311,7 +327,7 @@
|
||||||
#define TFT_BUFFER_SIZE 14400
|
#define TFT_BUFFER_SIZE 14400
|
||||||
|
|
||||||
#ifndef XPT2046_X_CALIBRATION
|
#ifndef XPT2046_X_CALIBRATION
|
||||||
#define XPT2046_X_CALIBRATION 12218
|
#define XPT2046_X_CALIBRATION 12218
|
||||||
#endif
|
#endif
|
||||||
#ifndef XPT2046_Y_CALIBRATION
|
#ifndef XPT2046_Y_CALIBRATION
|
||||||
#define XPT2046_Y_CALIBRATION -8814
|
#define XPT2046_Y_CALIBRATION -8814
|
||||||
|
|
@ -336,32 +352,15 @@
|
||||||
#ifndef XPT2046_Y_OFFSET
|
#ifndef XPT2046_Y_OFFSET
|
||||||
#define XPT2046_Y_OFFSET 256
|
#define XPT2046_Y_OFFSET 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TFT_MARLINUI_COLOR 0xFFFF // White
|
|
||||||
#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
|
|
||||||
#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
|
|
||||||
|
|
||||||
|
#define TFT_MARLINUI_COLOR 0xFFFF // White
|
||||||
|
#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
|
||||||
|
#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if NEED_TOUCH_PINS
|
#if NEED_TOUCH_PINS
|
||||||
#define TOUCH_CS_PIN PC2 // SPI2_NSS
|
#define TOUCH_CS_PIN PC2 // SPI2_NSS
|
||||||
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
|
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
|
||||||
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
|
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
|
||||||
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
|
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
|
||||||
#endif
|
|
||||||
|
|
||||||
// SPI
|
|
||||||
// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
|
|
||||||
//
|
|
||||||
#define ENABLE_SPI2
|
|
||||||
// SPI Flash
|
|
||||||
#define HAS_SPI_FLASH 1
|
|
||||||
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
|
||||||
|
|
||||||
#if HAS_SPI_FLASH
|
|
||||||
// SPI 2
|
|
||||||
#define W25QXX_CS_PIN PB12 //SPI2_NSS / Flash chip-select
|
|
||||||
#define W25QXX_MOSI_PIN PB15
|
|
||||||
#define W25QXX_MISO_PIN PB14
|
|
||||||
#define W25QXX_SCK_PIN PB13
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -1137,19 +1137,17 @@ monitor_speed = 115200
|
||||||
# FLSUN QQ (STM32F103VET6)
|
# FLSUN QQ (STM32F103VET6)
|
||||||
#
|
#
|
||||||
[env:flsun_hispeed]
|
[env:flsun_hispeed]
|
||||||
platform = ${common_stm32f1.platform}
|
platform = ${common_stm32f1.platform}
|
||||||
extends = common_stm32f1
|
extends = common_stm32f1
|
||||||
board = genericSTM32F103VE
|
board = genericSTM32F103VE
|
||||||
platform_packages = tool-stm32duino
|
platform_packages = tool-stm32duino
|
||||||
extra_scripts = ${common.extra_scripts}
|
extra_scripts = ${common.extra_scripts}
|
||||||
buildroot/share/PlatformIO/scripts/mks_robin_mini.py
|
buildroot/share/PlatformIO/scripts/mks_robin_mini.py
|
||||||
buildroot/share/PlatformIO/scripts/add_nanolib.py
|
buildroot/share/PlatformIO/scripts/add_nanolib.py
|
||||||
build_flags = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
|
build_flags = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
|
||||||
lib_deps =
|
lib_deps = SoftwareSerialM
|
||||||
SoftwareSerialM
|
|
||||||
#Adafruit NeoPixel=https://github.com/Foxies-CSTL/Robin-NeoPixel-Lib/archive/master.zip
|
#Adafruit NeoPixel=https://github.com/Foxies-CSTL/Robin-NeoPixel-Lib/archive/master.zip
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F401VE
|
# STM32F401VE
|
||||||
# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
|
# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue