Reverting unintended changes

Cargo.toml

@@ -63,16 +63,15 @@ rand_xorshift = "0.3.0"
 rand_core = "0.6.4"
 minimq = "0.8.0"
 # patch with https://github.com/rust-embedded-community/usb-device/pull/129
-usbd-serial = {path = "../../rust-embedded-community/usbd-serial"}
+usb-device = "0.2.9"
+usbd-serial = "0.1.1"
 # Keep this synced with the miniconf version in py/setup.py
 miniconf = "0.9.0"
 smoltcp-nal = { version = "0.4.1", features = ["shared-stack"]}
 bbqueue = "0.5"
-usb-device = { path = "../../rust-embedded-community/usb-device" }
 
 [dependencies.stm32h7xx-hal]
-path = "../stm32h7xx-hal"
-#version = "0.15.0"
+version = "0.15.0"
 features = ["stm32h743v", "rt", "ethernet", "xspi", "usb_hs"]
 
 [features]

memory.x

@@ -44,9 +44,3 @@ BUG(cortex-m-rt): .itcm is not 8-byte aligned");
 
 ASSERT(__siitcm % 4 == 0, "
 BUG(cortex-m-rt): the LMA of .itcm is not 4-byte aligned");
-
-/* Place the stack in AXISRAM.
- * Note: This is done because the sequential-storage crate needs to buffer flash sectors on
- * the stack, each of which are 128KB. This can cause for excessive stack sizes.
- */
-_stack_start = ORIGIN(AXISRAM) + LENGTH(AXISRAM);

src/bin/dual-iir.rs

@@ -67,7 +67,7 @@ const BATCH_SIZE: usize = 8;
 
 // The logarithm of the number of 100MHz timer ticks between each sample. With a value of 2^7 =
 // 128, there is 1.28uS per sample, corresponding to a sampling frequency of 781.25 KHz.
-const SAMPLE_TICKS_LOG2: u8 = 8;
+const SAMPLE_TICKS_LOG2: u8 = 7;
 const SAMPLE_TICKS: u32 = 1 << SAMPLE_TICKS_LOG2;
 const SAMPLE_PERIOD: f32 =
     SAMPLE_TICKS as f32 * hardware::design_parameters::TIMER_PERIOD;

src/bin/lockin.rs

@@ -37,7 +37,7 @@ use core::{
 use fugit::ExtU64;
 use mutex_trait::prelude::*;
 
-use idsp::{Accu, Complex, ComplexExt, Filter, Lockin, Lowpass, Repeat, RPLL};
+use idsp::{Accu, Chain, Complex, ComplexExt, Filter, Lockin, Lowpass, RPLL};
 
 use stabilizer::{
     hardware::{
@@ -237,7 +237,7 @@ mod app {
         adcs: (Adc0Input, Adc1Input),
         dacs: (Dac0Output, Dac1Output),
         pll: RPLL,
-        lockin: Lockin<Repeat<2, Lowpass<2>>>,
+        lockin: Lockin<Chain<2, Lowpass<2>>>,
         signal_generator: signal_generator::SignalGenerator,
         generator: FrameGenerator,
         cpu_temp_sensor: stabilizer::hardware::cpu_temp_sensor::CpuTempSensor,

src/hardware/setup.rs

@@ -1061,11 +1061,9 @@ pub fn setup(
             usb_bus.as_ref().unwrap(),
             usb_device::device::UsbVidPid(0x1209, 0x392F),
         )
-        .strings(&[usb_device::device::StringDescriptors::default()
-            .manufacturer("ARTIQ/Sinara")
-            .product("Stabilizer")
-            .serial_number(serial_number.as_ref().unwrap())])
-        .unwrap()
+        .manufacturer("ARTIQ/Sinara")
+        .product("Stabilizer")
+        .serial_number(serial_number.as_ref().unwrap())
         .device_class(usbd_serial::USB_CLASS_CDC)
         .build();