fixup! feat: add the STM32WL SUBGHZSPI to the SPI library

matthijskooijman · matthijskooijman · commit 490afe0c6965 · 2022-12-20T12:43:28.000+01:00
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
@@ -319,6 +319,10 @@ class SUBGHZSPIClass : public SPIClass {
     void transfer(uint8_t pin, void *_buf, size_t _count, SPITransferMode _mode = SPI_LAST);
     void transfer(byte _pin, void *_bufout, void *_bufin, size_t _count, SPITransferMode _mode = SPI_LAST);
     void enableDebugPins(uint32_t mosi = DEBUG_SUBGHZSPI_MOSI, uint32_t miso = DEBUG_SUBGHZSPI_MISO, uint32_t sclk = DEBUG_SUBGHZSPI_SCLK, uint32_t ssel = DEBUG_SUBGHZSPI_SS);
+
+    using SPIClass::beginTransaction;
+    using SPIClass::transfer;
+    using SPIClass::transfer16;
 };
 
 #endif
diff --git a/libraries/SPI/src/utility/spi_com.c b/libraries/SPI/src/utility/spi_com.c
@@ -238,7 +238,7 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
   uint32_t pull = 0;
 
 #if defined(SUBGHZSPI_BASE)
-  if (handle->Instance != SUBGHZSPI) {
+  if (obj->spi != SUBGHZSPI) {
 #endif
     // Determine the SPI to use
     SPI_TypeDef *spi_mosi = pinmap_peripheral(obj->pin_mosi, PinMap_SPI_MOSI);
@@ -262,19 +262,22 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
       core_debug("ERROR: SPI pins mismatch\n");
       return;
     }
-
-    // Configure the SPI pins
-    if (obj->pin_ssel != NC) {
-      handle->Init.NSS = SPI_NSS_HARD_OUTPUT;
-    } else {
-      handle->Init.NSS = SPI_NSS_SOFT;
-    }
 #if defined(SUBGHZSPI_BASE)
   } else {
-    handle->Init.NSS = SPI_NSS_SOFT;
+    if (obj->pin_mosi != NC || obj->pin_miso != NC || obj->pin_sclk != NC || obj->pin_ssel != NC) {
+      core_debug("ERROR: SUBGHZ_SPI cannot define custom pins\n");
+      return;
+    }
   }
 #endif
 
+  // Configure the SPI pins
+  if (obj->pin_ssel != NC) {
+    handle->Init.NSS = SPI_NSS_HARD_OUTPUT;
+  } else {
+    handle->Init.NSS = SPI_NSS_SOFT;
+  }
+
   /* Fill default value */
   handle->Instance               = obj->spi;
   handle->Init.Mode              = SPI_MODE_MASTER;
