Platform IO stage

build.py

@@ -0,0 +1,6 @@
+Import("env")
+env.AddCustomTarget(
+    "build-firmware",
+    ["$BUILD_DIR/bootloader.bin","$BUILD_DIR/partitions.bin","$BUILD_DIR/firmware.bin"],
+    'pio pkg exec -p "tool-esptoolpy" -- esptool.py --chip ${BOARD_MCU} merge_bin --output Bruce_${PIOENV}.bin 0x0 ${BUILD_DIR}\\bootloader.bin 0x8000 ${BUILD_DIR}\\partitions.bin 0x10000 ${BUILD_DIR}\\firmware.bin'   
+)

platformio.ini

@@ -24,14 +24,21 @@ default_envs =
 ;uncomment to not use global dirs to avoid possible conflicts
 ;platforms_dir = .pio/platforms
 ;packages_dir = .pio/packages
-;build_cache_dir = .pio/buildcache
-;cache_dir = .pio/cache
+build_cache_dir = .pio/buildcache
+cache_dir = .pio/cache
 
 extra_configs =
-  ports/*/platformio.ini
+  boards/*.ini
+  boards/*/*.ini
 
 [env]
-monitor_filters = esp32_exception_decoder
+platform = espressif32
+platform_packages =
+	framework-arduinoespressif32 @ https://github.com/bmorcelli/arduino-esp32/releases/download/2.0.17e/esp32-2.0.17e.zip
+monitor_filters = esp32_exception_decoder, send_on_enter, colorize
+framework = arduino
+board_build.variants_dir = boards
+board_build.filesystem = littlefs
 build_flags =
 	-DBRUCE_VERSION='"dev"'
 	-DEEPROMSIZE=128
@@ -50,12 +57,16 @@ build_flags =
 	;-DRF_MODULE_GDO2=RADIOLIB_NC    ; CC1101 pin GDO2
 	;-DRF_MODULE_INIT_STATUS=true
 
+extra_scripts = 
+	pre:patch.py
+	post:build.py
+
 lib_deps =
 	WireGuard-ESP32
 	IRremoteESP8266
 	Time
 	LibSSH-ESP32
-	PCA9554
+	bakadave/PCA9554
 	https://github.com/bmorcelli/ESPping
 	https://github.com/rennancockles/PN532
 	https://github.com/rennancockles/MFRC522-I2C
@@ -69,8 +80,8 @@ lib_deps =
 	https://github.com/bmorcelli/rc-switch
 	ESP8266Audio
 	FFat
-	ESP8266SAM
-	TinyGPSPlus
+	earlephilhower/ESP8266SAM@^1.0.1
+	mikalhart/TinyGPSPlus
 	tinyu-zhao/FFT@^0.0.1
 	h2zero/NimBLE-Arduino@^1.4.0
 	nrf24/RF24 @ ^1.4.9