Removing spurious settings updates

This commit is contained in:
Ryan Summers 2021-05-26 13:05:54 +02:00
parent d8cc3c74d9
commit 23a93e9135
3 changed files with 24 additions and 9 deletions

View File

@ -13,7 +13,7 @@ use hardware::{
DigitalInput0, DigitalInput1, InputPin, SystemTimer, AFE0, AFE1, DigitalInput0, DigitalInput1, InputPin, SystemTimer, AFE0, AFE1,
}; };
use net::{NetworkUsers, Telemetry, TelemetryBuffer, UpdateState}; use net::{NetworkState, NetworkUsers, Telemetry, TelemetryBuffer};
const SCALE: f32 = i16::MAX as _; const SCALE: f32 = i16::MAX as _;
@ -171,8 +171,11 @@ const APP: () = {
fn idle(mut c: idle::Context) -> ! { fn idle(mut c: idle::Context) -> ! {
loop { loop {
match c.resources.network.lock(|net| net.update()) { match c.resources.network.lock(|net| net.update()) {
UpdateState::Updated => c.spawn.settings_update().unwrap(), NetworkState::SettingsChanged => {
UpdateState::NoChange => cortex_m::asm::wfi(), c.spawn.settings_update().unwrap()
}
NetworkState::Updated => {}
NetworkState::NoChange => cortex_m::asm::wfi(),
} }
} }
} }

View File

@ -17,7 +17,7 @@ use stabilizer::hardware::{
}; };
use miniconf::Miniconf; use miniconf::Miniconf;
use net::{NetworkUsers, Telemetry, TelemetryBuffer, UpdateState}; use net::{NetworkState, NetworkUsers, Telemetry, TelemetryBuffer};
// A constant sinusoid to send on the DAC output. // A constant sinusoid to send on the DAC output.
// Full-scale gives a +/- 10.24V amplitude waveform. Scale it down to give +/- 1V. // Full-scale gives a +/- 10.24V amplitude waveform. Scale it down to give +/- 1V.
@ -248,8 +248,11 @@ const APP: () = {
fn idle(mut c: idle::Context) -> ! { fn idle(mut c: idle::Context) -> ! {
loop { loop {
match c.resources.network.lock(|net| net.update()) { match c.resources.network.lock(|net| net.update()) {
UpdateState::Updated => c.spawn.settings_update().unwrap(), NetworkState::SettingsChanged => {
UpdateState::NoChange => cortex_m::asm::wfi(), c.spawn.settings_update().unwrap()
}
NetworkState::Updated => {}
NetworkState::NoChange => cortex_m::asm::wfi(),
} }
} }
} }

View File

@ -33,6 +33,12 @@ pub enum UpdateState {
Updated, Updated,
} }
#[derive(Copy, Clone, PartialEq)]
pub enum NetworkState {
SettingsChanged,
Updated,
NoChange,
}
/// A structure of Stabilizer's default network users. /// A structure of Stabilizer's default network users.
pub struct NetworkUsers<S: Default + Clone + Miniconf, T: Serialize> { pub struct NetworkUsers<S: Default + Clone + Miniconf, T: Serialize> {
pub miniconf: MiniconfClient<S>, pub miniconf: MiniconfClient<S>,
@ -98,15 +104,18 @@ where
/// ///
/// # Returns /// # Returns
/// An indication if any of the network users indicated a state change. /// An indication if any of the network users indicated a state change.
pub fn update(&mut self) -> UpdateState { pub fn update(&mut self) -> NetworkState {
// Poll for incoming data. // Poll for incoming data.
let poll_result = self.processor.update(); let poll_result = match self.processor.update() {
UpdateState::NoChange => NetworkState::NoChange,
UpdateState::Updated => NetworkState::Updated,
};
// Update the MQTT clients. // Update the MQTT clients.
self.telemetry.update(); self.telemetry.update();
match self.miniconf.update() { match self.miniconf.update() {
UpdateState::Updated => UpdateState::Updated, UpdateState::Updated => NetworkState::SettingsChanged,
UpdateState::NoChange => poll_result, UpdateState::NoChange => poll_result,
} }
} }