Skip to content

Commit e847913

Browse files
thinkyheadmlee12382
thinkyhead
and
mlee12382
committed
🔨 Other env improvements
Co-Authored-By: Michael <[email protected]>
1 parent e6e0489 commit e847913

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

‎ini/features.ini‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ HAS_MARLINUI_HD44780 = build_src_filter=+<src/lcd/HD44780>
4040
HAS_MARLINUI_U8GLIB = marlinfirmware/[email protected]
4141
build_src_filter=+<src/lcd/dogm>
4242
HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+<src/lcd/tft_io>
43-
HAS_LTDC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_ltdc.cpp>
44-
HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
45-
HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp> +<src/HAL/LPC1768/tft/tft_spi.cpp>
46-
HAS_TFT_XPT2046 = build_src_filter=+<src/HAL/STM32/tft/xpt2046.cpp> +<src/HAL/STM32F1/tft/xpt2046.cpp> +<src/HAL/LPC1768/tft/xpt2046.cpp>
47-
TFT_TOUCH_DEVICE_GT911 = build_src_filter=+<src/HAL/STM32/tft/gt911.cpp>
4843
I2C_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
4944
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
5045
SPI_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>

‎ini/lpc176x.ini‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ build_flags = ${common.build_flags} -DU8G_HAL_LINKS -DPLATFORM_M997_SUPPO
3030
#-funwind-tables
3131
#-mpoke-function-name
3232
build_src_flags = -std=gnu++20 -Wno-volatile
33+
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
34+
custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
35+
custom_marlin.HAS_SPI_TFT = build_src_filter=+<src/HAL/LPC1768/tft/tft_spi.cpp>
36+
custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+<src/HAL/LPC1768/tft/xpt2046.cpp>
3337

3438
#
3539
# NXP LPC176x ARM Cortex-M3

‎ini/stm32-common.ini‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ build_unflags = -std=gnu++11
1919
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> -<src/HAL/STM32/tft> +<src/HAL/shared/backtrace>
2020
extra_scripts = ${common.extra_scripts}
2121
pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
22+
custom_marlin.HAS_LTDC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_ltdc.cpp>
23+
custom_marlin.HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp>
24+
build_flags=-DHAL_SRAM_MODULE_ENABLED
25+
custom_marlin.HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp>
26+
custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+<src/HAL/STM32/tft/xpt2046.cpp>
27+
custom_marlin.TFT_TOUCH_DEVICE_GT911 = build_src_filter=+<src/HAL/STM32/tft/gt911.cpp>
2228

2329
#
2430
# STM32 board based on a variant.

‎ini/stm32f1-maple.ini‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# HAL/STM32F1 Common Environment values
2424
#
2525
[STM32F1_maple]
26-
platform = ststm32@~12.1
26+
platform = ststm32@~15.4.1
2727
board_build.core = maple
2828
build_flags = !python buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py
2929
${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1 -DPLATFORM_M997_SUPPORT
@@ -32,12 +32,15 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1> -<src/HAL/ST
3232
lib_ignore = SPI, FreeRTOS701, FreeRTOS821
3333
lib_deps = ${common.lib_deps}
3434
SoftwareSerialM
35-
platform_packages = tool-stm32duino
35+
platform_packages = tool-stm32duino, [email protected]
3636
extra_scripts = ${common.extra_scripts}
3737
pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
3838
pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
3939
buildroot/share/PlatformIO/scripts/custom_board.py
4040
buildroot/share/PlatformIO/scripts/offset_and_rename.py
41+
custom_marlin.HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32F1/tft/tft_spi.cpp>
42+
custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+<src/HAL/STM32F1/tft/xpt2046.cpp>
43+
custom_marlin.HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32F1/tft/tft_fsmc.cpp>
4144

4245
#
4346
# Generic STM32F103RC environment

‎ini/stm32f1.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ build_flags = ${env:STM32F103RC_btt.build_flags}
7171
-DUSBD_IRQ_PRIO=5
7272
-DUSBD_IRQ_SUBPRIO=6
7373
-DUSBD_USE_CDC_MSC
74-
build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC
74+
build_unflags = ${env:STM32F103RC_btt.build_unflags} -DUSBD_USE_CDC
7575

7676
#
7777
# Panda Pi V2.9 - Standalone (STM32F103RC)
@@ -83,8 +83,8 @@ build_flags = ${common_STM32F103RC_variant.build_flags}
8383
-DTIMER_SERVO=TIM1
8484
board_build.offset = 0x5000
8585
board_upload.offset_address = 0x08005000
86-
lib_deps =
87-
markyue/[email protected]
86+
lib_deps = markyue/[email protected]
87+
8888
#
8989
# MKS Robin (STM32F103ZET6)
9090
# Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel

‎ini/stm32f4.ini‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ extends = Anet_ET4
153153
board_build.encode = firmware.srec
154154
board_build.offset = 0x10000
155155
board_upload.offset_address = 0x08010000
156-
extra_scripts = ${stm32_variant.extra_scripts}
156+
extra_scripts = ${Anet_ET4.extra_scripts}
157157
buildroot/share/PlatformIO/scripts/openblt.py
158158

159159
#
@@ -497,7 +497,8 @@ build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
497497
extends = env:mks_robin_nano_v3_usb_flash_drive
498498
build_flags = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags}
499499
-DUSBD_USE_CDC_MSC
500-
build_unflags = -DUSBD_USE_CDC
500+
build_unflags = ${env:mks_robin_nano_v3_usb_flash_drive.build_unflags}
501+
-DUSBD_USE_CDC
501502

502503
#
503504
# MKS Robin Nano V3_1
@@ -626,7 +627,7 @@ extends = TH3D_EZBoard_V2
626627
board_build.encode = firmware.bin
627628
board_build.offset = 0xC000
628629
board_upload.offset_address = 0x0800C000
629-
extra_scripts = ${stm32_variant.extra_scripts}
630+
extra_scripts = ${TH3D_EZBoard_V2.extra_scripts}
630631
buildroot/share/PlatformIO/scripts/openblt.py
631632

632633
[mks_robin_nano_v1_3_f4_common]
@@ -647,19 +648,19 @@ upload_protocol = jlink
647648
#
648649
[env:mks_robin_nano_v1_3_f4]
649650
extends = mks_robin_nano_v1_3_f4_common
650-
build_flags = ${stm32_variant.build_flags}
651+
build_flags = ${mks_robin_nano_v1_3_f4_common.build_flags}
651652
-DMCU_STM32F407VE -DENABLE_HWSERIAL3 -DSTM32_FLASH_SIZE=512
652653
-DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
653654
-DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
654-
build_unflags = ${stm32_variant.build_unflags}
655+
build_unflags = ${mks_robin_nano_v1_3_f4_common.build_unflags}
655656
-DUSBCON -DUSBD_USE_CDC
656657

657658
#
658659
# MKS/ZNP Robin Nano V1.3 with native USB mod
659660
#
660661
[env:mks_robin_nano_v1_3_f4_usbmod]
661662
extends = mks_robin_nano_v1_3_f4_common
662-
build_flags = ${stm32_variant.build_flags}
663+
build_flags = ${mks_robin_nano_v1_3_f4_common.build_flags}
663664
-DMCU_STM32F407VE -DSTM32_FLASH_SIZE=512
664665
-DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
665666
-DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED

0 commit comments

Comments
 (0)