WIP.

hackamp/firmware/src/main.rs

@@ -35,9 +35,19 @@ const APP: () = {
         let i2sclocks = unsafe { I2SClocks::init() };
 
         // Configure the GPIOs.
-        let gpiob = ctx.device.GPIOB.split();
-        let gpioc = ctx.device.GPIOC.split();
-        let _pins = Pins::configure();
+        let _pins = Pins::configure(
+            ctx.device.GPIOA,
+            ctx.device.GPIOB,
+            ctx.device.GPIOC,
+            ctx.device.GPIOD,
+            ctx.device.GPIOE,
+            ctx.device.GPIOF,
+            ctx.device.GPIOG,
+            ctx.device.DMA1,
+            ctx.device.SPI2,
+            ctx.device.I2S2EXT,
+            i2sclocks,
+        );
 
         // The components of the firmware are connected via audio buffers.
         static AMP_I2S_IN_BUFFER: AudioBuffer = AudioBuffer::new();
@@ -68,22 +78,6 @@ const APP: () = {
             }
         });
 
-        let dma = StreamsTuple::new(ctx.device.DMA1);
-        let mut i2s = I2S::new(
-            ctx.device.SPI2,
-            ctx.device.I2S2EXT,
-            dma.3,
-            dma.4,
-            gpioc.pc6.into_alternate_af5(),
-            gpiob.pb12.into_alternate_af5(),
-            gpiob.pb13.into_alternate_af5(),
-            gpiob.pb14.into_alternate_af6(),
-            gpiob.pb15.into_alternate_af5(),
-            &AMP_I2S_IN_BUFFER,
-            &AMP_I2S_OUT_BUFFER,
-            i2sclocks,
-        );
-
         i2s.start();
 
         // TODO: Resources.

hackamp/firmware/src/pins.rs

@@ -1,6 +1,11 @@
 //! GPIO pin configuration.
 #![warn(missing_docs)]
 
+use stm32f4xx_hal::prelude::*;
+use stm32f4xx_hal::stm32::{DMA1, GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, I2S2EXT, SPI2};
+
+use super::halext::i2s::{I2SClocks, I2S};
+
 /// Type which contains all GPIO pins.
 ///
 /// The pins are configured as the correct type. Whenever possible, the corresponding HAL driver is
@@ -11,7 +16,43 @@ pub struct Pins {
 
 impl Pins {
     /// Configures the GPIO pins and sets their initial value.
-    pub fn configure() -> Pins {
+    pub fn configure(
+        gpioa: GPIOA,
+        gpiob: GPIOB,
+        gpioc: GPIOC,
+        gpiod: GPIOD,
+        gpioe: GPIOE,
+        gpiof: GPIOF,
+        gpiog: GPIOG,
+        dma1: DMA1,
+        spi2: SPI2,
+        i2s2ext: I2S2EXT,
+        i2sclocks: I2SClocks,
+    ) -> Pins {
+        let gpioa = gpioa.split();
+        let gpiob = gpiob.split();
+        let gpioc = gpioc.split();
+        let gpiod = gpiod.split();
+        let gpioe = gpioe.split();
+        let gpiof = gpiof.split();
+        let gpiog = gpiog.split();
+
+        let dma = StreamsTuple::new(dma1);
+        let mut i2s = I2S::new(
+            spi2,
+            i2s2ext,
+            dma.3,
+            dma.4,
+            gpioc.pc6.into_alternate_af5(),
+            gpiob.pb12.into_alternate_af5(),
+            gpiob.pb13.into_alternate_af5(),
+            gpiob.pb14.into_alternate_af6(),
+            gpiob.pb15.into_alternate_af5(),
+            &AMP_I2S_IN_BUFFER,
+            &AMP_I2S_OUT_BUFFER,
+            i2sclocks,
+        );
+
         Pins{
             // TODO
         }

hackamp/hardware/bluetooth.kicad_sch

@@ -1204,23 +1204,23 @@
   (junction (at 214.63 26.67) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 236.22 153.67) (diameter 0.9144) (color 0 0 0 0))
 
-  (no_connect (at 257.81 74.93))
+  (no_connect (at 257.81 77.47))
+  (no_connect (at 257.81 46.99))
   (no_connect (at 257.81 69.85))
-  (no_connect (at 257.81 62.23))
-  (no_connect (at 217.17 24.13))
-  (no_connect (at 257.81 80.01))
-  (no_connect (at 257.81 87.63))
-  (no_connect (at 217.17 29.21))
-  (no_connect (at 109.22 157.48))
+  (no_connect (at 257.81 59.69))
+  (no_connect (at 246.38 146.05))
   (no_connect (at 109.22 160.02))
   (no_connect (at 257.81 67.31))
   (no_connect (at 257.81 85.09))
-  (no_connect (at 257.81 77.47))
-  (no_connect (at 246.38 146.05))
-  (no_connect (at 217.17 87.63))
-  (no_connect (at 257.81 59.69))
-  (no_connect (at 257.81 46.99))
+  (no_connect (at 257.81 62.23))
+  (no_connect (at 109.22 157.48))
   (no_connect (at 246.38 135.89))
+  (no_connect (at 257.81 87.63))
+  (no_connect (at 217.17 87.63))
+  (no_connect (at 217.17 24.13))
+  (no_connect (at 217.17 29.21))
+  (no_connect (at 257.81 74.93))
+  (no_connect (at 257.81 80.01))
 
   (wire (pts (xy 24.13 72.39) (xy 24.13 80.01))
     (stroke (width 0) (type solid) (color 0 0 0 0))

hackamp/hardware/fp-info-cache

@@ -1,4 +1,4 @@
-18265948801828957
+18265948802027957
 Battery
 BatteryHolder_Bulgin_BX0036_1xC
 Bulgin Battery Holder, BX0036, Battery Type C (https://www.bulgin.com/products/pub/media/bulgin/data/Battery_holders.pdf)

hackamp/hardware/front.kicad_sch

@@ -630,9 +630,9 @@
   (junction (at 261.62 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 266.7 77.47) (diameter 0.9144) (color 0 0 0 0))
 
-  (no_connect (at 60.96 115.57))
   (no_connect (at 48.26 115.57))
   (no_connect (at 234.95 128.27))
+  (no_connect (at 60.96 115.57))
   (no_connect (at 48.26 113.03))
 
   (wire (pts (xy 22.86 43.18) (xy 25.4 43.18))

hackamp/hardware/hackamp.kicad_pro

@@ -48,7 +48,13 @@
           "min_clearance": 0.508
         }
       },
-      "diff_pair_dimensions": [],
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
       "drc_exclusions": [],
       "meta": {
         "version": 1
@@ -110,10 +116,28 @@
         "solder_mask_clearance": 0.0,
         "solder_mask_min_width": 0.0,
         "solder_paste_clearance": 0.0,
-        "solder_paste_margin_ratio": 0.0
+        "solder_paste_margin_ratio": -0.0
       },
-      "track_widths": [],
-      "via_dimensions": [],
+      "track_widths": [
+        0.0,
+        0.25,
+        0.5,
+        1.0
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        },
+        {
+          "diameter": 0.6,
+          "drill": 0.3
+        },
+        {
+          "diameter": 1.0,
+          "drill": 0.5
+        }
+      ],
       "zones_allow_external_fillets": false,
       "zones_use_no_outline": true
     },
@@ -373,7 +397,7 @@
   },
   "sheets": [
     [
-      "6a82eebd-bbb0-445a-ae09-7b4335abfc11",
+      "36102a57-90ec-40eb-846d-56f559185757",
       ""
     ],
     [

hackamp/hardware/headphone-amp.kicad_sch

@@ -650,15 +650,15 @@
   (junction (at 191.77 36.83) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 201.93 111.76) (diameter 0.9144) (color 0 0 0 0))
 
-  (no_connect (at 217.17 116.84))
-  (no_connect (at 201.93 73.66))
+  (no_connect (at 162.56 96.52))
   (no_connect (at 162.56 93.98))
+  (no_connect (at 201.93 73.66))
   (no_connect (at 217.17 114.3))
-  (no_connect (at 127 109.22))
   (no_connect (at 127 104.14))
   (no_connect (at 162.56 88.9))
+  (no_connect (at 127 109.22))
   (no_connect (at 162.56 86.36))
-  (no_connect (at 162.56 96.52))
+  (no_connect (at 217.17 116.84))
 
   (wire (pts (xy 99.06 76.2) (xy 127 76.2))
     (stroke (width 0) (type solid) (color 0 0 0 0))

hackamp/hardware/processor.kicad_sch

@@ -1181,14 +1181,14 @@
   (junction (at 179.07 30.48) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 189.23 30.48) (diameter 0.9144) (color 0 0 0 0))
 
-  (no_connect (at 30.48 228.6))
+  (no_connect (at 31.75 181.61))
+  (no_connect (at 44.45 184.15))
   (no_connect (at 30.48 265.43))
   (no_connect (at 31.75 184.15))
+  (no_connect (at 44.45 181.61))
   (no_connect (at 31.75 176.53))
   (no_connect (at 31.75 179.07))
-  (no_connect (at 31.75 181.61))
-  (no_connect (at 44.45 184.15))
-  (no_connect (at 44.45 181.61))
+  (no_connect (at 30.48 228.6))
 
   (wire (pts (xy 20.32 233.68) (xy 20.32 236.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -1538,46 +1538,46 @@
   (wire (pts (xy 100.33 152.4) (xy 102.87 152.4))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 154.94) (xy 102.87 154.94))
+  (wire (pts (xy 100.33 162.56) (xy 102.87 162.56))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 157.48) (xy 102.87 157.48))
+  (wire (pts (xy 100.33 170.18) (xy 102.87 170.18))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 160.02) (xy 102.87 160.02))
+  (wire (pts (xy 102.87 58.42) (xy 97.79 58.42))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 170.18) (xy 102.87 170.18))
+  (wire (pts (xy 102.87 63.5) (xy 87.63 63.5))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 185.42) (xy 102.87 185.42))
+  (wire (pts (xy 102.87 66.04) (xy 97.79 66.04))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 187.96) (xy 102.87 187.96))
+  (wire (pts (xy 102.87 86.36) (xy 92.71 86.36))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 190.5) (xy 102.87 190.5))
+  (wire (pts (xy 102.87 137.16) (xy 100.33 137.16))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 193.04) (xy 102.87 193.04))
+  (wire (pts (xy 102.87 154.94) (xy 100.33 154.94))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 195.58) (xy 102.87 195.58))
+  (wire (pts (xy 102.87 157.48) (xy 100.33 157.48))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 102.87 58.42) (xy 97.79 58.42))
+  (wire (pts (xy 102.87 160.02) (xy 100.33 160.02))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 102.87 63.5) (xy 87.63 63.5))
+  (wire (pts (xy 102.87 187.96) (xy 100.33 187.96))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 102.87 66.04) (xy 97.79 66.04))
+  (wire (pts (xy 102.87 190.5) (xy 100.33 190.5))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 102.87 86.36) (xy 92.71 86.36))
+  (wire (pts (xy 102.87 193.04) (xy 100.33 193.04))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 102.87 137.16) (xy 100.33 137.16))
+  (wire (pts (xy 102.87 195.58) (xy 100.33 195.58))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
   (wire (pts (xy 107.95 20.32) (xy 107.95 22.86))
@@ -1796,21 +1796,6 @@
   (wire (pts (xy 158.75 30.48) (xy 148.59 30.48))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 163.83 50.8) (xy 166.37 50.8))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 163.83 53.34) (xy 166.37 53.34))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 163.83 55.88) (xy 166.37 55.88))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 163.83 58.42) (xy 166.37 58.42))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 163.83 60.96) (xy 166.37 60.96))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
   (wire (pts (xy 163.83 63.5) (xy 166.37 63.5))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
@@ -1838,12 +1823,6 @@
   (wire (pts (xy 163.83 144.78) (xy 166.37 144.78))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 163.83 170.18) (xy 166.37 170.18))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 163.83 172.72) (xy 166.37 172.72))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
   (wire (pts (xy 163.83 175.26) (xy 166.37 175.26))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
@@ -1871,6 +1850,21 @@
   (wire (pts (xy 163.83 218.44) (xy 166.37 218.44))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
+  (wire (pts (xy 166.37 50.8) (xy 163.83 50.8))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 166.37 53.34) (xy 163.83 53.34))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 166.37 55.88) (xy 163.83 55.88))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 166.37 58.42) (xy 163.83 58.42))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 166.37 60.96) (xy 163.83 60.96))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
   (wire (pts (xy 166.37 88.9) (xy 163.83 88.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
@@ -1886,6 +1880,12 @@
   (wire (pts (xy 166.37 116.84) (xy 163.83 116.84))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
+  (wire (pts (xy 166.37 137.16) (xy 163.83 137.16))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 166.37 139.7) (xy 163.83 139.7))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
   (wire (pts (xy 166.37 142.24) (xy 163.83 142.24))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
@@ -2047,58 +2047,58 @@
   (hierarchical_label "BT_I2C_SCL" (shape input) (at 100.33 139.7 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL8" (shape output) (at 100.33 142.24 180)
+  (hierarchical_label "VOL0" (shape output) (at 100.33 142.24 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL9" (shape output) (at 100.33 144.78 180)
+  (hierarchical_label "VOL1" (shape output) (at 100.33 144.78 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL10" (shape output) (at 100.33 147.32 180)
+  (hierarchical_label "VOL2" (shape output) (at 100.33 147.32 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL11" (shape output) (at 100.33 149.86 180)
+  (hierarchical_label "VOL3" (shape output) (at 100.33 149.86 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL12" (shape output) (at 100.33 152.4 180)
+  (hierarchical_label "VOL4" (shape output) (at 100.33 152.4 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL13" (shape output) (at 100.33 154.94 180)
+  (hierarchical_label "VOL5" (shape output) (at 100.33 154.94 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL14" (shape output) (at 100.33 157.48 180)
+  (hierarchical_label "VOL6" (shape output) (at 100.33 157.48 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL15" (shape output) (at 100.33 160.02 180)
+  (hierarchical_label "VOL7" (shape output) (at 100.33 160.02 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL0" (shape output) (at 100.33 185.42 180)
+  (hierarchical_label "VOL8" (shape output) (at 100.33 162.56 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL1" (shape output) (at 100.33 187.96 180)
+  (hierarchical_label "PWR" (shape input) (at 100.33 187.96 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL2" (shape output) (at 100.33 190.5 180)
+  (hierarchical_label "MIC1" (shape input) (at 100.33 190.5 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL3" (shape output) (at 100.33 193.04 180)
+  (hierarchical_label "MIC2" (shape input) (at 100.33 193.04 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "VOL4" (shape output) (at 100.33 195.58 180)
+  (hierarchical_label "BT1" (shape input) (at 100.33 195.58 180)
     (effects (font (size 1.27 1.27)) (justify right))
   )
-  (hierarchical_label "PWR" (shape input) (at 166.37 50.8 0)
+  (hierarchical_label "VOL11" (shape output) (at 166.37 50.8 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "MIC1" (shape input) (at 166.37 53.34 0)
+  (hierarchical_label "VOL12" (shape output) (at 166.37 53.34 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "MIC2" (shape input) (at 166.37 55.88 0)
+  (hierarchical_label "VOL13" (shape output) (at 166.37 55.88 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "BT1" (shape input) (at 166.37 58.42 0)
+  (hierarchical_label "VOL14" (shape output) (at 166.37 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "BT2" (shape input) (at 166.37 60.96 0)
+  (hierarchical_label "VOL15" (shape output) (at 166.37 60.96 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
   (hierarchical_label "ENC_A" (shape input) (at 166.37 63.5 0)
@@ -2134,22 +2134,22 @@
   (hierarchical_label "AMP_I2S_CK" (shape input) (at 166.37 119.38 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "AMP_I2S_SDI" (shape input) (at 166.37 142.24 0)
+  (hierarchical_label "VOL9" (shape output) (at 166.37 137.16 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "AMP_I2S_SDO" (shape input) (at 166.37 144.78 0)
+  (hierarchical_label "VOL10" (shape output) (at 166.37 139.7 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "AMP_I2S_MCK" (shape input) (at 166.37 152.4 0)
+  (hierarchical_label "AMP_I2S_SDI" (shape input) (at 166.37 142.24 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "VOL5" (shape output) (at 166.37 170.18 0)
+  (hierarchical_label "AMP_I2S_SDO" (shape input) (at 166.37 144.78 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "VOL6" (shape output) (at 166.37 172.72 0)
+  (hierarchical_label "AMP_I2S_MCK" (shape input) (at 166.37 152.4 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
-  (hierarchical_label "VOL7" (shape output) (at 166.37 175.26 0)
+  (hierarchical_label "BT2" (shape input) (at 166.37 175.26 0)
     (effects (font (size 1.27 1.27)) (justify left))
   )
   (hierarchical_label "BT_P31" (shape input) (at 166.37 200.66 0)