Updated I2S examples: lower volume, hardware clarification

stm32-rs · Apr 10, 2021 · 15353c0 · 15353c0
1 parent cba55bc
commit 15353c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/examples/i2s-audio-out-dma.rs b/examples/i2s-audio-out-dma.rs
@@ -6,7 +6,7 @@
 //!
 //! # Hardware required
 //!
-//! * STM32F411E-DISCO evaluation board
+//! * STM32F407G-DISC1 or STM32F411E-DISCO evaluation board
 //! * Headphones or speakers with a headphone plug
 //!
 //! # Procedure
@@ -64,6 +64,11 @@ use stm32f4xx_hal::stm32::{DMA1, SPI3};
 
 use cs43l22::{Cs43L22, Register};
 
+/// Volume in decibels
+///
+/// Depending on your speakers, you may need to adjust this value.
+const VOLUME: i8 = -100;
+
 const SINE_SAMPLES: usize = 64;
 
 /// A sine wave spanning 64 samples
@@ -164,12 +169,9 @@ fn main() -> ! {
     // Word length 16 bits
     dac.write(Register::InterfaceCtl1, 0b0_0_0_0_01_11).unwrap();
 
-    // Reduce the headphone volume to make the demo less annoying
-    let headphone_volume = -30i8 as u8;
-    dac.write(Register::HeadphoneAVol, headphone_volume)
-        .unwrap();
-    dac.write(Register::HeadphoneBVol, headphone_volume)
-        .unwrap();
+    // Reduce the headphone volume something more comfortable
+    dac.write(Register::HeadphoneAVol, VOLUME as u8).unwrap();
+    dac.write(Register::HeadphoneBVol, VOLUME as u8).unwrap();
 
     // Power up DAC
     dac.write(Register::PowerCtl1, 0b1001_1110).unwrap();

diff --git a/examples/i2s-audio-out.rs b/examples/i2s-audio-out.rs
@@ -5,7 +5,7 @@
 //!
 //! # Hardware required
 //!
-//! * STM32F411E-DISCO evaluation board
+//! * STM32F407G-DISC1 or STM32F411E-DISCO evaluation board
 //! * Headphones or speakers with a headphone plug
 //!
 //! # Procedure
@@ -54,6 +54,11 @@ use stm32f4xx_hal::prelude::*;
 
 use cs43l22::{Cs43L22, Register};
 
+/// Volume in decibels
+///
+/// Depending on your speakers, you may need to adjust this value.
+const VOLUME: i8 = -100;
+
 /// A sine wave spanning 64 samples
 ///
 /// With a sample rate of 48 kHz, this produces a 750 Hz tone.
@@ -161,12 +166,9 @@ fn main() -> ! {
     // Word length 16 bits
     dac.write(Register::InterfaceCtl1, 0b0_0_0_0_01_11).unwrap();
 
-    // Reduce the headphone volume to make the demo less annoying
-    let headphone_volume = -30i8 as u8;
-    dac.write(Register::HeadphoneAVol, headphone_volume)
-        .unwrap();
-    dac.write(Register::HeadphoneBVol, headphone_volume)
-        .unwrap();
+    // Reduce the headphone volume something more comfortable
+    dac.write(Register::HeadphoneAVol, VOLUME as u8).unwrap();
+    dac.write(Register::HeadphoneBVol, VOLUME as u8).unwrap();
 
     // Power up DAC
     dac.write(Register::PowerCtl1, 0b1001_1110).unwrap();