diff --git a/platformio.ini b/platformio.ini index 9f1453d29..ab23d99dc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -65,21 +65,21 @@ debug_tool = jlink ; monitor adapter_khz 10000 lib_deps = - https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 + https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 SPI ; 1260 ; OneButton - not used yet 1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib Wire ; explicitly needed here because the AXP202 library forgets to add it - https://github.com/meshtastic/arduino-fsm.git + https://github.com/meshtastic/arduino-fsm.git https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git https://github.com/meshtastic/RadioLib.git - https://github.com/meshtastic/TinyGPSPlus.git - + https://github.com/meshtastic/TinyGPSPlus.git + ; Common settings for ESP targes, mixin with extends = esp32_base [esp32_base] platform = espressif32 framework = arduino -src_filter = +src_filter = ${env.src_filter} - upload_speed = 921600 debug_init_break = tbreak setup @@ -98,7 +98,7 @@ board = ttgo-t-beam lib_deps = ${env.lib_deps} https://github.com/meshtastic/AXP202X_Library.git -build_flags = +build_flags = ${esp32_base.build_flags} -D TBEAM_V10 ; The original TBEAM board without the AXP power chip and a few other changes @@ -106,28 +106,28 @@ build_flags = ;[env:tbeam0.7] ;extends = esp32_base ;board = ttgo-t-beam -;build_flags = +;build_flags = ; ${esp32_base.build_flags} -D TBEAM_V07 [env:heltec] -;build_type = debug ; to make it possible to step through our jtag debugger +;build_type = debug ; to make it possible to step through our jtag debugger extends = esp32_base board = heltec_wifi_lora_32_V2 [env:ttgo-lora32-v1] extends = esp32_base board = ttgo-lora32-v1 -build_flags = +build_flags = ${esp32_base.build_flags} -D TTGO_LORA_V1 ; note: the platformio definition for lora32-v2 seems stale, it is missing a pins_arduino.h file, therefore I don't think it works [env:ttgo-lora32-v2] extends = esp32_base board = ttgo-lora32-v1 -build_flags = +build_flags = ${esp32_base.build_flags} -D TTGO_LORA_V2 -; The Heltec Cubecell plus +; The Heltec Cubecell plus ; IMPORTANT NOTE: This target doesn't yet work and probably won't ever work. I'm keeping it around for now. ; For more details see my post in the forum. [env:cubecellplus] @@ -136,9 +136,9 @@ framework = arduino board = cubecell_board_plus ; FIXME, bug in cubecell arduino - they are supposed to set ARDUINO build_flags = ${env.build_flags} -DARDUINO=100 -Isrc/cubecell -src_filter = +src_filter = ${env.src_filter} - - - + ; Common settings for NRF52 based targets [nrf52_base] platform = nordicnrf52 @@ -146,10 +146,10 @@ framework = arduino debug_tool = jlink build_type = debug ; I'm debugging with ICE a lot now ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME) -build_flags = - ${env.build_flags} -Wno-unused-variable -Isrc/nrf52 -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.3 +build_flags = + ${env.build_flags} -Wno-unused-variable -Isrc/nrf52 -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.3 ;-DCFG_DEBUG=3 -src_filter = +src_filter = ${env.src_filter} - lib_ignore = BluetoothOTA @@ -178,7 +178,7 @@ board = nrf52840_dk_modified [env:ppr] extends = nrf52_base board = ppr -lib_deps = +lib_deps = ${env.lib_deps} UC1701