radiolib update (#5246)

* update radiolib to 7.1.0 * stay at 7.0.2 for STM32, also remove unused board from ESP32 arch --------- Co-authored-by: Ben Meadors <[email protected]>
meshtastic · Nov 11, 2024 · eb8d38a · eb8d38a
1 parent 3d5eb34
commit eb8d38a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 4 deletions.
diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
@@ -43,6 +43,7 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.2
   https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587

diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
@@ -23,6 +23,7 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0

diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
@@ -21,6 +21,7 @@ build_src_filter =
 
 lib_deps=
   ${arduino_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
 
 lib_ignore =

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
@@ -23,6 +23,7 @@ build_src_filter =
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
   https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805
 

diff --git a/arch/rp2xx0/rp2040.ini b/arch/rp2xx0/rp2040.ini
@@ -22,4 +22,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto
diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini
@@ -21,4 +21,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto
diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
@@ -30,8 +30,9 @@ upload_protocol = stlink
 lib_deps =
   ${env.lib_deps}
   charlesbaynham/OSFS@^1.2.3
+  jgromes/[email protected]
   https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e
 
 lib_ignore =
-  mathertel/OneButton@~2.6.1
+  mathertel/[email protected]
   Wire
diff --git a/platformio.ini b/platformio.ini
@@ -88,14 +88,14 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	jgromes/[email protected]
 	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
 	mathertel/[email protected]
 	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
 	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
 	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
 	nanopb/[email protected]
 	erriez/[email protected]
+
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
 check_skip_packages = yes
@@ -121,6 +121,10 @@ lib_deps =
 	arduino-libraries/[email protected]
 	arcao/[email protected]
 
+[radiolib_base]
+lib_deps =
+	jgromes/[email protected]
+
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]

diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
@@ -170,8 +170,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E213
 #elif defined(HELTEC_VISION_MASTER_E290)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E290
-#elif defined(HELTEC_MESH_NODE_T114)
-#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
 #elif defined(SENSECAP_INDICATOR)
 #define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
 #elif defined(SEEED_XIAO_S3)