LUMZ-bioz/bioz-host-rs
1
0
Fork 0
mirror of https://github.com/hubaldv/bioz-host-rs.git synced 2025-12-06 05:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added 4-lead multi calibration.

Browse Source
This commit is contained in:
Hubald Verzijl
2025-11-03 19:17:28 +01:00
parent 5d80fcdcd8
commit ce23d40b38
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/app.rs
View File

@@ -222,6 +222,35 @@ impl TabViewer {
.open(self.show_settings_toggle)
.show(ui, |ui| {
if let Ok(on) = self.on.lock() {
ui.add_enabled_ui(!*on, |ui| {
ui.horizontal(|ui| {
ui.label("Lead Mode:");
let mut lead_mode = self.lead_mode.lock().unwrap();
// Map current lead mode to index
let mut index = LEAD_MODES
.iter()
.position(|&m| m == *lead_mode)
.unwrap_or(0);
ComboBox::from_id_salt("LeadMode")
.width(60.0)
.show_index(ui, &mut index, LEAD_MODES.len(), |i| {
match LEAD_MODES[i] {
BioImpedanceLeadMode::TwoLead => "2-Lead",
BioImpedanceLeadMode::FourLead => "4-Lead",
}
.to_string()
});
// Update lead mode if changed
if *lead_mode != LEAD_MODES[index] {
*lead_mode = LEAD_MODES[index];
info!("Lead Mode setting changed!");
}
});
});
ui.add_enabled_ui(!*on, |ui| {
ui.horizontal(|ui| {
ui.label("Measurement Points:");
@@ -463,7 +492,7 @@ impl App {
let phase_series = Arc::new(Mutex::new(TimeSeriesPlot::new()));
let bode_plot = Arc::new(Mutex::new(BodePlot::new()));
let single_frequency = Arc::new(Mutex::new(50000));
let lead_mode = Arc::new(Mutex::new(BioImpedanceLeadMode::TwoLead));
let lead_mode = Arc::new(Mutex::new(BioImpedanceLeadMode::FourLead));
let dft_num = Arc::new(Mutex::new(IcdDftNum::Num2048));
let measurement_points = Arc::new(Mutex::new(MeasurementPointSet::Eighteen));
let periods_per_dft = Arc::new(Mutex::new(None));
@@ -544,7 +573,7 @@ impl App {
}
},
(TabActive::Multi, true) => {
if let Err(e) = self.run_impedancemeter_tx.try_send(StartStopSignal::StartMulti(*self.measurement_points.lock().unwrap())) {
if let Err(e) = self.run_impedancemeter_tx.try_send(StartStopSignal::StartMulti(*self.lead_mode.lock().unwrap(), *self.measurement_points.lock().unwrap())) {
error!("Failed to send start command: {:?}", e);
}
},

3
src/client.rs
View File

@@ -76,10 +76,11 @@ impl WorkbookClient {
pub async fn start_impedancemeter_multi(
&self,
lead_mode: BioImpedanceLeadMode,
points: MeasurementPointSet,
) -> Result<MultiImpedanceInitResult, WorkbookError<Infallible>> {
let response = self.client
.send_resp::<StartMultiImpedanceEndpoint>(&MultiImpedanceStartRequest { points })
.send_resp::<StartMultiImpedanceEndpoint>(&MultiImpedanceStartRequest { lead_mode, points })
.await?;
Ok(response)
}

6
src/communication.rs
View File

@@ -194,10 +194,10 @@ pub async fn communicate_with_hardware(
}
}
},
StartStopSignal::StartMulti(num_points) => {
match workbook_client.start_impedancemeter_multi(num_points).await {
StartStopSignal::StartMulti(lead_mode, num_points) => {
match workbook_client.start_impedancemeter_multi(lead_mode, num_points).await {
Ok(Ok(periods)) => {
settings.lock().unwrap().frequency = Some(StartStopSignal::StartMulti(num_points));
settings.lock().unwrap().frequency = Some(StartStopSignal::StartMulti(lead_mode, num_points));
info!("Multi-point Impedancemeter started.");
match num_points {
MeasurementPointSet::Eight => {

2
src/signals.rs
View File

@@ -5,7 +5,7 @@ use crate::icd::{BioImpedanceLeadMode, IcdDftNum, MeasurementPointSet};
#[derive(Copy, Clone, Debug)]
pub enum StartStopSignal {
StartSingle(u32, BioImpedanceLeadMode, IcdDftNum), // frequency in Hz, lead mode, DFT number
StartMulti(MeasurementPointSet), // DFT number, number of points per measurement
StartMulti(BioImpedanceLeadMode, MeasurementPointSet), // lead mode, number of points per measurement
Stop,
}