diff --git a/platformio.ini b/platformio.ini index a21cfc3b4..80c6df666 100644 --- a/platformio.ini +++ b/platformio.ini @@ -107,7 +107,7 @@ lib_deps = build_flags = ${env.build_flags} -Os # -DRADIOLIB_GODMODE -src_filter = ${env.src_filter} - +build_src_filter = ${env.build_src_filter} - ; Common libs for environmental measurements (not included in native / portduino) [environmental] @@ -124,8 +124,8 @@ lib_deps = [esp32_base] extends = arduino_base platform = espressif32@3.5.0 -src_filter = - ${arduino_base.src_filter} - +build_src_filter = + ${arduino_base.build_src_filter} - upload_speed = 921600 debug_init_break = tbreak setup @@ -179,8 +179,8 @@ board_build.partitions = partition-table.csv ;board = cubecell_board_plus ; FIXME, bug in cubecell arduino - they are supposed to set ARDUINO ;build_flags = ${arduino_base.build_flags} -DARDUINO=100 -Isrc/cubecell -;src_filter = -; ${arduino_base.src_filter} - - +;build_src_filter = +; ${arduino_base.build_src_filter} - - ; Common settings for NRF52 based targets [nrf52_base] @@ -195,8 +195,8 @@ build_flags = -Isrc/nrf52 -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.7 ;-DCFG_DEBUG=3 -src_filter = - ${arduino_base.src_filter} - - - - - - +build_src_filter = + ${arduino_base.build_src_filter} - - - - - - lib_ignore = BluetoothOTA ; monitor_port = /dev/ttyACM1 diff --git a/variants/WisCore_RAK4631_Board/platformio.ini b/variants/WisCore_RAK4631_Board/platformio.ini index cfd9297e0..cb8b151cb 100644 --- a/variants/WisCore_RAK4631_Board/platformio.ini +++ b/variants/WisCore_RAK4631_Board/platformio.ini @@ -5,7 +5,7 @@ board = wiscore_rak4631 # add our variants files to the include and src paths # define build flags for the TFT_eSPI library build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_5005 -src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/WisCore_RAK4631_Board> debug_tool = jlink [env:rak4631_19003] @@ -14,7 +14,7 @@ board = wiscore_rak4631 # add our variants files to the include and src paths # define build flags for the TFT_eSPI library build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_19003 -src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/WisCore_RAK4631_Board> debug_tool = jlink ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm) ;upload_protocol = jlink \ No newline at end of file diff --git a/variants/lora_isp4520/platformio.ini b/variants/lora_isp4520/platformio.ini index 0a946c7a8..fb9fdf913 100644 --- a/variants/lora_isp4520/platformio.ini +++ b/variants/lora_isp4520/platformio.ini @@ -6,7 +6,7 @@ board = lora_isp4520 build_flags = ${nrf52_base.build_flags} -Ivariants/lora_isp4520 # No screen and GPS on the board. We still need RTC.cpp for the RTC clock. -src_filter = ${nrf52_base.src_filter} +<../variants/lora_isp4520> - - + + +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_isp4520> - - + + lib_ignore = ${nrf52_base.lib_ignore} ESP8266_SSD1306 SparkFun Ublox Arduino Library diff --git a/variants/lora_relay_v1/platformio.ini b/variants/lora_relay_v1/platformio.ini index 78b338d9b..312108979 100644 --- a/variants/lora_relay_v1/platformio.ini +++ b/variants/lora_relay_v1/platformio.ini @@ -14,7 +14,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v1 -DTFT_DC=ST7735_RS -DTFT_RST=ST7735_RESET -DSPI_FREQUENCY=27000000 -src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v1> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v1> lib_deps = ${nrf52840_base.lib_deps} SparkFun BQ27441 LiPo Fuel Gauge Arduino Library diff --git a/variants/lora_relay_v2/platformio.ini b/variants/lora_relay_v2/platformio.ini index 1a12713c8..f35b14c02 100644 --- a/variants/lora_relay_v2/platformio.ini +++ b/variants/lora_relay_v2/platformio.ini @@ -16,7 +16,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v2 -DSPI_FREQUENCY=27000000 -DTFT_WR=ST7735_SDA -DTFT_SCLK=ST7735_SCK -src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v2> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v2> lib_deps = ${nrf52840_base.lib_deps} SparkFun BQ27441 LiPo Fuel Gauge Arduino Library diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index c4d561558..758998f73 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -1,8 +1,8 @@ ; The Portduino based sim environment on top of any host OS, all hardware will be simulated [env:native] platform = https://github.com/geeksville/platform-native.git -src_filter = - ${env.src_filter} +build_src_filter = + ${env.build_src_filter} - - - @@ -20,8 +20,8 @@ lib_deps = ; The Portduino based sim environment on top of a linux OS and touching linux hardware devices [env:linux] platform = https://github.com/geeksville/platform-native.git -src_filter = - ${env.src_filter} +build_src_filter = + ${env.build_src_filter} - - - diff --git a/variants/ppr1/platformio.ini b/variants/ppr1/platformio.ini index 6592e4718..40ad508f9 100644 --- a/variants/ppr1/platformio.ini +++ b/variants/ppr1/platformio.ini @@ -3,6 +3,6 @@ extends = nrf52_base board = ppr1 build_flags = ${nrf52_base.build_flags} -Ivariants/ppr1 -src_filter = ${nrf52_base.src_filter} +<../variants/ppr1> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ppr1> lib_deps = ${arduino_base.lib_deps} \ No newline at end of file diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini index 495eaf91a..5d496c76f 100644 --- a/variants/t-echo/platformio.ini +++ b/variants/t-echo/platformio.ini @@ -9,7 +9,7 @@ upload_protocol = jlink # -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling. build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo -src_filter = ${nrf52_base.src_filter} +<../variants/t-echo> +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo> lib_deps = ${nrf52840_base.lib_deps} https://github.com/geeksville/GxEPD2.git