From 9b46cb4ef08688a2f424c76d8425561e4f5db844 Mon Sep 17 00:00:00 2001
From: Woutvstk <119763111+Woutvstk@users.noreply.github.com>
Date: Fri, 14 Feb 2025 19:53:22 +0100
Subject: [PATCH] Rak4631 remove spi1 (#6042)

* Removed non-existant SPI1 interface on rak4631

* trunk fmt
---
 src/detect/einkScan.h      | 16 ++++++++--------
 variants/rak4631/variant.h | 18 +++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/detect/einkScan.h b/src/detect/einkScan.h
index d20c7b6e5..5bc218d00 100644
--- a/src/detect/einkScan.h
+++ b/src/detect/einkScan.h
@@ -6,28 +6,28 @@
 
 void d_writeCommand(uint8_t c)
 {
-    SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+    SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
     if (PIN_EINK_DC >= 0)
         digitalWrite(PIN_EINK_DC, LOW);
     if (PIN_EINK_CS >= 0)
         digitalWrite(PIN_EINK_CS, LOW);
-    SPI1.transfer(c);
+    SPI.transfer(c);
     if (PIN_EINK_CS >= 0)
         digitalWrite(PIN_EINK_CS, HIGH);
     if (PIN_EINK_DC >= 0)
         digitalWrite(PIN_EINK_DC, HIGH);
-    SPI1.endTransaction();
+    SPI.endTransaction();
 }
 
 void d_writeData(uint8_t d)
 {
-    SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+    SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
     if (PIN_EINK_CS >= 0)
         digitalWrite(PIN_EINK_CS, LOW);
-    SPI1.transfer(d);
+    SPI.transfer(d);
     if (PIN_EINK_CS >= 0)
         digitalWrite(PIN_EINK_CS, HIGH);
-    SPI1.endTransaction();
+    SPI.endTransaction();
 }
 
 unsigned long d_waitWhileBusy(uint16_t busy_time)
@@ -53,7 +53,7 @@ unsigned long d_waitWhileBusy(uint16_t busy_time)
 
 void scanEInkDevice(void)
 {
-    SPI1.begin();
+    SPI.begin();
     d_writeCommand(0x22);
     d_writeData(0x83);
     d_writeCommand(0x20);
@@ -62,6 +62,6 @@ void scanEInkDevice(void)
         LOG_DEBUG("EInk display found");
     else
         LOG_DEBUG("EInk display not found");
-    SPI1.end();
+    SPI.end();
 }
 #endif
\ No newline at end of file
diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
index bc5541336..f50f3b880 100644
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -107,15 +107,11 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * SPI Interfaces
  */
-#define SPI_INTERFACES_COUNT 2
+#define SPI_INTERFACES_COUNT 1
 
-#define PIN_SPI_MISO (45)
-#define PIN_SPI_MOSI (44)
-#define PIN_SPI_SCK (43)
-
-#define PIN_SPI1_MISO (29) // (0 + 29)
-#define PIN_SPI1_MOSI (30) // (0 + 30)
-#define PIN_SPI1_SCK (3)   // (0 + 3)
+#define PIN_SPI_MISO (29)
+#define PIN_SPI_MOSI (30)
+#define PIN_SPI_SCK (3)
 
 static const uint8_t SS = 42;
 static const uint8_t MOSI = PIN_SPI_MOSI;
@@ -130,8 +126,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_BUSY (0 + 4)
 #define PIN_EINK_DC (0 + 17)
 #define PIN_EINK_RES (-1)
-#define PIN_EINK_SCLK (0 + 3)
-#define PIN_EINK_MOSI (0 + 30) // also called SDI
+#define PIN_EINK_SCLK PIN_SPI_SCK
+#define PIN_EINK_MOSI PIN_SPI_MOSI // also called SDI
 
 // #define USE_EINK
 
@@ -259,7 +255,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 
 #define PIN_ETHERNET_RESET 21
 #define PIN_ETHERNET_SS PIN_EINK_CS
-#define ETH_SPI_PORT SPI1
+#define ETH_SPI_PORT SPI
 #define AQ_SET_PIN 10
 
 #ifdef __cplusplus