feat: add the STM32WL SUBGHZSPI to the SPI library

majbthrd · fpistm · fpistm · commit 647708f7daa0 · 2022-09-29T17:59:49.000+02:00
Signed-off-by: Peter Lawrence &lt;12226419+majbthrd@users.noreply.github.com&gt;
Co-authored-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp
@@ -22,6 +22,9 @@ SPIClass::SPIClass() : _CSPinConfig(NO_CONFIG)
   _spi.pin_mosi = digitalPinToPinName(MOSI);
   _spi.pin_sclk = digitalPinToPinName(SCK);
   _spi.pin_ssel = NC;
+#if defined(SUBGHZSPI_BASE)
+  _spi.subghzspi_dbg = false;
+#endif
 }
 
 /**
@@ -49,6 +52,9 @@ SPIClass::SPIClass(uint32_t mosi, uint32_t miso, uint32_t sclk, uint32_t ssel) :
   _spi.pin_mosi = digitalPinToPinName(mosi);
   _spi.pin_sclk = digitalPinToPinName(sclk);
   _spi.pin_ssel = digitalPinToPinName(ssel);
+#if defined(SUBGHZSPI_BASE)
+  _spi.subghzspi_dbg = false;
+#endif
 }
 
 /**
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
@@ -151,6 +151,14 @@ class SPIClass {
       _spi.pin_ssel = (ssel);
     };
 
+#if defined(SUBGHZSPI_BASE)
+    void debug_SubGHzSPI_pins(bool state)
+    {
+      _spi.subghzspi_dbg = state;
+    };
+#endif
+
+
     void begin(uint8_t _pin = CS_PIN_CONTROLLED_BY_USER);
     void end(void);
 
diff --git a/libraries/SPI/src/utility/spi_com.c b/libraries/SPI/src/utility/spi_com.c
@@ -318,18 +318,23 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
   handle->Init.MasterKeepIOState = SPI_MASTER_KEEP_IO_STATE_ENABLE;  /* Recommended setting to avoid glitches */
 #endif
 
-  /* Configure SPI GPIO pins */
-  pinmap_pinout(obj->pin_mosi, PinMap_SPI_MOSI);
-  pinmap_pinout(obj->pin_miso, PinMap_SPI_MISO);
-  pinmap_pinout(obj->pin_sclk, PinMap_SPI_SCLK);
-  /*
-   * According the STM32 Datasheet for SPI peripheral we need to PULLDOWN
-   * or PULLUP the SCK pin according the polarity used.
-   */
-  pull = (handle->Init.CLKPolarity == SPI_POLARITY_LOW) ? GPIO_PULLDOWN : GPIO_PULLUP;
-  pin_PullConfig(get_GPIO_Port(STM_PORT(obj->pin_sclk)), STM_LL_GPIO_PIN(obj->pin_sclk), pull);
-  pinmap_pinout(obj->pin_ssel, PinMap_SPI_SSEL);
-
+#if defined(SUBGHZSPI_BASE)
+  if ((handle->Instance != SUBGHZSPI) || (obj->subghzspi_dbg)) {
+#endif
+    /* Configure SPI GPIO pins */
+    pinmap_pinout(obj->pin_mosi, PinMap_SPI_MOSI);
+    pinmap_pinout(obj->pin_miso, PinMap_SPI_MISO);
+    pinmap_pinout(obj->pin_sclk, PinMap_SPI_SCLK);
+    /*
+     * According the STM32 Datasheet for SPI peripheral we need to PULLDOWN
+     * or PULLUP the SCK pin according the polarity used.
+     */
+    pull = (handle->Init.CLKPolarity == SPI_POLARITY_LOW) ? GPIO_PULLDOWN : GPIO_PULLUP;
+    pin_PullConfig(get_GPIO_Port(STM_PORT(obj->pin_sclk)), STM_LL_GPIO_PIN(obj->pin_sclk), pull);
+    pinmap_pinout(obj->pin_ssel, PinMap_SPI_SSEL);
+#if defined(SUBGHZSPI_BASE)
+  }
+#endif
 #if defined SPI1_BASE
   // Enable SPI clock
   if (handle->Instance == SPI1) {
@@ -379,6 +384,14 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
   }
 #endif
 
+#if defined SUBGHZSPI_BASE
+  if (handle->Instance == SUBGHZSPI) {
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+    __HAL_RCC_SUBGHZSPI_FORCE_RESET();
+    __HAL_RCC_SUBGHZSPI_RELEASE_RESET();
+  }
+#endif
+
   HAL_SPI_Init(handle);
 
   /* In order to set correctly the SPI polarity we need to enable the peripheral */
@@ -448,6 +461,14 @@ void spi_deinit(spi_t *obj)
     __HAL_RCC_SPI6_CLK_DISABLE();
   }
 #endif
+
+#if defined SUBGHZSPI_BASE
+  if (handle->Instance == SUBGHZSPI) {
+    __HAL_RCC_SUBGHZSPI_FORCE_RESET();
+    __HAL_RCC_SUBGHZSPI_RELEASE_RESET();
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+  }
+#endif
 }
 
 /**
diff --git a/libraries/SPI/src/utility/spi_com.h b/libraries/SPI/src/utility/spi_com.h
@@ -61,6 +61,10 @@ struct spi_s {
   // See https://github.com/stm32duino/Arduino_Core_STM32/issues/1294
   uint32_t disable_delay;
 #endif
+#if defined(SUBGHZSPI_BASE)
+  /* True if debug pins need to be initialized */
+  bool subghzspi_dbg;
+#endif
 };
 
 typedef struct spi_s spi_t;
