Remove aligned dependency

Author: kalkyl

examples/i2s-controller-demo/Cargo.toml

@@ -12,7 +12,6 @@ cortex-m = "0.6.2"
 cortex-m-rtic = "0.5.3"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-aligned = "0.3.4"
 heapless = "0.5.5"
 small_morse = "0.1.0"
 

examples/i2s-controller-demo/src/main.rs

@@ -5,7 +5,6 @@
 // Generates Morse code audio signals for text from UART, playing back over I2S
 // Tested with nRF52840-DK and a UDA1334a DAC
 
-use aligned::{Aligned, A4};
 use embedded_hal::digital::v2::{InputPin, OutputPin};
 use heapless::{
     consts::*,
@@ -30,6 +29,9 @@ use {
     rtt_target::{rprintln, rtt_init_print},
 };
 
+#[repr(align(4))]
+struct Aligned<T: ?Sized>(T);
+
 #[rtic::app(device = crate::hal::pac, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
 const APP: () = {
     struct Resources {
@@ -53,14 +55,14 @@ const APP: () = {
     #[init(resources = [queue], spawn = [tick])]
     fn init(mut ctx: init::Context) -> init::LateResources {
         // The I2S buffer address must be 4 byte aligned.
-        static mut MUTE_BUF: Aligned<A4, [i16; 32]> = Aligned([0i16; 32]);
-        static mut SIGNAL_BUF: Aligned<A4, [i16; 32]> = Aligned([0i16; 32]);
+        static mut MUTE_BUF: Aligned<[i16; 32]> = Aligned([0i16; 32]);
+        static mut SIGNAL_BUF: Aligned<[i16; 32]> = Aligned([0i16; 32]);
 
         // Fill signal buffer with triangle waveform, 2 channels interleaved
-        let len = SIGNAL_BUF.len() / 2;
+        let len = SIGNAL_BUF.0.len() / 2;
         for x in 0..len {
-            SIGNAL_BUF[2 * x] = triangle_wave(x as i32, len, 2048, 0, 1) as i16;
-            SIGNAL_BUF[2 * x + 1] = triangle_wave(x as i32, len, 2048, 0, 1) as i16;
+            SIGNAL_BUF.0[2 * x] = triangle_wave(x as i32, len, 2048, 0, 1) as i16;
+            SIGNAL_BUF.0[2 * x + 1] = triangle_wave(x as i32, len, 2048, 0, 1) as i16;
         }
 
         let _clocks = hal::clocks::Clocks::new(ctx.device.CLOCK).enable_ext_hfosc();
@@ -126,9 +128,9 @@ const APP: () = {
             led: p0.p0_13.into_push_pull_output(Level::High).degrade(),
             uarte,
             uarte_timer: Timer::new(ctx.device.TIMER0),
-            transfer: i2s.tx(&**MUTE_BUF).ok(),
-            signal_buf: &**SIGNAL_BUF,
-            mute_buf: &**MUTE_BUF,
+            transfer: i2s.tx(&MUTE_BUF.0).ok(),
+            signal_buf: &SIGNAL_BUF.0,
+            mute_buf: &MUTE_BUF.0,
         }
     }
 

examples/i2s-peripheral-demo/Cargo.toml

@@ -12,7 +12,6 @@ cortex-m = "0.6.2"
 cortex-m-rtic = "0.5.3"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
-aligned = "0.3.4"
 
 [dependencies.embedded-hal]
 version = "0.2.3"

examples/i2s-peripheral-demo/src/main.rs

@@ -4,7 +4,6 @@
 // I2S `peripheral mode` demo
 // Signal average level indicator using an RGB LED (APA102 on ItsyBitsy nRF52840)
 
-use aligned::{Aligned, A4};
 use embedded_hal::blocking::spi::Write;
 use {
     core::{
@@ -21,6 +20,9 @@ use {
     rtt_target::{rprintln, rtt_init_print},
 };
 
+#[repr(align(4))]
+struct Aligned<T: ?Sized>(T);
+
 const OFF: [u8; 9] = [0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF];
 const GREEN: [u8; 9] = [0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x10, 0x00, 0xFF];
 const ORANGE: [u8; 9] = [0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x10, 0x10, 0xFF];
@@ -36,7 +38,7 @@ const APP: () = {
     #[init]
     fn init(ctx: init::Context) -> init::LateResources {
         // The I2S buffer address must be 4 byte aligned.
-        static mut RX_BUF: Aligned<A4, [i16; 128]> = Aligned([0; 128]);
+        static mut RX_BUF: Aligned<[i16; 128]> = Aligned([0; 128]);
 
         let _clocks = hal::clocks::Clocks::new(ctx.device.CLOCK).enable_ext_hfosc();
         rtt_init_print!();
@@ -80,7 +82,7 @@ const APP: () = {
         );
         init::LateResources {
             rgb,
-            transfer: i2s.rx(&mut **RX_BUF).ok(),
+            transfer: i2s.rx(&mut RX_BUF.0).ok(),
         }
     }