Our mod was accepted by RadioLib

bin/apply_patches.py

@@ -1,27 +0,0 @@
-from os.path import join, isfile
-
-Import("env")
-
-LIBRARY_DIR = join (env["PROJECT_LIBDEPS_DIR"], env["PIOENV"], "RadioLib")
-patchflag_path = join(LIBRARY_DIR, ".patching-done")
-patch = join(env["PROJECT_DIR"], "bin", "patch_ng.py")
-
-# patch file only if we didn't do it before
-if not isfile(join(LIBRARY_DIR, ".patching-done")):
-    original_path = join(LIBRARY_DIR)
-    patch_file = join(env["PROJECT_DIR"], "patches", "0001-RadioLib-SPItransfer-virtual.patch")
-
-    assert isfile(patch_file)
-
-    env.Execute(
-        env.VerboseAction(
-            "$PYTHONEXE %s -p 1 --directory=%s %s" % (patch, original_path, patch_file)
-           ,  "Applying patch to RadioLib"
-        )
-    )
-
-    def _touch(path):
-        with open(path, "w") as fp:
-            fp.write("")
-
-    env.Execute(lambda *args, **kwargs: _touch(patchflag_path))

patches/0001-RadioLib-SPItransfer-virtual.patch

@@ -1,15 +0,0 @@
-index 3a7b098..aa38f6d 100644
---- a/src/Module.h
-+++ b/src/Module.h
-@@ -361,9 +361,9 @@ class Module {
-     // helper functions to set up SPI overrides on Arduino
-     #if defined(RADIOLIB_BUILD_ARDUINO)
-     void SPIbegin();
--    void SPIbeginTransaction();
-+    virtual void SPIbeginTransaction();
-     uint8_t SPItransfer(uint8_t b);
--    void SPIendTransaction();
-+    virtual void SPIendTransaction();
-     void SPIend();
-     #endif
- 

platformio.ini

@@ -61,7 +61,8 @@ framework = arduino
 lib_deps =
   ${env.lib_deps}
   ; Portduino is using meshtastic fork for now
-  https://github.com/jgromes/RadioLib.git#3df3b092ebf412bd0b26524e7b296733bd6a62f7
+  https://github.com/jgromes/RadioLib.git
+
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
 build_src_filter = ${env.build_src_filter} -<portduino/>
@@ -94,9 +95,6 @@ build_src_filter =
   ${arduino_base.build_src_filter} -<nrf52/>
 upload_speed = 921600
 debug_init_break = tbreak setup
-extra_scripts =
-  ${env.extra_scripts}
-  pre:bin/apply_patches.py
 
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
 # See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
@@ -149,9 +147,6 @@ build_src_filter =
   ${arduino_base.build_src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
 lib_ignore =
   BluetoothOTA
-extra_scripts =
-  ${env.extra_scripts}
-  pre:bin/apply_patches.py
 
 [nrf52840_base]
 extends = nrf52_base