Converted to jgromes/RadioLib upstream and pegged to latest ref (#1472)

* Converted to jgromes/RadioLib upstream and pegged to latest ref

platformio.ini

@@ -44,15 +44,11 @@ lib_deps =
   mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
-  https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
   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
   https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
-  PubSubClient
   nanopb/Nanopb@^0.4.6
-  meshtastic/json11@^1.0.2
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -63,12 +59,21 @@ check_skip_packages = yes
 framework = arduino
 lib_deps =
   ${env.lib_deps}
+  ; Portduino is using meshtastic fork for now
+  https://github.com/jgromes/RadioLib.git#3df3b092ebf412bd0b26524e7b296733bd6a62f7
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
 build_src_filter = ${env.build_src_filter} -<portduino/>
 
-; Common libs for environmental measurements (not included in native / portduino)
-[environmental]
+; Common libs for communicating over TCP/IP networks such as MQTT 
+[networking_base]
+lib_deps =
+  PubSubClient
+  meshtastic/json11@^1.0.2
+
+; Common libs for environmental measurements in telemetry module 
+; (not included in native / portduino)
+[environmental_base]
 lib_deps =
   adafruit/Adafruit BusIO@^1.11.4
   adafruit/DHT sensor library@^1.4.1
@@ -97,11 +102,14 @@ build_flags =
   -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH
 lib_deps =
   ${arduino_base.lib_deps}
-  ${environmental.lib_deps}
+  ${networking_base.lib_deps}
+  ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git
   h2zero/NimBLE-Arduino@1.3.7
   arduino-libraries/NTPClient@^3.1.0
   lorol/LittleFS_esp32@^1.0.6
+  https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
+
 lib_ignore = 
   segger_rtt
   ESP32 BLE Arduino
@@ -141,7 +149,7 @@ extends = nrf52_base
 build_flags = ${nrf52_base.build_flags} 
 lib_deps =
   ${arduino_base.lib_deps}
-  ${environmental.lib_deps}
+  ${environmental_base.lib_deps}
   https://github.com/Kongduino/Adafruit_nRFCrypto.git
 
 ; Note: By default no lora device is created for this build - it uses a simulated interface