From fcf21da8430adc27e02fb75659c1efbd905a9e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 24 Nov 2022 13:55:57 +0100 Subject: [PATCH] one radiolib to rule them all --- arch/portduino/portduino.ini | 4 +--- platformio.ini | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index fb1e45af7..cd962b671 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -1,6 +1,6 @@ ; The Portduino based sim environment on top of any host OS, all hardware will be simulated [portduino_base] -platform = https://github.com/meshtastic/platform-native.git#develop +platform = https://github.com/meshtastic/platform-native.git#096b3c3e9c5c8e19d4c3b6cd803fffef2a9be4c5 framework = arduino build_src_filter = ${env.build_src_filter} @@ -18,6 +18,4 @@ lib_deps = ${env.lib_deps} ${networking_base.lib_deps} rweather/Crypto@^0.4.0 - ; jgromes/RadioLib@5.4.1 - https://github.com/jgromes/RadioLib.git#63208f1e89d4dac6eedaafbe234bf90f1fd5402b ; 5.4.1 with some fixes, remove when 5.4.2 is released build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino diff --git a/platformio.ini b/platformio.ini index 8c30b11d0..dbddf7535 100644 --- a/platformio.ini +++ b/platformio.ini @@ -66,6 +66,7 @@ lib_deps = https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3 nanopb/Nanopb@^0.4.6 erriez/ErriezCRC32@^1.0.1 + jgromes/RadioLib@^5.5.0 ; Used for the code analysis in PIO Home / Inspect check_tool = cppcheck @@ -80,7 +81,6 @@ check_flags = framework = arduino lib_deps = ${env.lib_deps} - jgromes/RadioLib@5.4.1 mprograms/QMC5883LCompass@^1.1.1 https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76