WIP: Trying out the I2S traits

Author: maxekman

.vscode/.cortex-debug.peripherals.state.json

@@ -0,0 +1 @@
+[]

.vscode/.cortex-debug.registers.state.json

@@ -0,0 +1 @@
+[]

.vscode/tasks.json

@@ -1,63 +1,55 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558 
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            /*
-             * This is the default cargo build task,
-             * but we need to provide a label for it,
-             * so we can invoke it from the debug launcher.
-             */
-            "label": "cargo build",
-            "type": "process",
-            "command": "cargo",
-            "args": ["build"],
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        },
-        {
-            "label": "cargo build --release",
-            "type": "process",
-            "command": "cargo",
-            "args": ["build", "--release"],
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "group": "build"
-        },
-        {
-            "label": "cargo build --examples",
-            "type": "process",
-            "command": "cargo",
-            "args": ["build","--examples"],
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "group": "build"
-        },
-        {
-            "label": "cargo build --examples --release",
-            "type": "process",
-            "command": "cargo",
-            "args": ["build","--examples", "--release"],
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "group": "build"
-        },
-        {
-            "label": "cargo clean",
-            "type": "process",
-            "command": "cargo",
-            "args": ["clean"],
-            "problemMatcher": [],
-            "group": "build"
-        },
-    ]
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      /*
+       * This is the default cargo build task,
+       * but we need to provide a label for it,
+       * so we can invoke it from the debug launcher.
+       */
+      "label": "cargo build",
+      "type": "process",
+      "command": "cargo",
+      "args": ["build"],
+      "problemMatcher": ["$rustc"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "cargo build --release",
+      "type": "process",
+      "command": "cargo",
+      "args": ["build", "--release"],
+      "problemMatcher": ["$rustc"],
+      "group": "build"
+    },
+    {
+      "label": "cargo build --examples",
+      "type": "process",
+      "command": "cargo",
+      "args": ["build", "--example", "audio"],
+      "problemMatcher": ["$rustc"],
+      "group": "build"
+    },
+    {
+      "label": "cargo build --examples --release",
+      "type": "process",
+      "command": "cargo",
+      "args": ["build", "--examples", "--release"],
+      "problemMatcher": ["$rustc"],
+      "group": "build"
+    },
+    {
+      "label": "cargo clean",
+      "type": "process",
+      "command": "cargo",
+      "args": ["clean"],
+      "problemMatcher": [],
+      "group": "build"
+    }
+  ]
 }

Cargo.toml

@@ -22,7 +22,10 @@ readme = "README.md"
 accelerometer = "0.11.0"
 cortex-m = "0.6"
 cortex-m-rt = "0.6"
-lis302dl = "0.1.0"
+# lis302dl = "0.1.0"
+
+[dependencies.lis302dl]
+path = "../lis302dl"
 
 [dependencies.cs43l22]
 # git = "https://github.com/maxekman/cs43l22/"
@@ -35,7 +38,7 @@ path = "../cs43l22"
 features = ["unproven"]
 # version = "0.2.3"
 # git = "https://github.com/eldruin/embedded-hal/"
-# branch = "i2s"
+# branch = "i2s-v0.2.x"
 path = "../embedded-hal"
 
 [dependencies.stm32f4xx-hal]

examples/audio.rs

@@ -11,6 +11,7 @@ use cortex_m_rt::entry;
 use stm32f407g_disc as board;
 
 use crate::board::{audio_out::AudioOut, hal::delay::Delay, hal::prelude::*, hal::stm32};
+use embedded_hal::blocking::i2s::Write;
 
 use cortex_m_log::println;
 use cortex_m_log::{destination::Itm, printer::itm::InterruptSync as InterruptSyncItm};
@@ -48,12 +49,17 @@ fn main() -> ! {
     );
 
     println!(log, "Starting audio");
+    play_sawtooth(&mut audio_out.i2s);
+}
+
+// Demonstrating decoupling of audio device and application code using the
+// embedded-hal trait for I2S.
+fn play_sawtooth(i2s: &mut impl Write<u16>) -> ! {
     let mut s: u16 = 0;
     let mut y: u16 = 100;
     loop {
-        // Send both left and right word.
-        audio_out.i2s.send(s).unwrap();
-        audio_out.i2s.send(s).unwrap();
+        // Send both left and right word (without buffering).
+        i2s.try_write(&[s], &[s]);
 
         // Sawtooth with incrementing pitch each cycle.
         if s >= (65535 - y) {

openocd.gdb

@@ -19,14 +19,8 @@ break main
 # 168000000 is the core clock frequency
 monitor tpiu config internal itm.txt uart off 168000000
 
-
-# # send captured ITM to the file itm.fifo
-# # (the microcontroller SWO pin must be connected to the programmer SWO pin)
-# # 16000000 must match the core clock frequency
-monitor tpiu config internal itm.txt uart off 168000000
-
-# # OR: make the microcontroller SWO pin output compatible with UART (8N1)
-# # 8000000 is the frequency of the SWO pin
+# OR: make the microcontroller SWO (PB3) pin output compatible with UART (8N1)
+# 8000000 is the frequency of the SWO pin
 # monitor tpiu config external uart off 8000000 2000000
 
 # # enable ITM port 1