From 8684fd1c49957d20f81ddc104eaf5ed1492be57e Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Wed, 15 Jun 2022 19:00:40 -0700
Subject: [PATCH 1/3] Bump to .18

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index dd4911456..533ab8800 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 17
+build = 18

From b40abbf3ad06b8f93961deb8a50e4b12d6bd5c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Thu, 16 Jun 2022 12:22:01 +0200
Subject: [PATCH 2/3] Tryfix Portduino Radiolib

---
 src/mesh/RadioLibInterface.cpp | 13 +++++++++++++
 src/mesh/RadioLibInterface.h   |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
index afec06ba0..a7cadf2ad 100644
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -11,6 +11,17 @@
 // FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
 static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 
+#ifdef PORTDUINO
+
+void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes)
+{
+    concurrency::LockGuard g(spiLock);
+
+    Module::SPItransfer(cmd, reg, dataOut, dataIn, numBytes);
+}
+
+#else
+
 void LockingModule::SPIbeginTransaction()
 {
     spiLock->lock();
@@ -25,6 +36,8 @@ void LockingModule::SPIendTransaction()
     Module::SPIendTransaction();
 }
 
+#endif
+
 RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
                                      SPIClass &spi, PhysicalLayer *_iface)
     : NotifiedWorkerThread("RadioIf"), module(cs, irq, rst, busy, spi, spiSettings), iface(_iface)
diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h
index f940f8908..08aa84811 100644
--- a/src/mesh/RadioLibInterface.h
+++ b/src/mesh/RadioLibInterface.h
@@ -40,9 +40,13 @@ class LockingModule : public Module
         : Module(cs, irq, rst, gpio, spi, spiSettings)
     {
     }
-
+    
+#ifdef PORTDUINO
+    void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
+#else
     void SPIbeginTransaction() override;
     void SPIendTransaction() override;
+#endif
 };
 
 class RadioLibInterface : public RadioInterface, protected concurrency::NotifiedWorkerThread

From 3c6a2f7bb682dfe547344e1fe3d0e90a0e227f3b Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Thu, 16 Jun 2022 05:24:08 -0700
Subject: [PATCH 3/3] Bump to 1.3.19

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 533ab8800..6aa1edff3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 18
+build = 19