Skip to content

Commit 674a9d9

Browse files
committed
Last update release 1.2.6
1 parent 28bea2b commit 674a9d9

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

Marlin/FLSUNQ_Config.h

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*_______________________1___________________________*/
2121
//==================== Hardware =====================//
2222
/*-------------Motherboard/Printer-(1 CHOICE)-------*/
23-
#define QQSP // (Default_QQS) env = flsun_hispeedv1
23+
#define QQSP // (Default_QQS) env = flsun_hispeedv1
2424
//#define Q5 // env = mks_nano_robin35 (change in platformio.ini file or
2525
// click on the "Default" icon on the bottom edge of the window and
2626
// choose "mks_robin_nano35").
@@ -59,19 +59,18 @@
5959
* = Driver TFT Color (1 CHOICE)=
6060
* ==============================
6161
*/
62-
#define MKS_ROBIN_TFT32 // (Default) Mks_Robin_TFT_V2.0
63-
//#define MKS_TS35_V2_00 // Only for NanoV2 or V3
64-
//#define TFT_GENERIC // For the user who haven't the same screen.
6562

66-
//#define DGUS_LCD_UI_MKS // Mks_H43_v1.0
67-
//Note for H43: The wiring is done on the UART2 (Wifi socket pins(PA10/PA9) for Tx/Rx).
63+
#define MKS_ROBIN_TFT32 // (Default QQS & Q5) Mks_Robin_TFT_V2.0
64+
//#define MKS_ROBIN_TFT35 // TS35 Compatible nanoV1, hispeedV1 (socket FSMC)
65+
//#define TFT_GENERIC // For the user who haven't the same screen.
6866

6967
/*--- Choice UI TFT ----*/
7068
#define TFT_COLOR_UI // (C) (Default) UI Color MARLIN
7169
//#define TFT_CLASSIC_UI // (F) Standard LCD (UI Classic LCD)
7270
//#define TFT_LVGL_UI // (I) UI Color MKS (Bug with captor sensor PR22595)
71+
//#define TFT_DWIN // (D) UI Color DGUS like Mks_H43_v1.0
7372

74-
#define TOUCH_SCREEN // (C/F) (Default) UI MARLIN
73+
//Note for Mks_H43: The wiring is done on the UART2 (Wifi socket pins(PA10/PA9) for Tx/Rx).
7574

7675
/* ======================================//
7776
* === Note:Languages already integrated==//
@@ -100,7 +99,7 @@
10099
*/
101100
//#define INV_EXT // Uncommment to reverse direction for BMG/Sherpa.
102101

103-
// BMG Extruder (B) Extruder step(417).
102+
// BMG Extruder (B) step(417) ou SuperDriveHX Extruder (n) step(720).
104103
//#define BMG // (B) Uncommment for BMG Left/Right.
105104
//#define NEMA14 // (n) Uncommment for SuperDriveHX/Mini-Sherpa/Orbiter.
106105

@@ -124,12 +123,13 @@
124123
//--------IF YOUR USED ABL, DISABLE "SPECIAL MENU DELTA"= #define CUSTOM_MENU_MAIN
125124
//#define AUTO_BED_LEVELING_BILINEAR // (A)
126125

126+
127127
/*_______________________6____________________*/
128128
//======Many options for Modules: ========//
129129
#define LIN_ADVANCE // (L) (Default2209) with K=0 For TMC_UART2208 prefer mode spreadCycle(by TFT menu) or commented if problem.
130130
#define POWER_LOSS_RECOVERY // (Default) Continue print after Power-Loss.
131131

132-
// WARNING:These options need wiring pins DIAG to EndStop plug(Signal).
132+
// WARNING:These options need wiring pins DIAG(TMC) to EndStop plug(Signal).
133133
// more at the bottom page.
134134
//#define STALLGUARD_1 // (G) Special mod for TMC2209 = SENSORLESS_HOMING
135135
//#define STALLGUARD_2 // (g) Special mod for TMC2209 = SENSORLESS_PROBING
@@ -208,11 +208,15 @@
208208
#endif
209209
#endif
210210

211-
//TFT Type For TFT_GENERIC
212-
#if ENABLED(TFT_GENERIC)
211+
//TFT Type For TFT_Screen
212+
#ifdef TFT_DWIN
213+
#define DGUS_LCD_UI_MKS //Wifi socket pins(PA10/PA9) for Tx/Rx
214+
#elif ENABLED(TFT_GENERIC)
213215
#define TFT_DRIVER AUTO
214-
#define TFT_INTERFACE_FSMC //Default socket on MKS_nano, mini, hispeed.
216+
#define TFT_INTERFACE_FSMC //Default socket on MKS_nano, mini, hispeed.
215217
#define TFT_RES_320x240
218+
#else
219+
#define TOUCH_SCREEN // (C/F) (Default) UI MARLIN
216220
#endif
217221

218222
/**
@@ -323,6 +327,7 @@
323327
// SENSORLESS_PROBING
324328
#ifdef STALLGUARD_2
325329
#define N_PROBE
330+
#define Y_OFFSET 0
326331
#define Z_OFFSET 0
327332
#endif
328333

Marlin/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2021-09-03"
44+
//#define STRING_DISTRIBUTION_DATE "2021-11-11"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,11 @@
343343
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
344344
#define FSMC_DMA_DEV DMA2
345345
#define FSMC_DMA_CHANNEL DMA_CH5
346+
#define FSMC_CS_PIN PD7
347+
#define FSMC_RS_PIN PD11
346348

347-
#define TFT_CS_PIN PD7
348-
#define TFT_RS_PIN PD11
349+
#define TFT_CS_PIN FSMC_CS_PIN
350+
#define TFT_RS_PIN FSMC_RS_PIN
349351

350352
#ifdef TFT_CLASSIC_UI
351353
#define TFT_MARLINBG_COLOR 0x3186 // Grey

0 commit comments

Comments
 (0)