Skip to content
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.

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

Migrate Hispeedv1 (QQS-Pro) to HAL/STM32 #20354

Merged
merged 103 commits into from
Dec 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
1c59a8a
Update pins for TMC and UART capacities
Foxies-CSTL Aug 13, 2020
970321f
Update QQS_Pro capacities
Foxies-CSTL Aug 13, 2020
aadf06d
Update platformio.ini
Foxies-CSTL Aug 13, 2020
1d48941
Update pins.h
Foxies-CSTL Aug 13, 2020
f741c8d
Update QQS_Pro Stock/TMC/UART
Foxies-CSTL Aug 13, 2020
57fbe12
Multi_Config FLSUN_QQS-PRO
Foxies-CSTL Aug 17, 2020
eac1d17
add for sync
Foxies-CSTL Oct 8, 2020
26238d7
add for sync
Foxies-CSTL Oct 8, 2020
024bdd8
sync
Foxies-CSTL Oct 8, 2020
faf1b62
sync
Foxies-CSTL Oct 8, 2020
b0a00c5
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
671b934
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
8f8c0d5
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
bf07738
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
6264b86
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
ef8a287
Update _Statusscreen.h
Foxies-CSTL Oct 8, 2020
0cdfc71
sync
Foxies-CSTL Oct 8, 2020
236cc1b
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 18, 2020
653caa1
Update platformio.ini
thinkyhead Oct 18, 2020
4bc5cfd
Update platformio.ini
thinkyhead Oct 18, 2020
8d6776f
update QQS-PRO
Foxies-CSTL Oct 18, 2020
5a50672
Merge branch 'bugfix-2.0.x' of https://github.com/Foxies-CSTL/Marlin_…
Foxies-CSTL Oct 18, 2020
d63df49
Update platformio.ini
Foxies-CSTL Oct 18, 2020
25f88b3
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 18, 2020
0beea64
Update Configuration.h
Foxies-CSTL Oct 18, 2020
a3ad2e6
Update Configuration_adv.h
Foxies-CSTL Oct 18, 2020
c4877d6
Update Configuration.h
Foxies-CSTL Oct 18, 2020
c915b18
Update Configuration_adv.h
Foxies-CSTL Oct 18, 2020
a746946
Update Version.h
Foxies-CSTL Oct 18, 2020
66834a1
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 19, 2020
38f62bb
Update platformio.ini
Foxies-CSTL Oct 19, 2020
ed2f552
Delete _Statusscreen.h
Foxies-CSTL Oct 19, 2020
33756f7
Delete _Bootscreen.h
Foxies-CSTL Oct 19, 2020
35323bd
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 20, 2020
79a49de
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 20, 2020
66a2c85
Update Configuration_adv.h
Foxies-CSTL Oct 20, 2020
5106ae1
Update Configuration.h
Foxies-CSTL Oct 20, 2020
aed87ce
Update add_nanolib.py
Foxies-CSTL Oct 20, 2020
e754431
FLSUN Delta QQS-Pro support
thinkyhead Oct 21, 2020
6a436e2
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 21, 2020
af829ae
Update boards.h
Foxies-CSTL Oct 21, 2020
7cde38b
Merge branch 'bugfix-2.0.x' of https://github.com/Foxies-CSTL/Marlin_…
Foxies-CSTL Oct 21, 2020
d9fb468
Update boards.h
Foxies-CSTL Oct 21, 2020
fea2c01
Update pins.h
Foxies-CSTL Oct 21, 2020
438e9cb
Update pins.h
Foxies-CSTL Oct 21, 2020
193ae20
Update boards.h
Foxies-CSTL Oct 21, 2020
ce57698
Update Configuration.h
Foxies-CSTL Oct 21, 2020
781f28c
Fix bizarre regressions
thinkyhead Oct 21, 2020
9b10a48
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 22, 2020
e7bda8f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 27, 2020
9a9b643
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 28, 2020
b9f077d
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 28, 2020
e35be4d
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 28, 2020
316f988
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 30, 2020
16569bc
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 31, 2020
7b596b5
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 31, 2020
f532562
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Oct 31, 2020
95f0778
Update pins_FLSUN_HISPEED.h
thinkyhead Oct 31, 2020
a80b3b1
Update pins_FLSUN_HISPEED.h
thinkyhead Oct 31, 2020
f2198a1
More compatible driver macros
thinkyhead Oct 31, 2020
21ea0a8
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Oct 31, 2020
ee51865
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 2, 2020
1af299c
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Nov 2, 2020
290cfac
Fix SPI2-Extension SDCard-TFT buz
Foxies-CSTL Nov 2, 2020
ef80fda
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 4, 2020
3948460
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Nov 6, 2020
85ed5d3
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 9, 2020
d70922f
Simplication and add J2 connector
Foxies-CSTL Nov 11, 2020
f8af42d
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Nov 11, 2020
4e2e521
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 12, 2020
85af800
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 14, 2020
c2aad56
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Nov 16, 2020
07b5aed
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 16, 2020
1dc8c22
Update pins_FLSUN_HISPEED.h
thinkyhead Nov 17, 2020
658bf5a
Update pins_FLSUN_HISPEED.h
thinkyhead Nov 17, 2020
e4d31a9
Update following the new management of screens.
Foxies-CSTL Nov 17, 2020
866ec51
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 19, 2020
4f73b76
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 22, 2020
74d0d1e
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 23, 2020
e4cc375
QQS with UBL
Foxies-CSTL Nov 23, 2020
d0ce0ff
Update platformio.ini
Foxies-CSTL Nov 24, 2020
819889c
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 26, 2020
f532877
Merge branch 'bugfix-2.0.x' into Delta_Bugfix
Foxies-CSTL Nov 26, 2020
45360bc
Update platformio.ini
Foxies-CSTL Nov 26, 2020
3a17258
Update platformio.ini
Foxies-CSTL Nov 26, 2020
7404391
Merge branch 'bugfix-2.0.x' into Delta_Bugfix
Foxies-CSTL Nov 27, 2020
b4de908
Update Configuration.h
Foxies-CSTL Nov 27, 2020
6774751
Update Configuration_adv.h
Foxies-CSTL Nov 27, 2020
0ceb3f1
Update pins_FLSUN_HISPEED.h
Foxies-CSTL Nov 27, 2020
fd8e07d
Update platformio.ini
Foxies-CSTL Nov 27, 2020
d3b1e8e
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 27, 2020
ec0f08d
Merge branch 'bugfix-2.0.x' into Delta_Bugfix
Foxies-CSTL Nov 27, 2020
8a90433
Update Configuration.h
Foxies-CSTL Nov 27, 2020
6cf301a
Update Configuration_adv.h
Foxies-CSTL Nov 27, 2020
5b98b00
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Nov 29, 2020
d06631f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
Foxies-CSTL Dec 2, 2020
f6920cd
Merge branch 'bugfix-2.0.x' into Delta_Bugfix
Foxies-CSTL Dec 2, 2020
7301d95
Update Configuration.h
Foxies-CSTL Dec 2, 2020
450bd77
Change HAL STM32
Foxies-CSTL Dec 2, 2020
99cd175
Update origin
Foxies-CSTL Dec 2, 2020
9894b77
Update platformio.ini
Foxies-CSTL Dec 2, 2020
8a20586
Update migration Hal STM32
Foxies-CSTL Dec 6, 2020
95e94f2
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into Delta_Bugfix
Foxies-CSTL Dec 13, 2020
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
59 changes: 31 additions & 28 deletions Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
//
#define SPI_DEVICE 2
#define SCK_PIN PB13 // SPI2
#define MISO_PIN PB14 // SPI2
#define MOSI_PIN PB15 // SPI2

// SPI Flash
#define HAS_SPI_FLASH 1
Expand Down Expand Up @@ -269,48 +272,48 @@
#error "FLSun HiSpeed default BEEPER_PIN is not a SPEAKER."
#endif

/**
* Note: MKS Robin TFT screens use various TFT controllers
* Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
* ILI9488 is not supported
* Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
*
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*
* 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.
*/

// QQS-Pro uses MKS Robin TFT v2.0 320x240
#if HAS_FSMC_TFT || HAS_GRAPHICAL_TFT
#define TFT_CS_PIN PD7 // NE4
#define TFT_RS_PIN PD11 // A0
#endif

// Shared FSMC Configs
#if HAS_FSMC_TFT
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
#define DOGLCD_SCK -1

#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0

#define TFT_RESET_PIN PC6 // FSMC_RST
/**
* Note: MKS Robin TFT screens use various TFT controllers
* Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
* ILI9488 is not supported
* Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
*
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*
* 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.
*/
//#define TFT_RESET_PIN PC6 // FSMC_RST
#define TFT_BACKLIGHT_PIN PD13
#define FSMC_CS_PIN TFT_CS_PIN // NE4
#define FSMC_RS_PIN TFT_RS_PIN // A0

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

#define TFT_BUFFER_SIZE 14400
#if ENABLED(TFT_CLASSIC_UI)
#define TFT_MARLINBG_COLOR 0x3186 // White
#define TFT_MARLINUI_COLOR 0xC7B6 // green
#ifdef TFT_CLASSIC_UI
#define TFT_MARLINBG_COLOR 0x3186 // Grey
#define TFT_MARLINUI_COLOR 0xC7B6 // Green
#define TFT_BTARROWS_COLOR 0xDEE6 // Yellow
#define TFT_BTOKMENU_COLOR 0x145F // Cyan
#endif
#endif
#define TFT_BUFFER_SIZE 14400
#elif HAS_GRAPHICAL_TFT
#define TFT_RESET_PIN PC6
#define TFT_BACKLIGHT_PIN PD13
#endif

#if NEED_TOUCH_PINS
#define TOUCH_CS_PIN PC2 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
#define TOUCH_INT_PIN -1
#endif
29 changes: 18 additions & 11 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1144,18 +1144,25 @@ debug_tool = jlink
upload_protocol = jlink

#
# FLSUN QQ (STM32F103VET6)
# FLSUN QQS Pro (STM32F103VET6) using hal STM32
# board Hispeedv1
#
[env:flsun_hispeed]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/mks_robin_mini.py
buildroot/share/PlatformIO/scripts/add_nanolib.py
build_flags = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
lib_deps = SoftwareSerialM
#Adafruit NeoPixel=https://github.com/Foxies-CSTL/Robin-NeoPixel-Lib/archive/master.zip
[env:flsun_hispeedv1]
platform = ${common_stm32.platform}
extends = common_stm32
build_flags = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
board = genericSTM32F103VE
board_build.core = stm32
board_build.variant = MARLIN_F103Vx
board_build.ldscript = ldscript.ld
board_build.offset = 0x7000
board_build.firmware = Robin_mini.bin
board_upload.offset_address = 0x08007000
build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
buildroot/share/PlatformIO/scripts/stm32_bootloader.py
buildroot/share/PlatformIO/scripts/mks_encrypt.py
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved

#
# STM32F401VE
Expand Down