mirror of
https://github.com/ivabus/speakersafetyd
synced 2024-11-10 02:15:16 +03:00
blackbox: Store state for all blocks
This lets us validate the model from blackbox dumps. Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
parent
7fbb53df51
commit
368be9d7df
|
@ -84,25 +84,36 @@ impl Blackbox {
|
||||||
t_ambient: self.globals.t_ambient,
|
t_ambient: self.globals.t_ambient,
|
||||||
t_safe_max: self.globals.t_safe_max,
|
t_safe_max: self.globals.t_safe_max,
|
||||||
t_hysteresis: self.globals.t_hysteresis,
|
t_hysteresis: self.globals.t_hysteresis,
|
||||||
state: null
|
blocks: null
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut state = json::JsonValue::new_array();
|
let mut blocks = json::JsonValue::new_array();
|
||||||
|
|
||||||
for group in self.blocks[0].state.iter() {
|
for block in self.blocks.iter() {
|
||||||
for speaker in group.iter() {
|
let mut info = object! {
|
||||||
let _ = state.push(object! {
|
sample_rate: block.sample_rate,
|
||||||
t_coil: speaker.t_coil,
|
sample_count: block.data.len() / self.globals.channels,
|
||||||
t_magnet: speaker.t_magnet,
|
speakers: null,
|
||||||
t_coil_hyst: speaker.t_coil_hyst,
|
};
|
||||||
t_magnet_hyst: speaker.t_magnet_hyst,
|
let mut speakers = json::JsonValue::new_array();
|
||||||
min_gain: speaker.min_gain,
|
|
||||||
gain: speaker.gain,
|
for group in self.blocks[0].state.iter() {
|
||||||
});
|
for speaker in group.iter() {
|
||||||
|
let _ = speakers.push(object! {
|
||||||
|
t_coil: speaker.t_coil,
|
||||||
|
t_magnet: speaker.t_magnet,
|
||||||
|
t_coil_hyst: speaker.t_coil_hyst,
|
||||||
|
t_magnet_hyst: speaker.t_magnet_hyst,
|
||||||
|
min_gain: speaker.min_gain,
|
||||||
|
gain: speaker.gain,
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
info["speakers"] = speakers;
|
||||||
|
let _ = blocks.push(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
meta["state"] = state;
|
meta["blocks"] = blocks;
|
||||||
|
|
||||||
metafd.write_all(meta.dump().as_bytes())?;
|
metafd.write_all(meta.dump().as_bytes())?;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue