From d68fa87fece7389e0eab52f97337a4ae03e30398 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Fri, 7 May 2021 13:04:25 +0200 Subject: [PATCH] Simplifying settings lock --- src/bin/dual-iir.rs | 11 ++++------- src/bin/lockin.rs | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs index d5205d8..e952ae6 100644 --- a/src/bin/dual-iir.rs +++ b/src/bin/dual-iir.rs @@ -193,19 +193,16 @@ const APP: () = { let telemetry: TelemetryBuffer = c.resources.telemetry.lock(|telemetry| *telemetry); - let gains: [AfeGain; 2] = - c.resources.settings.lock(|settings| settings.afe); + let (gains, telemetry_period) = c + .resources + .settings + .lock(|settings| (settings.afe, settings.telemetry_period)); c.resources .network .telemetry .publish(&telemetry.finalize(gains[0], gains[1])); - let telemetry_period = c - .resources - .settings - .lock(|settings| settings.telemetry_period); - // Schedule the telemetry task in the future. c.schedule .telemetry( diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs index 10534ba..73c3a92 100644 --- a/src/bin/lockin.rs +++ b/src/bin/lockin.rs @@ -275,19 +275,16 @@ const APP: () = { c.resources.digital_inputs.1.is_high().unwrap(), ]; - let gains: [AfeGain; 2] = - c.resources.settings.lock(|settings| settings.afe); + let (gains, telemetry_period) = c + .resources + .settings + .lock(|settings| (settings.afe, settings.telemetry_period)); c.resources .network .telemetry .publish(&telemetry.finalize(gains[0], gains[1])); - let telemetry_period = c - .resources - .settings - .lock(|settings| settings.telemetry_period); - // Schedule the telemetry task in the future. c.schedule .telemetry(