forked from M-Labs/nix-scripts
pounder patch: fix mqtt max tree depth
This commit is contained in:
parent
aada46a6c9
commit
a75d445b9e
@ -216,7 +216,7 @@ index 025f7d4f..59578cce 100644
|
||||
fn add_write(&mut self, register: Register, value: &[u8]) {
|
||||
let data = &mut self.data[self.index..];
|
||||
diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs
|
||||
index d4146cc2..e7f9cf28 100644
|
||||
index d4146cc2..0c72054d 100644
|
||||
--- a/src/bin/dual-iir.rs
|
||||
+++ b/src/bin/dual-iir.rs
|
||||
@@ -28,7 +28,7 @@
|
||||
@ -263,7 +263,13 @@ index d4146cc2..e7f9cf28 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -216,6 +230,7 @@ mod app {
|
||||
@@ -211,22 +225,24 @@ mod app {
|
||||
#[shared]
|
||||
struct Shared {
|
||||
usb: UsbDevice,
|
||||
- network: NetworkUsers<DualIir, 3>,
|
||||
+ network: NetworkUsers<DualIir, 5>,
|
||||
settings: Settings,
|
||||
active_settings: DualIir,
|
||||
telemetry: TelemetryBuffer,
|
||||
source: [SignalGenerator; 2],
|
||||
@ -271,7 +277,12 @@ index d4146cc2..e7f9cf28 100644
|
||||
}
|
||||
|
||||
#[local]
|
||||
@@ -227,6 +242,7 @@ mod app {
|
||||
struct Local {
|
||||
- usb_terminal: SerialTerminal<Settings, 4>,
|
||||
+ usb_terminal: SerialTerminal<Settings, 5>,
|
||||
sampling_timer: SamplingTimer,
|
||||
digital_inputs: (DigitalInput0, DigitalInput1),
|
||||
afes: (AFE0, AFE1),
|
||||
adcs: (Adc0Input, Adc1Input),
|
||||
dacs: (Dac0Output, Dac1Output),
|
||||
iir_state: [[[f32; 4]; IIR_CASCADE_LENGTH]; 2],
|
||||
@ -284,7 +295,7 @@ index d4146cc2..e7f9cf28 100644
|
||||
|
||||
// Configure the microcontroller
|
||||
- let (stabilizer, _pounder) = hardware::setup::setup::<Settings, 4>(
|
||||
+ let (mut stabilizer, pounder) = hardware::setup::setup::<Settings, 4>(
|
||||
+ let (mut stabilizer, pounder) = hardware::setup::setup::<Settings, 5>(
|
||||
c.core,
|
||||
c.device,
|
||||
clock,
|
||||
@ -381,7 +392,7 @@ index d4146cc2..e7f9cf28 100644
|
||||
});
|
||||
|
||||
diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs
|
||||
index d8d193dd..4aff9517 100644
|
||||
index d8d193dd..aa941db7 100644
|
||||
--- a/src/bin/lockin.rs
|
||||
+++ b/src/bin/lockin.rs
|
||||
@@ -29,7 +29,7 @@
|
||||
@ -393,6 +404,15 @@ index d8d193dd..4aff9517 100644
|
||||
sync::atomic::{fence, Ordering},
|
||||
};
|
||||
|
||||
@@ -248,7 +248,7 @@ mod app {
|
||||
#[shared]
|
||||
struct Shared {
|
||||
usb: UsbDevice,
|
||||
- network: NetworkUsers<Lockin, 2>,
|
||||
+ network: NetworkUsers<Lockin, 5>,
|
||||
settings: Settings,
|
||||
active_settings: Lockin,
|
||||
telemetry: TelemetryBuffer,
|
||||
@@ -543,6 +543,7 @@ mod app {
|
||||
*gains[0],
|
||||
*gains[1],
|
||||
@ -401,6 +421,35 @@ index d8d193dd..4aff9517 100644
|
||||
))
|
||||
});
|
||||
|
||||
diff --git a/src/bin/urukul.rs b/src/bin/urukul.rs
|
||||
index fc7faf40..1ebb8e6c 100644
|
||||
--- a/src/bin/urukul.rs
|
||||
+++ b/src/bin/urukul.rs
|
||||
@@ -104,21 +104,21 @@ mod app {
|
||||
#[shared]
|
||||
struct Shared {
|
||||
usb: UsbDevice,
|
||||
- network: NetworkUsers<App, 3>,
|
||||
+ network: NetworkUsers<App, 5>,
|
||||
settings: Settings,
|
||||
}
|
||||
|
||||
#[local]
|
||||
struct Local {
|
||||
urukul: Urukul,
|
||||
- usb_terminal: SerialTerminal<Settings, 4>,
|
||||
+ usb_terminal: SerialTerminal<Settings, 5>,
|
||||
}
|
||||
|
||||
#[init]
|
||||
fn init(c: init::Context) -> (Shared, Local) {
|
||||
let clock = SystemTimer::new(|| Systick::now().ticks());
|
||||
|
||||
- let (stabilizer, _pounder) = hardware::setup::setup::<Settings, 4>(
|
||||
+ let (stabilizer, _pounder) = hardware::setup::setup::<Settings, 5>(
|
||||
c.core,
|
||||
c.device,
|
||||
clock,
|
||||
diff --git a/src/hardware/pounder/attenuators.rs b/src/hardware/pounder/attenuators.rs
|
||||
index cfd08b7f..2570f506 100644
|
||||
--- a/src/hardware/pounder/attenuators.rs
|
||||
|
Loading…
Reference in New Issue
Block a user