From 7a601ebc6e9c52a44884b8170ecd6ef5432acc4b Mon Sep 17 00:00:00 2001 From: Blizzard Finnegan Date: Tue, 13 Jun 2023 09:32:44 -0400 Subject: [PATCH] Add back is_temp_running --- src/device.rs | 22 +++++++++++++++++++++- src/main.rs | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/device.rs b/src/device.rs index 827963c..ab33e84 100755 --- a/src/device.rs +++ b/src/device.rs @@ -330,6 +330,27 @@ impl Device{ _ = self.usb_tty.read_from_device(None); return self; } + + pub fn is_temp_running(&mut self) -> bool{ + self.go_to_lifecycle_menu(); + self.usb_tty.write_to_device(Command::ReadTemp); + for _ in 0..10 { + match self.usb_tty.read_from_device(None){ + Response::TempCount(count) => return count == self.init_temps , + _ => {}, + } + } + self.usb_tty.write_to_device(Command::ReadTemp); + for _ in 0..10{ + match self.usb_tty.read_from_device(None){ + Response::TempCount(count) => return count == self.init_temps , + _ => {}, + } + } + log::error!("Temp read failed!!!"); + return false + } + pub fn update_temp_count(&mut self) -> u64 { self.go_to_lifecycle_menu(); self.usb_tty.write_to_device(Command::ReadTemp); @@ -367,7 +388,6 @@ impl Device{ } } log::error!("Temp read failed!!!"); - //return 0; } pub fn is_bp_running(&mut self) -> bool { diff --git a/src/main.rs b/src/main.rs index 9cd8f0c..fdc3cf3 100755 --- a/src/main.rs +++ b/src/main.rs @@ -145,6 +145,7 @@ fn main(){ let mut iteration_threads = Vec::new(); while let Some(mut device) = devices.pop(){ iteration_threads.push(thread::spawn(move||{ + device.init_temp_count(); for i in 1..=iteration_count{ log::info!("Starting iteration {} of {} for device {}...", i,iteration_count,device.get_serial()); @@ -167,6 +168,7 @@ fn main(){ } fn find_gpio(device:&mut Device,gpio:&mut GpioPins) -> bool{ + device.init_temp_count(); for &address in gpio.get_unassigned_addresses(){ device.set_pin_address(address).start_temp(); if device.is_temp_running(){