Merge branch 'portduino' into dev

# Conflicts:
#	platformio.ini

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = tbeam # or if you'd like to change the default to something like lora-relay-v1 put that here
+default_envs = tbeam # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 
 [common]
 ; common is not currently used
@@ -23,15 +23,9 @@ default_envs = tbeam # or if you'd like to change the default to something like
 
 [env]
 
-framework = arduino
-
-; customize the partition table
-; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
-
 ; note: we add src to our include search path so that lmic_project_config can override
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
-build_flags = -Wno-missing-field-initializers -Isrc -Isrc/mesh -Isrc/gps -Ilib/nanopb/include -Os -Wl,-Map,.pio/build/output.map 
+build_flags = -Wno-missing-field-initializers -Isrc -Isrc/mesh -Isrc/gps -Ilib/nanopb/include -Wl,-Map,.pio/build/output.map 
   -DHW_VERSION_${sysenv.COUNTRY}
   -DAPP_VERSION=${sysenv.APP_VERSION}
   -DHW_VERSION=${sysenv.HW_VERSION}
@@ -60,25 +54,38 @@ debug_tool = jlink
 
 lib_deps =
   https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 
-  SPI
   1260 ; OneButton library for non-blocking button debounce
   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/SparkFun_Ublox_Arduino_Library.git
   https://github.com/meshtastic/RadioLib.git#7989a269be590a5d4914ac04069b58f4930c45c1
   https://github.com/meshtastic/TinyGPSPlus.git 
   https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
+  Wire ; explicitly needed here because the AXP202 library forgets to add it
+  SPI
+  
+; Common settings for conventional (non Portduino) Ardino targets
+[arduino_base]
+
+framework = arduino
+
+lib_deps =
+  ${env.lib_deps}
+
+build_flags = ${env.build_flags} -Os
+
+src_filter = ${env.src_filter} -<portduino/>
 
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
+extends = arduino_base
 platform = espressif32
 src_filter = 
-  ${env.src_filter} -<nrf52/>
+  ${arduino_base.src_filter} -<nrf52/>
 upload_speed = 921600
 debug_init_break = tbreak setup
 build_flags =
-  ${env.build_flags} -Wall -Wextra -Isrc/esp32 -mfix-esp32-psram-cache-issue -lnimble -std=c++11 
+  ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 
   -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
   -DAXP_DEBUG_PORT=Serial
 # Hmm - this doesn't work yet
@@ -87,6 +94,10 @@ lib_ignore = segger_rtt
 platform_packages =
     framework-arduinoespressif32 @ https://github.com/meshtastic/arduino-esp32.git#1adba3f11ca8406ac0a704d151697b572058b53d
 
+; 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
@@ -99,7 +110,7 @@ platform_packages =
 extends = esp32_base
 board = ttgo-t-beam
 lib_deps =
-  ${env.lib_deps}
+  ${arduino_base.lib_deps}
 build_flags = 
   ${esp32_base.build_flags} -D TBEAM_V10
 
@@ -142,25 +153,26 @@ build_flags =
 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 = ${env.build_flags} -DARDUINO=100 -Isrc/cubecell
+build_flags = ${arduino_base.build_flags} -DARDUINO=100 -Isrc/cubecell
 src_filter = 
-  ${env.src_filter} -<esp32/> -<nrf52/>
+  ${arduino_base.src_filter} -<esp32/> -<nrf52/>
   
 ; 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#1a2639a6b0f79b5df66bea3e3089f0d5285fdc63
+extends = arduino_base
 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 
+  ${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.3 
 ;-DCFG_DEBUG=3
 src_filter = 
-  ${env.src_filter} -<esp32/> -<nimble/>
+  ${arduino_base.src_filter} -<esp32/> -<nimble/>
 lib_ignore =
   BluetoothOTA
 monitor_port = /dev/ttyACM1
@@ -212,7 +224,7 @@ monitor_speed = 115200
 extends = nrf52_base
 board = ppr
 lib_deps = 
-  ${env.lib_deps}
+  ${arduino_base.lib_deps}
   UC1701
 
 ; The https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay board by @BigCorvus
@@ -233,11 +245,15 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/lora_relay_v1
   -DSPI_FREQUENCY=27000000
 src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v1>
 lib_deps = 
-  ${env.lib_deps}
+  ${arduino_base.lib_deps}
   SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
   TFT_eSPI
   # Adafruit ST7735 and ST7789 Library
 
-
-
-
+; The Portduino based sim environment on top of linux
+[env:linux]
+platform = https://github.com/geeksville/platform-portduino.git
+src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/>
+build_flags = ${arduino_base.build_flags} -O0
+framework = arduino
+board = linux_x86_64