Merge branch 'main' of https://github.com/pschatzmann/stm32f411-i2s

Author: pschatzmann

README.md

@@ -1,4 +1,4 @@
-# Arduino STM32F411 I2S Library
+# Arduino STM32 I2S Library
 
 I wanted to use __I2S__ in Arduino with my __STM32F411 Black Pill__ processor together with my [Arduino Audio Tools](https://github.com/pschatzmann/arduino-audio-tools)! 
 
@@ -18,15 +18,11 @@ My first trials failed miserably using the DMA versions of the HAL API, so I dec
 - Only __16bit__ data is supported
 - I also incuded the __codec drivers__ that are part of some stm32 evaluation boards. 
 
+Subsequently, I have extended the functionality to support other variants.
+
 ## Pins for I2S3
 
-FUNCTIONs  | BlackP | Disco
------------|--------|------
-MCK	       | PB10   | PC7
-BCK	       | PB3    | PC10
-WS (LRC)   | PA4	| PA4
-SD	       | PB5    | PC3
-ext_SD	   | PB4    | PC12
+See [src/stm32-config-i2s.h](https://github.com/pschatzmann/stm32-i2s/blob/main/src/stm32-config-i2s.h).
 
 ## Supported Sample Rates
 
@@ -55,6 +51,7 @@ using namespace stm32_i2s;
 
 SineWaveGenerator<int16_t> sineWave(32000);   // subclass of SoundGenerator with max amplitude of 32000
 I2SSettingsSTM32 i2s_settings;
+Stm32I2sClass I2S;
 int sample_rate = 8000;
 int channels = 1;
 
@@ -92,6 +89,7 @@ using namespace stm32_i2s;
 
 CsvStream<int16_t> out(Serial, 2); // ASCII output stream 
 I2SSettingsSTM32 i2s_settings;
+Stm32I2sClass I2S;
 
 void writeFromReceive(uint8_t *buffer, uint16_t byteCount, void*){
 	out.write(buffer, byteCount);
@@ -100,7 +98,7 @@ void writeFromReceive(uint8_t *buffer, uint16_t byteCount, void*){
 void setup() {
 	Serial.begin(115200);
 	i2s_settings.sample_rate = I2S_AUDIOFREQ_8K;
-	if (!I2s.beginReadDMA(i2s_settings, writeFromReceive){
+	if (!I2S.beginReadDMA(i2s_settings, writeFromReceive){
 		Serial.println("I2S Error");
 	}
 }
@@ -122,7 +120,7 @@ You can download the library as zip and call include Library -> zip library. Or
 
 ```
 cd  ~/Documents/Arduino/libraries
-git clone https://github.com/pschatzmann/stm32f411-i2s.git
+git clone https://github.com/pschatzmann/stm32-i2s.git
 ```
 
 I recommend to use git because you can easily update to the latest version just by executing the ```git pull``` command in the project folder.

library.properties

@@ -1,9 +1,9 @@
-name=stm32f411-i2s
+name=stm32-i2s
 version=0.0.1
 author=Phil Schatzmann
 maintainer=Phil Schatzmann
-sentence=i2s for STM32F04 Black Pill
-paragraph=i2s for STM32F04
+sentence=i2s for STM32 
+paragraph=i2s for STM32 Microcontroller
 category=Signal Input/Output
-url=https://github.com/pschatzmann/stm32f411-i2s
+url=https://github.com/pschatzmann/stm32-i2s
 architectures=stm32

src/stm32-config-i2s.h

@@ -1,9 +1,15 @@
 #pragma once
 
-#define I2S_BUFFER_SIZE 512
 #define STM32_I2S_WITH_OBJECT
 #define USE_FULL_ASSERT
 
+#ifndef I2S_FULLDUPLEXMODE_DISABLE
+#  define I2S_FULLDUPLEXMODE_DISABLE   (0x00000000U)
+#endif
+#ifndef I2S_FULLDUPLEXMODE_ENABLE
+#  define 	I2S_FULLDUPLEXMODE_ENABLE   (0x00000001U)
+#endif
+
 #ifdef ARDUINO_BLACKPILL_F411CE
   #define SPI_INSTANCE_FOR_I2S SPI3
   #define STM_I2S_PINS \
@@ -18,6 +24,8 @@
   #define PLLM  16
   #define PLLN 192
   #define PLLR   2
+  #define IS_F4
+
 #endif
 
 #ifdef ARDUINO_GENERIC_F411VETX
@@ -34,5 +42,46 @@
   #define PLLM   16
   #define PLLN   100
   #define PLLR    2
+  #define IS_F4
+
+#endif
+
+#ifdef STM32H750xx
+  #define SPI_INSTANCE_FOR_I2S SPI3
+  #define STM_I2S_PINS \
+    { \
+      {mclk, PC_7, GPIO_AF6_SPI3},\
+      {bck, PC_10, GPIO_AF6_SPI3},\
+      {ws, PA_4, GPIO_AF6_SPI3},\
+      {data_out, PB_2, GPIO_AF6_SPI3},\
+      {data_in, PC_11, GPIO_AF6_SPI3}\
+    };
+  #define IS_H7
+#endif
+
+#ifdef STM32H743xx
+  #define SPI_INSTANCE_FOR_I2S SPI3
+  #define STM_I2S_PINS \
+    { \
+      {mclk, PC_7, GPIO_AF6_SPI3},\
+      {bck, PC_10, GPIO_AF6_SPI3},\
+      {ws, PA_4, GPIO_AF6_SPI3},\
+      {data_out, PB_5, GPIO_AF6_SPI3},\
+      {data_in, PB_4, GPIO_AF6_SPI3}\
+    };
+  #define IS_H7
 #endif
 
+#ifdef STM32F723xx
+  #define SPI_INSTANCE_FOR_I2S SPI3
+  #define STM_I2S_PINS \
+    { \
+      {mclk, PC_7, GPIO_AF6_SPI3},\
+      {bck, PC_10, GPIO_AF6_SPI3},\
+      {ws, PA_4, GPIO_AF6_SPI3},\
+      {data_out, PC_12, GPIO_AF6_SPI3},\
+      {data_in, PC_11, GPIO_AF6_SPI3}\
+    };
+  #define IS_F7
+  #define SPI_CLOCK_SOURCE LL_RCC_SPI123_CLKSOURCE_PLL1Q
+#endif

src/stm32-i2s.cpp

@@ -1,61 +1,65 @@
 
 #include "stm32-i2s.h"
 
+#ifdef STM_I2S_PINS
+
 namespace stm32_i2s {
 
-Stm32I2sClass I2S;
+//Stm32I2sClass I2S;
+Stm32I2sClass *self_I2S = nullptr;
+
 bool stm32_i2s_is_error = false;
 
 extern "C" void HAL_I2S_TxCpltCallback(I2S_HandleTypeDef *hi2s) {
-  I2S.cb_TxRxComplete(hi2s);
+  self_I2S->cb_TxRxComplete(hi2s);
 }
 
 extern "C" void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
-  I2S.cb_TxRxHalfComplete(hi2s);
+  self_I2S->cb_TxRxHalfComplete(hi2s);
 }
 
 extern "C" void HAL_I2S_RxCpltCallback(I2S_HandleTypeDef *hi2s) {
-  I2S.cb_TxRxComplete(hi2s);
+  self_I2S->cb_TxRxComplete(hi2s);
 }
 
 extern "C" void HAL_I2S_RxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
-  I2S.cb_TxRxHalfComplete(hi2s);
+  self_I2S->cb_TxRxHalfComplete(hi2s);
 }
 
-extern "C" void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s) { Report_Error(); }
+extern "C" void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s) { Report_Error(10); }
 
 /**
  * @brief This function handles DMA1 stream0 global interrupt.
  */
-extern "C" void DMA1_Stream0_IRQHandler(void) { I2S.cb_dmaIrqRx(); }
+extern "C" void DMA1_Stream0_IRQHandler(void) { self_I2S->cb_dmaIrqRx(); }
 
 /**
  * @brief This function handles DMA1 stream5 global interrupt.
  */
-extern "C" void DMA1_Stream5_IRQHandler(void) { I2S.cb_dmaIrqTx(); }
+extern "C" void DMA1_Stream5_IRQHandler(void) { self_I2S->cb_dmaIrqTx(); }
 
 /**
  * @brief I2S MSP Initialization
  * This function configures the hardware resources used in this example
  * @param hi2s: I2S handle pointer
  * @retval None
  */
-extern "C" void HAL_I2S_MspInit(I2S_HandleTypeDef *hi2s) { I2S.cb_HAL_I2S_MspInit(hi2s); }
+extern "C" void HAL_I2S_MspInit(I2S_HandleTypeDef *hi2s) { self_I2S->cb_HAL_I2S_MspInit(hi2s); }
 
 /**
  * @brief I2S MSP De-Initialization
  * This function freeze the hardware resources used in this example
  * @param hi2s: I2S handle pointer
  * @retval None
  */
-extern "C" void HAL_I2S_MspDeInit(I2S_HandleTypeDef *hi2s) { I2S.cb_HAL_I2S_MspDeInit(hi2s); }
+extern "C" void HAL_I2S_MspDeInit(I2S_HandleTypeDef *hi2s) { self_I2S->cb_HAL_I2S_MspDeInit(hi2s); }
 /**
  * @brief  This function is executed in case of error occurrence.
  * @retval None
  */
-void Report_Error() {
+void Report_Error(int no) {
   stm32_i2s_is_error = true;
-  STM32_LOG("%s", "stm32-i2s: Error");
+  STM32_LOG("%s %d", "stm32-i2s: Error", no);
 }
 
 /**
@@ -68,8 +72,8 @@ void STM32_LOG(const char *fmt, ...) {
   va_start(arg, fmt);
   int len = vsnprintf(log_buffer + 7, 200, fmt, arg);
   va_end(arg);
-  Serial.println(log_buffer);
-  Serial.flush();
+  self_I2S->STM32_LOG(log_buffer);
+  va_end(arg);
 }
 
 #ifdef USE_FULL_ASSERT
@@ -90,3 +94,6 @@ extern "C" void assert_failed(uint8_t *file, uint32_t line) {
 #endif /* USE_FULL_ASSERT */
 
 }
+
+#endif // STM_I2S_PINS
+