Fixed i2s problems. Thanks Greg.

Author: boblark

output_i2s_quad_f32.cpp

@@ -36,29 +36,20 @@
 // This version is 4 channel I2S output.  Greg Raven KF5N October, 2025
 
 #include "output_i2s_quad_f32.h"
-#include "output_i2s_f32.h" // Required for 2 channel to be a "friend" so its I2S configuration method can be used.
-#include <arm_math.h>
-#include <utility/imxrt_hw.h> // From Teensy Audio library.  For set_audioClock().
 
 DMAChannel AudioOutputI2SQuad_F32::dma(false);
 DMAMEM __attribute__((aligned(32))) static float32_t i2s_tx_buffer[AUDIO_BLOCK_SAMPLES * 4]; // 4 channels 128 samples each, total = 512.
 
-void AudioOutputI2SQuad_F32::begin(void)
-{
-    bool transferUsing32bit = false;
-    begin(transferUsing32bit);
-}
-
-void AudioOutputI2SQuad_F32::begin(bool transferUsing32bit)
+void AudioOutputI2SQuad_F32::begin()
 {
     // Configure most of the I2S.
-    AudioOutputI2S_F32::config_i2s(transferUsing32bit);
-    // Configure the rest of the I2S unique to quad output.
-    I2S1_RCSR |= I2S_RCSR_RE | I2S_RCSR_BCE;
-    I2S1_TCSR = I2S_TCSR_TE | I2S_TCSR_BCE | I2S_TCSR_FRDE;
-    I2S1_TCR3 = I2S_TCR3_TCE_2CH;
+    AudioOutputI2SQuad_F32::config_i2s(sample_rate_Hz);
+
+    // Configure the I2S output pins.
     CORE_PIN7_CONFIG = 3;  // Teensy pin 7 is 1st and 2nd channels of I2S (Audio Adapter on Teensy 4.1).
     CORE_PIN32_CONFIG = 3; // Teensy pin 32 is 3rd and 4th channels of I2S.
+
+    // Zero the transmit buffer.
     memset(i2s_tx_buffer, 0, sizeof(i2s_tx_buffer));
 
     // Configure the DMA channel.
@@ -81,6 +72,11 @@ void AudioOutputI2SQuad_F32::begin(bool transferUsing32bit)
     update_responsibility = update_setup();
     dma.enable();
     enabled = 1; // What is this?
+
+    // Configure the rest of the I2S unique to quad output.
+    I2S1_RCSR |= I2S_RCSR_RE | I2S_RCSR_BCE;
+    I2S1_TCSR = I2S_TCSR_TE | I2S_TCSR_BCE | I2S_TCSR_FRDE;
+    I2S1_TCR3 = I2S_TCR3_TCE_2CH;
 }
 
 // Interrupt service routine called twice per update by the DMA.
@@ -280,12 +276,7 @@ void AudioOutputI2SQuad_F32::update(void)
 }
 
 // Configure the I2S peripheral.  This is most, but not all, of the configuration.  The rest is done by begin().
-// Note that the version of this method can be called from the dual channel object via "friend".
-void AudioOutputI2SQuad_F32::config_i2s(void) { config_i2s(false, AudioOutputI2SQuad_F32::sample_rate_Hz); }
-void AudioOutputI2SQuad_F32::config_i2s(bool transferUsing32bit) { config_i2s(transferUsing32bit, AudioOutputI2SQuad_F32::sample_rate_Hz); }
-void AudioOutputI2SQuad_F32::config_i2s(float fs_Hz) { config_i2s(false, fs_Hz); }
-
-void AudioOutputI2SQuad_F32::config_i2s(bool transferUsing32bit, float fs_Hz)
+void AudioOutputI2SQuad_F32::config_i2s(int fs_Hz)
 {
     CCM_CCGR5 |= CCM_CCGR5_SAI1(CCM_CCGR_ON);
 

output_i2s_quad_f32.h

@@ -39,9 +39,9 @@
 #define output_i2s_quad_f32_h_
 
 #include <Arduino.h>
-#include <arm_math.h>
 #include "AudioStream_F32.h"
 #include "DMAChannel.h"
+#include <utility/imxrt_hw.h> // From Teensy Audio library.  For set_audioClock().
 
 class AudioOutputI2SQuad_F32 : public AudioStream_F32
 {
@@ -65,29 +65,25 @@ class AudioOutputI2SQuad_F32 : public AudioStream_F32
 	{
 		outputScale = _oscale;
 	}
-	virtual void update(void);
-	void begin(void);
-	void begin(bool);
-	void scale_f32_to_i32(float32_t *p_f32, int len);
 
 protected:
 	AudioOutputI2SQuad_F32(int dummy) : AudioStream_F32(4, inputQueueArray) {} // to be used only inside AudioOutputI2Sslave !!
 
+	void begin();
 	inline static audio_block_f32_t *block_left_1st = nullptr;
 	inline static audio_block_f32_t *block_right_1st = nullptr;
 	inline static audio_block_f32_t *block_left_2nd = nullptr;
 	inline static audio_block_f32_t *block_right_2nd = nullptr;
 	inline static bool update_responsibility = false;
 	static DMAChannel dma;
 	static void isr(void);
+	virtual void update(void);
 
 private:
-	static void config_i2s(void);
-	static void config_i2s(bool);
-	static void config_i2s(float);
-	static void config_i2s(bool, float);
+	static void config_i2s(int fs_Hz);
+	void scale_f32_to_i32(float32_t *p_f32, int len);
 	audio_block_f32_t *inputQueueArray[4];
-	inline static float sample_rate_Hz = AUDIO_SAMPLE_RATE;
+	inline static int sample_rate_Hz = AUDIO_SAMPLE_RATE;
 	inline static int audio_block_samples = AUDIO_BLOCK_SAMPLES;
 	inline static int half_block_length = AUDIO_BLOCK_SAMPLES / 2;
 	inline static int half_buffer_length = AUDIO_BLOCK_SAMPLES * 2;
@@ -96,6 +92,7 @@ class AudioOutputI2SQuad_F32 : public AudioStream_F32
 	float outputScale = 1.0f; // Quick volume control
 };
 
+// Quad slave not implemented.  Greg Raven KF5N November 2025
 class AudioOutputI2SQuadslave_F32 : public AudioOutputI2SQuad_F32
 {
 public: