Merge pull request #1453 from meshtastic/PIO6-fix

Make PIO6 happy again

platformio.ini

@@ -44,7 +44,6 @@ lib_deps =
   mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
-  https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
   https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
   https://github.com/meshtastic/TinyGPSPlus.git
   https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
@@ -66,7 +65,7 @@ lib_deps =
   ${env.lib_deps}
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
-src_filter = ${env.src_filter} -<portduino/>
+build_src_filter = ${env.build_src_filter} -<portduino/>
 
 ; Common libs for environmental measurements (not included in native / portduino)
 [environmental]
@@ -84,8 +83,8 @@ lib_deps =
 [esp32_base]
 extends = arduino_base
 platform = espressif32@3.5.0
-src_filter = 
-  ${arduino_base.src_filter} -<nrf52/>
+build_src_filter = 
+  ${arduino_base.build_src_filter} -<nrf52/>
 upload_speed = 921600
 debug_init_break = tbreak setup
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
@@ -132,8 +131,8 @@ build_type = debug ; I'm debugging with ICE a lot now
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
   -Isrc/nrf52
-src_filter = 
-  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
+build_src_filter = 
+  ${arduino_base.build_src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
 lib_ignore =
   BluetoothOTA
 

variants/Dongle_nRF52840-pca10059-v1/platformio.ini

@@ -2,7 +2,7 @@
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
-src_filter = ${nrf52_base.src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/ZinggJM/GxEPD2.git

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> -<graphics> -<gps> +<gps/GPS.cpp> +<gps/RTC.cpp>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_isp4520> -<graphics> -<gps> +<gps/GPS.cpp> +<gps/RTC.cpp>
 lib_ignore = ${nrf52_base.lib_ignore} 
   ESP8266_SSD1306
   SparkFun Ublox Arduino Library

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

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

variants/m5stack_core/platformio.ini

@@ -4,8 +4,8 @@ board = m5stack-core-esp32
 upload_port = COM8
 monitor_port = COM8
 monitor_filters = esp32_exception_decoder
-src_filter = 
-  ${esp32_base.src_filter}
+build_src_filter = 
+  ${esp32_base.build_src_filter}
   +<../variants/m5stack_core>
 build_flags = 
   ${esp32_base.build_flags} -I variants/m5stack_core

variants/pca10056-rc-clock/platformio.ini

@@ -4,4 +4,4 @@ extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
-src_filter = ${nrf52_base.src_filter} +<../variants/pca10056-rc-clock>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/pca10056-rc-clock>

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/meshtastic/platform-native.git 
-src_filter = 
-  ${env.src_filter} 
+build_src_filter = 
+  ${env.build_src_filter} 
   -<esp32/> 
   -<nimble/> 
   -<nrf52/> 
@@ -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/meshtastic/platform-native.git 
-src_filter = 
-  ${env.src_filter} 
+build_src_filter = 
+  ${env.build_src_filter} 
   -<esp32/> 
   -<nimble/> 
   -<nrf52/> 

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}

variants/rak4631/platformio.ini

@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
-src_filter = ${nrf52_base.src_filter} +<../variants/rak4631>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0

variants/rak4631_epaper/platformio.ini

@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-src_filter = ${nrf52_base.src_filter} +<../variants/rak4631_epaper>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_epaper>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/ZinggJM/GxEPD2.git

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/meshtastic/GxEPD2