From e84791350f9cc340410e4266ec6c8cd39a6d811e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 21 Sep 2024 17:50:04 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Other=20env=20improvements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Michael <89716126+mlee12382@users.noreply.github.com> --- ini/features.ini | 5 ----- ini/lpc176x.ini | 4 ++++ ini/stm32-common.ini | 6 ++++++ ini/stm32f1-maple.ini | 7 +++++-- ini/stm32f1.ini | 6 +++--- ini/stm32f4.ini | 13 +++++++------ 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ini/features.ini b/ini/features.ini index 01d15ec9b9163..33d1f31279ffd 100644 --- a/ini/features.ini +++ b/ini/features.ini @@ -40,11 +40,6 @@ HAS_MARLINUI_HD44780 = build_src_filter=+ HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@0.5.4 build_src_filter=+ HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+ -HAS_LTDC_TFT = build_src_filter=+ -HAS_FSMC_TFT = build_src_filter=+ + -HAS_SPI_TFT = build_src_filter=+ + + -HAS_TFT_XPT2046 = build_src_filter=+ + + -TFT_TOUCH_DEVICE_GT911 = build_src_filter=+ I2C_EEPROM = build_src_filter=+ SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip SPI_EEPROM = build_src_filter=+ diff --git a/ini/lpc176x.ini b/ini/lpc176x.ini index caef41d9a200f..4551ef0da1d66 100644 --- a/ini/lpc176x.ini +++ b/ini/lpc176x.ini @@ -30,6 +30,10 @@ build_flags = ${common.build_flags} -DU8G_HAL_LINKS -DPLATFORM_M997_SUPPO #-funwind-tables #-mpoke-function-name build_src_flags = -std=gnu++20 -Wno-volatile +custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7 +custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip +custom_marlin.HAS_SPI_TFT = build_src_filter=+ +custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+ # # NXP LPC176x ARM Cortex-M3 diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini index e4afaf07022a2..ec058d1087093 100644 --- a/ini/stm32-common.ini +++ b/ini/stm32-common.ini @@ -19,6 +19,12 @@ build_unflags = -std=gnu++11 build_src_filter = ${common.default_src_filter} + - + extra_scripts = ${common.extra_scripts} pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py +custom_marlin.HAS_LTDC_TFT = build_src_filter=+ +custom_marlin.HAS_FSMC_TFT = build_src_filter=+ + build_flags=-DHAL_SRAM_MODULE_ENABLED +custom_marlin.HAS_SPI_TFT = build_src_filter=+ +custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+ +custom_marlin.TFT_TOUCH_DEVICE_GT911 = build_src_filter=+ # # STM32 board based on a variant. diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini index db852caa1e9cc..453531d27ba8a 100644 --- a/ini/stm32f1-maple.ini +++ b/ini/stm32f1-maple.ini @@ -23,7 +23,7 @@ # HAL/STM32F1 Common Environment values # [STM32F1_maple] -platform = ststm32@~12.1 +platform = ststm32@~15.4.1 board_build.core = maple build_flags = !python buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1 -DPLATFORM_M997_SUPPORT @@ -32,12 +32,15 @@ build_src_filter = ${common.default_src_filter} + - +custom_marlin.HAS_TFT_XPT2046 = build_src_filter=+ +custom_marlin.HAS_FSMC_TFT = build_src_filter=+ # # Generic STM32F103RC environment diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index 3a74b6caf702a..a1950eebf6ed0 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -71,7 +71,7 @@ build_flags = ${env:STM32F103RC_btt.build_flags} -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC -build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC +build_unflags = ${env:STM32F103RC_btt.build_unflags} -DUSBD_USE_CDC # # Panda Pi V2.9 - Standalone (STM32F103RC) @@ -83,8 +83,8 @@ build_flags = ${common_STM32F103RC_variant.build_flags} -DTIMER_SERVO=TIM1 board_build.offset = 0x5000 board_upload.offset_address = 0x08005000 -lib_deps = - markyue/Panda_SoftMasterI2C@1.0.3 +lib_deps = markyue/Panda_SoftMasterI2C@1.0.3 + # # MKS Robin (STM32F103ZET6) # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index afa4ef52403a2..6334de6db214c 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -153,7 +153,7 @@ extends = Anet_ET4 board_build.encode = firmware.srec board_build.offset = 0x10000 board_upload.offset_address = 0x08010000 -extra_scripts = ${stm32_variant.extra_scripts} +extra_scripts = ${Anet_ET4.extra_scripts} buildroot/share/PlatformIO/scripts/openblt.py # @@ -497,7 +497,8 @@ build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} extends = env:mks_robin_nano_v3_usb_flash_drive build_flags = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags} -DUSBD_USE_CDC_MSC -build_unflags = -DUSBD_USE_CDC +build_unflags = ${env:mks_robin_nano_v3_usb_flash_drive.build_unflags} + -DUSBD_USE_CDC # # MKS Robin Nano V3_1 @@ -626,7 +627,7 @@ extends = TH3D_EZBoard_V2 board_build.encode = firmware.bin board_build.offset = 0xC000 board_upload.offset_address = 0x0800C000 -extra_scripts = ${stm32_variant.extra_scripts} +extra_scripts = ${TH3D_EZBoard_V2.extra_scripts} buildroot/share/PlatformIO/scripts/openblt.py [mks_robin_nano_v1_3_f4_common] @@ -647,11 +648,11 @@ upload_protocol = jlink # [env:mks_robin_nano_v1_3_f4] extends = mks_robin_nano_v1_3_f4_common -build_flags = ${stm32_variant.build_flags} +build_flags = ${mks_robin_nano_v1_3_f4_common.build_flags} -DMCU_STM32F407VE -DENABLE_HWSERIAL3 -DSTM32_FLASH_SIZE=512 -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4 -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED -build_unflags = ${stm32_variant.build_unflags} +build_unflags = ${mks_robin_nano_v1_3_f4_common.build_unflags} -DUSBCON -DUSBD_USE_CDC # @@ -659,7 +660,7 @@ build_unflags = ${stm32_variant.build_unflags} # [env:mks_robin_nano_v1_3_f4_usbmod] extends = mks_robin_nano_v1_3_f4_common -build_flags = ${stm32_variant.build_flags} +build_flags = ${mks_robin_nano_v1_3_f4_common.build_flags} -DMCU_STM32F407VE -DSTM32_FLASH_SIZE=512 -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4 -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED