From e1765739c5358e07e3aac021a0df81359019a812 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sun, 29 Nov 2020 20:36:19 +0100 Subject: [PATCH] Add regions to ini files --- platformio.ini | 12 ++++++------ user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini | 7 ++++--- user_setups/stm32f4xx/stm32f407-black_ili9341.ini | 8 ++++---- .../stm32f4xx/stm32f407-black_ili9341_parallel.ini | 4 ++-- .../stm32f4xx/stm32f407-black_ili9341_wifi.ini | 8 ++++---- user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini | 4 ++-- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/platformio.ini b/platformio.ini index e4623b74..a8e6e5b4 100644 --- a/platformio.ini +++ b/platformio.ini @@ -85,6 +85,7 @@ src_filter = +<*> -<.git/> -<.svn/> - - - - extra_scripts = tools/move-rename-firmware.py ; tools/pre:extra_script.py +; -- Platform specific build flags [esp32] build_flags = ${env.build_flags} @@ -118,8 +119,6 @@ lib_ignore = lib_deps = LittleFS_esp32 - -; -- Platform specific build flags [esp8266] build_flags= -D HTTP_UPLOAD_BUFLEN=640 ; lower http upload buffer @@ -147,15 +146,16 @@ lib_ignore = lib_deps = - -[flags] -stm32_flags= - ${env.build_flags} +[stm32f4] +build_flags= + -I include/stm32f4 -D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages -D IRAM_ATTR= ; No IRAM_ATTR available on STM32 -D ICACHE_RAM_ATTR= -D STM32 -D STREAMUTILS_USE_EEPROM_UPDATE=1 ; update cell only when changed +; -- lvgl build options ----------------------------- + -D LV_MEM_SIZE=20480U ; 20kB lvgl memory ;*************************************************** ; Hardware options diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini index e9f38e8b..a2058325 100644 --- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini +++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini @@ -29,8 +29,8 @@ upload_protocol = dfu debug_tool = stlink ;monitor_port = COM19 ; To change the port, use platform_override.ini build_flags = - ${flags.stm32_flags} - -I include/stm32f4 + ${env.build_flags} + ${stm32f4.build_flags} -I include/GxTFT/src -I include/GxTFT/src/GxCTRL/GxCTRL_ILI9341 @@ -47,11 +47,12 @@ build_flags = ;-D USE_DMA_TO_TFT ;endregion + -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2 + ;region -- Hasp build options ---------------------------- -D HASP_USE_TASMOTA_SLAVE=0 -D HASP_OUTPUT_PIN=PA1 ; User LED D2 on DevEBox board -D HASP_INPUT_PIN=PA0 ; User Button K1 on DevEBox board - -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2 -D HASP_USE_WIFI=0 -D HASP_USE_MQTT=0 -D HASP_USE_HTTP=0 diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini index cd00ef63..3f6935e7 100644 --- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini +++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini @@ -12,8 +12,8 @@ board_build.mcu = stm32f407vgt6 upload_protocol = dfu monitor_port = COM7 ; To change the port, use platform_override.ini build_flags = - ${flags.stm32_flags} - -I include/stm32f4 + ${env.build_flags} + ${stm32f4.build_flags} ;region -- TFT_eSPI build options ------------------------ ${lcd.lolin24} @@ -28,8 +28,6 @@ build_flags = ;endregion -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2 - ;-D HAL_ETH_MODULE_ENABLED=1 ; enable ethernet support - ;-D LAN8742A_PHY_ADDRESS=0x01U ; set LAN8720 PHY address ;region -- Hasp build options ---------------------------- -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board @@ -44,6 +42,8 @@ build_flags = -D W5500_SCLK=PB13 ;SPI2 SCLK -D W5500_CS=PB6 ;SPI2 CS -D W5500_RST=PD1 ;SPI2 CS + ;-D HAL_ETH_MODULE_ENABLED=1 ; enable ethernet support + ;-D LAN8742A_PHY_ADDRESS=0x01U ; set LAN8720 PHY address ;endregion ;region -- Library options ------------------------------- diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini index 58886aad..992c5bf9 100644 --- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini +++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini @@ -12,8 +12,8 @@ board_build.mcu = stm32f407vet6 upload_protocol = dfu monitor_port = COM7 ; To change the port, use platform_override.ini build_flags = - ${flags.stm32_flags} - -I include/stm32f4 + ${env.build_flags} + ${stm32f4.build_flags} ;region -- TFT_eSPI build options ------------------------ -D ILI9341_DRIVER=1 diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini index 18894403..72e8cdc9 100644 --- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini +++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini @@ -12,8 +12,8 @@ board_build.mcu = stm32f407vgt6 upload_protocol = dfu monitor_port = COM7 ; To change the port, use platform_override.ini build_flags = - ${flags.stm32_flags} - -I include/stm32f4 + ${env.build_flags} + ${stm32f4.build_flags} -I include/espspi ;region -- TFT_eSPI build options ------------------------ @@ -31,8 +31,6 @@ build_flags = ;endregion -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2 - ;-D HAL_ETH_MODULE_ENABLED=1 ; enable ethernet support - ;-D LAN8742A_PHY_ADDRESS=0x01U ; set LAN8720 PHY address ;region -- Hasp build options ---------------------------- -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board @@ -56,6 +54,8 @@ build_flags = -D ESPSPI_SCLK=PB13 ;SPI2 SCLK -D ESPSPI_CS=PB6 ;SPI2 CS -D ESPSPI_RST=PD1 ;SPI2 CS + ;-D HAL_ETH_MODULE_ENABLED=1 ; enable ethernet support + ;-D LAN8742A_PHY_ADDRESS=0x01U ; set LAN8720 PHY address ;endregion ;region -- Library options ------------------------------- diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini index da640fd5..60e6c3ad 100644 --- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini +++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini @@ -23,8 +23,8 @@ upload_protocol = stlink debug_tool = stlink ;monitor_port = COM19 ; To change the port, use platform_override.ini build_flags = - ${flags.stm32_flags} - -I include/stm32f4 + ${env.build_flags} + ${stm32f4.build_flags} ;region -- TFT_eSPI build options ------------------------ ${lcd.lolin24}