diff --git a/platformio.ini b/platformio.ini index 284d0492a..7c54a7f4c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,11 +1,4 @@ ; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html [platformio] @@ -29,22 +22,9 @@ default_envs = tbeam ;default_envs = meshtastic-diy-v1 ;default_envs = meshtastic-diy-v1.1 -; board specific config can be moved to the respective 'variants' file. -; See https://docs.platformio.org/en/latest/projectconf/section_platformio.html#extra-configs extra_configs = variants/*/platformio.ini -[common] -; common is not currently used - -; REQUIRED environment variables - if not set the specified default will be sued -; The following environment variables must be set in the shell if you'd like to override them. -; They are used in this ini file as systenv.VARNAME, so in your shell do export "VARNAME=fish" -; COUNTRY (default US), i.e. "export COUNTRY=EU865" -; HW_VERSION (default emptystring) - [env] - -; note: APP_VERSION now comes from bin/version.json extra_scripts = bin/platformio-custom.py ; note: we add src to our include search path so that lmic_project_config can override @@ -59,24 +39,8 @@ build_flags = -Wno-missing-field-initializers -DUSE_THREAD_NAMES -DTINYGPS_OPTION_NO_CUSTOM_FIELDS -; the default is esptool -; upload_protocol = esp-prog - -; monitor_speed = 115200 monitor_speed = 921600 -# debug_tool = esp-prog -# debug_port = /dev/ttyACM0 - -debug_tool = jlink -;upload_protocol = jlink - -; debug_tool = olimex-arm-usb-ocd-h -; upload_protocol = olimex-arm-usb-ocd-h - -;debug_init_cmds = -; monitor adapter_khz 10000 - lib_deps = https://github.com/meshtastic/esp8266-oled-ssd1306.git#d90231dedbb2f52bd7a32fb8ed8edec52cf4a8cb ; ESP8266_SSD1306 mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce @@ -99,15 +63,11 @@ check_skip_packages = yes ; Common settings for conventional (non Portduino) Arduino targets [arduino_base] - framework = arduino - lib_deps = ${env.lib_deps} - build_flags = ${env.build_flags} -Os # -DRADIOLIB_GODMODE - src_filter = ${env.src_filter} - ; Common libs for environmental measurements (not included in native / portduino) @@ -129,7 +89,6 @@ src_filter = ${arduino_base.src_filter} - upload_speed = 921600 debug_init_break = tbreak setup - # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging. # See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h @@ -144,50 +103,26 @@ lib_deps = https://github.com/meshtastic/esp32_https_server.git h2zero/NimBLE-Arduino@1.3.7 tobozo/ESP32-targz@^1.1.4 - arduino-libraries/NTPClient#531eff39d9fbc831f3d03f706a161739203fbe2a + arduino-libraries/NTPClient@^3.1.0 lorol/LittleFS_esp32@^1.0.6 - lib_ignore = segger_rtt ESP32 BLE Arduino - platform_packages = framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276 - ; leave this commented out to avoid breaking Windows + ;upload_port = /dev/ttyUSB0 ;monitor_port = /dev/ttyUSB0 -;upload_port = /dev/cu.SLAB_USBtoUART -;monitor_port = /dev/cu.SLAB_USBtoUART - ; customize the partition table ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables board_build.partitions = partition-table.csv -; not needed included in ttgo-t-beam board file -; also to use PSRAM https://docs.platformio.org/en/latest/platforms/espressif32.html#external-ram-psram -; -DBOARD_HAS_PSRAM -; -mfix-esp32-psram-cache-issue - -; -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG - -; 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] -;platform = https://github.com/HelTecAutomation/platform-asrmicro650x.git ; we use top-of-tree because stable version has too many bugs - asrmicro650x -;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} - - - -; Common settings for NRF52 based targets [nrf52_base] ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files ; platform = nordicnrf52 -platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge +platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge pending https://github.com/platformio/builder-framework-arduino-nrf5/pull/7 extends = arduino_base 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) @@ -195,58 +130,19 @@ build_flags = ${arduino_base.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.7 -;-DCFG_DEBUG=3 src_filter = ${arduino_base.src_filter} - - - - - - lib_ignore = BluetoothOTA -; monitor_port = /dev/ttyACM1 - -# we pass in options to jlink so it can understand freertos (note: we don't use "jlink" as the tool) -;debug_tool = jlink -debug_port = :2331 -# Note: the ARGUMENTS MUST BE on multiple lines. Otherwise platformio/commands/debug/helpers.py misparses everything into the "executable" -# attribute and leaves "arguments" empty -# /home/kevinh/.platformio/packages/tool-jlink/JLinkGDBServerCLExe -# This doesn't work yet, so not using for now -disabled_debug_server = - /usr/bin/JLinkGDBServerCLExe - -singlerun - -if - SWD - -select - USB - -device - nRF52840_xxAA - -port - 2331 - -rtos - GDBServer/RTOSPlugin_FreeRTOS - -debug_extra_cmds = - source gdbinit - -; after programming the flash, reset the initial PC -; debug_load_cmds = load - -; Set initial breakpoint (defaults to main) -debug_init_break = -;debug_init_break = tbreak loop -;debug_init_break = tbreak Reset_Handler [nrf52840_base] -; Common base class for all nrf52840 based targets extends = nrf52_base -; was -DTINY_USB build_flags = ${nrf52_base.build_flags} lib_deps = ${arduino_base.lib_deps} ${environmental.lib_deps} - Adafruit nRFCrypto - # Adafruit TinyUSB Arduino - # add Adafruit nRFCrypto platform IO automated scan is broken + Adafruit nRFCrypto -; The NRF52840-dk development board ; Note: By default no lora device is created for this build - it uses a simulated interface [env:nrf52840dk] extends = nrf52840_base @@ -262,6 +158,4 @@ extends = nrf52_base board = rak815 debug_tool = jlink upload_protocol = jlink -monitor_port = /dev/ttyUSB0 -; this board's serial chip can only run at 115200, not faster monitor_speed = 115200 \ No newline at end of file