Merge remote-tracking branch 'origin/master'

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = tbeam
+;default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec
 ;default_envs = tlora-v1
@@ -17,7 +17,7 @@ default_envs = tbeam
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = eink
 ;default_envs = nrf52840dk-geeksville
-;default_envs = linux # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
+default_envs = native # 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
@@ -373,19 +373,20 @@ lib_deps =
   TFT_eSPI
 
 ; The Portduino based sim environment on top of linux
-[env:linux]
-platform = https://github.com/geeksville/platform-portduino.git
+[env:native]
+platform = https://github.com/geeksville/platform-native.git 
 src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<mesh/http/> -<plugins/esp32>
 build_flags = ${arduino_base.build_flags} -O0
 framework = arduino
-board = linux_x86_64
+board = native
 lib_deps =
   ${arduino_base.lib_deps}
   rweather/Crypto
 
 ; The GenieBlocks LORA prototype board
-[env:genieblocks_lora]
-extends = esp32_base
-board = genieblocks_lora
-build_flags = 
-  ${esp32_base.build_flags} -D GENIEBLOCKS
+; note: @geeksville disabled because genieblocks_lora is not checked into the boards directory, please send in a PR to add it ;-)
+;[env:genieblocks_lora]
+;extends = esp32_base
+;board = genieblocks_lora
+;build_flags = 
+;  ${esp32_base.build_flags} -D GENIEBLOCKS