Skip to content

Commit

Permalink
✨ Chitu3D V9 board (MarlinFirmware#22401)
Browse files Browse the repository at this point in the history 
Co-authored-by: Scott Lahteine <[email protected]>
  • Loading branch information
@VTXtruder @thinkyhead @ptoal
2 people authored and ptoal committed Dec 16, 2021
1 parent 02dffc8 commit 238229f
Show file tree
Hide file tree
Showing 7 changed files with 234 additions and 309 deletions.
25 changes: 13 additions & 12 deletions Marlin/src/core/boards.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,18 +333,19 @@
#define BOARD_CCROBOT_MEEB_3DP 4035 // ccrobot-online.com MEEB_3DP (STM32F103RC)
#define BOARD_CHITU3D_V5 4036 // Chitu3D TronXY X5SA V5 Board
#define BOARD_CHITU3D_V6 4037 // Chitu3D TronXY X5SA V6 Board
#define BOARD_CREALITY_V4 4038 // Creality v4.x (STM32F103RE)
#define BOARD_CREALITY_V427 4039 // Creality v4.2.7 (STM32F103RE)
#define BOARD_CREALITY_V4210 4040 // Creality v4.2.10 (STM32F103RE) as found in the CR-30
#define BOARD_CREALITY_V431 4041 // Creality v4.3.1 (STM32F103RE)
#define BOARD_CREALITY_V452 4042 // Creality v4.5.2 (STM32F103RE)
#define BOARD_CREALITY_V453 4043 // Creality v4.5.3 (STM32F103RE)
#define BOARD_TRIGORILLA_PRO 4044 // Trigorilla Pro (STM32F103ZET6)
#define BOARD_FLY_MINI 4045 // FLYmaker FLY MINI (STM32F103RCT6)
#define BOARD_FLSUN_HISPEED 4046 // FLSUN HiSpeedV1 (STM32F103VET6)
#define BOARD_BEAST 4047 // STM32F103RET6 Libmaple-based controller
#define BOARD_MINGDA_MPX_ARM_MINI 4048 // STM32F103ZET6 Mingda MD-16
#define BOARD_GTM32_PRO_VD 4049 // STM32F103VET6 controller
#define BOARD_CHITU3D_V9 4038 // Chitu3D TronXY X5SA V9 Board
#define BOARD_CREALITY_V4 4039 // Creality v4.x (STM32F103RE)
#define BOARD_CREALITY_V427 4040 // Creality v4.2.7 (STM32F103RE)
#define BOARD_CREALITY_V4210 4041 // Creality v4.2.10 (STM32F103RE) as found in the CR-30
#define BOARD_CREALITY_V431 4042 // Creality v4.3.1 (STM32F103RE)
#define BOARD_CREALITY_V452 4043 // Creality v4.5.2 (STM32F103RE)
#define BOARD_CREALITY_V453 4044 // Creality v4.5.3 (STM32F103RE)
#define BOARD_TRIGORILLA_PRO 4045 // Trigorilla Pro (STM32F103ZET6)
#define BOARD_FLY_MINI 4046 // FLYmaker FLY MINI (STM32F103RCT6)
#define BOARD_FLSUN_HISPEED 4047 // FLSUN HiSpeedV1 (STM32F103VET6)
#define BOARD_BEAST 4048 // STM32F103RET6 Libmaple-based controller
#define BOARD_MINGDA_MPX_ARM_MINI 4049 // STM32F103ZET6 Mingda MD-16
#define BOARD_GTM32_PRO_VD 4050 // STM32F103VET6 controller

//
// ARM Cortex-M4F
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/pins/pins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,8 @@
#include "stm32f1/pins_CHITU3D_V5.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
#elif MB(CHITU3D_V6)
#include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple
#elif MB(CHITU3D_V9)
#include "stm32f1/pins_CHITU3D_V9.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple
#elif MB(CREALITY_V4)
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
#elif MB(CREALITY_V4210)
Expand Down
7 changes: 1 addition & 6 deletions Marlin/src/pins/stm32f1/pins_CHITU3D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,7 @@
// Heaters / Fans
//
#define HEATER_0_PIN PD12 // HOT-END
#define HEATER_1_PIN -1
#define HEATER_2_PIN -1

#define HEATER_BED_PIN PG11 // HOT-BED
#define HEATER_BED2_PIN -1 // BED2
#define HEATER_BED3_PIN -1 // BED3

#ifndef FAN_PIN
#define FAN_PIN PG14 // MAIN BOARD FAN
Expand All @@ -97,8 +92,8 @@
//
// Temperature Sensors
//
#define TEMP_BED_PIN PA0 // Analog Input
#define TEMP_0_PIN PA1 // Analog Input
#define TEMP_BED_PIN PA0 // Analog Input

//
// LCD Pins
Expand Down
146 changes: 3 additions & 143 deletions Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,148 +21,8 @@
*/
#pragma once

#include "env_validate.h"
#define BOARD_INFO_NAME "Chitu3D V5"

/**
* 2017 Victor Perez Marlin for stm32f1 test
*/

#define BOARD_INFO_NAME "Chitu3D V5"
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"

#define BOARD_NO_NATIVE_USB

#define DISABLE_JTAG

//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
#if ENABLED(FLASH_EEPROM_EMULATION)
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
#else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#endif

//
// Limit Switches
//
#define X_STOP_PIN PG10
#define Y_STOP_PIN PA12
#define Z_STOP_PIN PA14

//
// Steppers
//
#define X_ENABLE_PIN PC13
#define X_STEP_PIN PE5
#define X_DIR_PIN PE6

#define Y_ENABLE_PIN PE4
#define Y_STEP_PIN PE2
#define Y_DIR_PIN PE3

#define Z_ENABLE_PIN PE1
#define Z_STEP_PIN PB9
#define Z_DIR_PIN PE0

#define E0_ENABLE_PIN PB8
#define E0_STEP_PIN PB4
#define E0_DIR_PIN PB5

#define E1_ENABLE_PIN PG8
#define E1_STEP_PIN PC7
#define E1_DIR_PIN PC6

//
// Temperature Sensors
//
#define TEMP_0_PIN PA1 // TH1
#define TEMP_BED_PIN PA0 // TB1

//
// Heaters
//
#define HEATER_0_PIN PG12 // HEATER1
#define HEATER_BED_PIN PG11 // HOT BED

//
// Fans
//
#define CONTROLLER_FAN_PIN PD6 // BOARD FAN
#define FAN_PIN PG13 // FAN
#define FAN2_PIN PG14

//
// Misc
//
#define BEEPER_PIN PB0
//#define LED_PIN -1
//#define POWER_LOSS_PIN -1
#define FIL_RUNOUT_PIN PA15

// SPI Flash
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH_SIZE 0x200000 // 2MB
#endif

// SPI 2
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PB15
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13

//
// TFT with FSMC interface
//
#if HAS_FSMC_TFT
#define TOUCH_CS_PIN PB7 // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK
#define TOUCH_MISO_PIN PA6 // SPI1_MISO
#define TOUCH_MOSI_PIN PA7 // SPI1_MOSI

#define TFT_RESET_PIN PF11
#define TFT_BACKLIGHT_PIN PD13

#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_CS_PIN PD7
#define FSMC_RS_PIN PD11
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5

#define TFT_CS_PIN FSMC_CS_PIN
#define TFT_RS_PIN FSMC_RS_PIN
#endif

#if ENABLED(TFT_LVGL_UI)
// LVGL
#define HAS_SPI_FLASH_FONT 1
#define HAS_GCODE_PREVIEW 1
#define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define HAS_LANG_SELECT_SCREEN 1
#define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0
#elif ENABLED(TFT_COLOR_UI)
// Color UI
#define TFT_BUFFER_SIZE 14400
#endif

// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
// Needs to use SPI2
#define SPI_DEVICE 2
#define SD_SCK_PIN PB13
#define SD_MISO_PIN PB14
#define SD_MOSI_PIN PB15
#define SD_SS_PIN PB12
#define Z_STOP_PIN PG9

//
// SD Card
//
#define SDIO_SUPPORT
#define SD_DETECT_PIN -1 // PF0, but it isn't connected
#define SDIO_CLOCK 4500000
#define SDIO_READ_RETRIES 16
#include "pins_CHITU3D_common.h"
150 changes: 2 additions & 148 deletions Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,160 +21,14 @@
*/
#pragma once

#include "env_validate.h"

/**
* 2017 Victor Perez Marlin for stm32f1 test
*/

#define BOARD_INFO_NAME "Chitu3D"
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"

#define BOARD_NO_NATIVE_USB

#define DISABLE_JTAG

//
// EEPROM
//

#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#endif

#if ENABLED(FLASH_EEPROM_EMULATION)
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
#define EEPROM_PAGE_SIZE (0x800U) // 2KB, but will use 2x more (4KB)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
#else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#endif

//
// Limit Switches
//
#define X_STOP_PIN PG10
#define Y_STOP_PIN PA12
#define Z_STOP_PIN PG9

//
// Steppers
//
#define X_ENABLE_PIN PC13
#define X_STEP_PIN PE5
#define X_DIR_PIN PE6

#define Y_ENABLE_PIN PE4
#define Y_STEP_PIN PE2
#define Y_DIR_PIN PE3

#define Z_ENABLE_PIN PE1
#define Z_STEP_PIN PB9
#define Z_DIR_PIN PE0
#define BOARD_INFO_NAME "Chitu3D V6"

#define Z2_ENABLE_PIN PF3
#define Z2_STEP_PIN PF5
#define Z2_DIR_PIN PF1

#define E0_ENABLE_PIN PB8
#define E0_STEP_PIN PB4
#define E0_DIR_PIN PB5

#define E1_ENABLE_PIN PG8
#define E1_STEP_PIN PC7
#define E1_DIR_PIN PC6

//
// Temperature Sensors
//
#define TEMP_0_PIN PA1 // TH1
#define TEMP_BED_PIN PA0 // TB1

//
// Heaters
//
#define HEATER_0_PIN PG12 // HEATER1
#define HEATER_BED_PIN PG11 // HOT BED
//#define HEATER_BED_INVERTING true

//
// Fans
//
#define CONTROLLER_FAN_PIN PD6 // BOARD FAN
#define FAN_PIN PG13 // FAN
#define FAN2_PIN PG14

//
// Misc
//
#define BEEPER_PIN PB0
//#define LED_PIN PD3
//#define POWER_LOSS_PIN PG2 // PG4 PW_DET

#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN PA15 // MT_DET
#endif
#ifndef FIL_RUNOUT2_PIN
#define FIL_RUNOUT2_PIN PF13
#endif

// SPI Flash
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH_SIZE 0x200000 // 2MB
#endif

// SPI 2
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PB15
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13

//
// TFT with FSMC interface
//
#if HAS_FSMC_TFT
#define TOUCH_CS_PIN PB7 // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK
#define TOUCH_MISO_PIN PA6 // SPI1_MISO
#define TOUCH_MOSI_PIN PA7 // SPI1_MOSI

#define TFT_RESET_PIN PF11
#define TFT_BACKLIGHT_PIN PD13

#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_CS_PIN PD7
#define FSMC_RS_PIN PD11
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
#endif

#if ENABLED(TFT_LVGL_UI)
// LVGL
#define HAS_SPI_FLASH_FONT 1
#define HAS_GCODE_PREVIEW 1
#define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define HAS_LANG_SELECT_SCREEN 1
#define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0
#elif ENABLED(TFT_COLOR_UI)
// Color UI
#define TFT_BUFFER_SIZE 14400
#endif

// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
// so SPI2 is required.
#define SPI_DEVICE 2
#define SD_SCK_PIN PB13
#define SD_MISO_PIN PB14
#define SD_MOSI_PIN PB15
#define SD_SS_PIN PB12

//
// SD Card
//
#define SDIO_SUPPORT
#define SD_DETECT_PIN -1 // PF0, but it isn't connected
#define SDIO_CLOCK 4500000
#define SDIO_READ_RETRIES 16
#include "pins_CHITU3D_common.h"
Loading

0 comments on commit 238229f

Please sign in to comment.