3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplication and add J2 connector

Browse source 
Reformatage differents parts:
-TMC2209 Serial one wire
-XPT20046 Touch Screen
-SdCard and card socket
This commit is contained in:
Foxies 2020-11-11 18:52:08 +01:00
parent 85ed5d3e42
commit d70922febb
1 changed files with 36 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
View file

@ -130,9 +130,10 @@
/** /**
* HardwareSerial with one pin for four drivers. * HardwareSerial with one pin for four drivers.
* Compatible with TMC2209. Provides best performance. * The 4xTMC2209 module doesn't have a serial multiplexer and
* Requires SLAVE_ADDRESS definitions in Configuration_adv.h and proper * needs to set *_SLAVE_ADDRESS in Configuration_adv.h for X,Y,Z,E0
* jumper configuration. Uses only one I/O pin like PA10/PA9/PC7/PA8. * and proper jumper configuration.
* Uses only one I/O pin like PA10/PA9/PC7/PA8.
* Install the jumpers in the following way, for example: * Install the jumpers in the following way, for example:
*/ */
//#define X_SLAVE_ADDRESS 3 // * * . JP0, JP1 //#define X_SLAVE_ADDRESS 3 // * * . JP0, JP1
@ -150,7 +151,7 @@
#endif #endif
/** /**
* MKS Robin_Mini V2 * MKS Robin_Wifi or another ESP8266 module
* *
* __ESP(M1)__ -J1- * __ESP(M1)__ -J1-
* GND| 15 | | 08 |+3v3 (22) RXD1 (PA10) * GND| 15 | | 08 |+3v3 (22) RXD1 (PA10)
@ -210,6 +211,19 @@
#define POWER_LOSS_PIN PA2 // PW_DET (UPS) MKSPWC #define POWER_LOSS_PIN PA2 // PW_DET (UPS) MKSPWC
#endif #endif
//
//
/** Connector J2
* -------
* DIO O|1 2|O 3v3
* CSK O|3 5|O GND
* RST O|5 6|O GND
* -------
* /
//SW_DIO PA13 //
//SW_CLK PA14 //
//SW_RST NRST //(14)
// //
// Power Supply Control // Power Supply Control
// //
@ -238,15 +252,23 @@
// //
// SD Card // SD Card
// //
#define SDIO_SUPPORT #define SDIO_CLOCK 4500000 // 4.5 MHz
#define SDIO_CLOCK 4500000 // 4.5 MHz /* 18 MHz (18000000) or 4.5MHz (450000) */ #define SDIO_READ_RETRIES 16
//#define SDIO_CLOCK 18000000 // 18 MHz (18000000)
#if ENABLED(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
#define SS_PIN PC2 // SPI2 #define SD_DETECT_PIN -1 // SD_CD (-1 active refresh)
#define SD_DETECT_PIN -1 // SD_CD #define SS_PIN PC2
#else // Use the on-board card socket labeled SD_Extender
#define SCK_PIN PC12
#define MISO_PIN PC8
#define MOSI_PIN PD2
#define SS_PIN -1
#define ONBOARD_SD_CS_PIN PC11
#define SDSS PD2
#define SD_DETECT_PIN PD12 // SD_CD (if -1 no detection)
#endif #endif
// //
@ -295,7 +317,7 @@
#endif #endif
// XPT2046 Touch Screen calibration // XPT2046 Touch Screen calibration
#if EITHER(TFT_LVGL_UI_FSMC, TFT_COLOR_UI) #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
#define TFT_BUFFER_SIZE 14400 #define TFT_BUFFER_SIZE 14400
#ifndef XPT2046_X_CALIBRATION #ifndef XPT2046_X_CALIBRATION
@ -311,23 +333,11 @@
#define XPT2046_Y_OFFSET 254 #define XPT2046_Y_OFFSET 254
#endif #endif
#elif ENABLED(TFT_CLASSIC_UI) #ifdef TFT_CLASSIC_UI
#ifndef XPT2046_X_CALIBRATION #define TFT_MARLINUI_COLOR 0xFFFF // White
#define XPT2046_X_CALIBRATION 12033 #define TFT_BTARROWS_COLOR 0xDEE6 // Yellow
#define TFT_BTOKMENU_COLOR 0x145F // Cyan
#endif #endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -9047
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -30
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 251
#endif
#define TFT_MARLINUI_COLOR 0xFFFF // White
#define TFT_BTARROWS_COLOR 0xDEE6 // Yellow
#define TFT_BTOKMENU_COLOR 0x145F // Cyan
#endif #endif
#if NEED_TOUCH_PINS #if NEED_TOUCH_PINS