From 9c0a0ad22083f0371f27aa7e090ce5e56c30a037 Mon Sep 17 00:00:00 2001 From: geeksville Date: Wed, 23 Sep 2020 17:22:17 -0700 Subject: [PATCH 1/2] Add stubs so that portduino can build with wifi. cc @mc-hamster --- platformio.ini | 2 +- src/nrf52/{wifi-nrf52.cpp => wifi-stubs.cpp} | 0 src/portduino/wifi-stubs.cpp | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename src/nrf52/{wifi-nrf52.cpp => wifi-stubs.cpp} (100%) create mode 120000 src/portduino/wifi-stubs.cpp diff --git a/platformio.ini b/platformio.ini index 3ab4a7815..4ed9e967a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -253,7 +253,7 @@ lib_deps = ; The Portduino based sim environment on top of linux [env:linux] platform = https://github.com/geeksville/platform-portduino.git -src_filter = ${env.src_filter} - - - +src_filter = ${env.src_filter} - - - - build_flags = ${arduino_base.build_flags} -O0 framework = arduino board = linux_x86_64 diff --git a/src/nrf52/wifi-nrf52.cpp b/src/nrf52/wifi-stubs.cpp similarity index 100% rename from src/nrf52/wifi-nrf52.cpp rename to src/nrf52/wifi-stubs.cpp diff --git a/src/portduino/wifi-stubs.cpp b/src/portduino/wifi-stubs.cpp new file mode 120000 index 000000000..b90e66295 --- /dev/null +++ b/src/portduino/wifi-stubs.cpp @@ -0,0 +1 @@ +../nrf52/wifi-stubs.cpp \ No newline at end of file From d3c00584a232a86db20d7a313f96c5057dbb16fb Mon Sep 17 00:00:00 2001 From: geeksville Date: Thu, 24 Sep 2020 10:36:37 -0700 Subject: [PATCH 2/2] oops - the NRF52 build rules are suppose to inherit from arduino_base. --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 4ed9e967a..fb6508e70 100644 --- a/platformio.ini +++ b/platformio.ini @@ -172,7 +172,7 @@ build_flags = -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} - - - + ${arduino_base.src_filter} - - - lib_ignore = BluetoothOTA monitor_port = /dev/ttyACM1