blizzardfinnegan/seymourLifeRust
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 7 Packages Wiki Activity Actions

Merge branch 'main' of github:blizzardfinnegan/seymourPOCRust

Browse source
This commit is contained in:
Blizzard Finnegan 2023-05-18 09:24:21 -04:00
commit 06084eff9e
No known key found for this signature in database
GPG key ID: CA68D42A2F00D450
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/device.rs
View file

@ -52,7 +52,8 @@ impl Device{
log::trace!("{:?}",line);
let section_and_data:Vec<&str> = line.split(": ").collect();
let section = section_and_data[0];
let value:u64 = section_and_data[1].parse().unwrap();
let value:u64 = section_and_data[1].trim().parse().unwrap();
log::trace!("{:?} value: [{:?}]",section,value);
match section {
REBOOTS_SECTION => {
self.reboots = value;
@ -316,7 +317,7 @@ impl Device{
self.go_to_lifecycle_menu();
_ = self.usb_tty.read_from_device(Some("["));
for _bp_count in 1..=local_bp_cycles{
log::info!("Running bp {} on device {} ...",self.bps,self.serial);
log::info!("Running bp {} on device {} ...",(self.bps+1),self.serial);
self.start_bp();
let bp_start = self.is_bp_running();
log::trace!("{:?}",bp_start);
@ -330,7 +331,7 @@ impl Device{
}
}
for _temp_count in 1..=local_temp_cycles{
log::info!("Running temp {} on device {} ...",self.temps,self.serial);
log::info!("Running temp {} on device {} ...",(self.temps+1),self.serial);
let temp_start = self.start_temp().is_temp_running();
let temp_end = self.stop_temp().is_temp_running();
if temp_start != temp_end {

17
src/tty.rs
View file

@ -74,7 +74,8 @@ const RESPONSES:[(&str,Response);10] = [
];
pub struct TTY{
tty: Box<dyn SerialPort>
tty: Box<dyn SerialPort>,
failed_read_count: u8
}
impl std::fmt::Debug for TTY{
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result{
@ -87,7 +88,8 @@ impl std::fmt::Debug for TTY{
impl TTY{
pub fn new(serial_location:&str) -> Self{
TTY {
tty: serialport::new(serial_location,BAUD_RATE).timeout(SERIAL_READ_TIMEOUT).open().unwrap()
tty: serialport::new(serial_location,BAUD_RATE).timeout(SERIAL_READ_TIMEOUT).open().expect("Unable to open serial connnection!"),
failed_read_count: 0
}
}
@ -108,6 +110,7 @@ impl TTY{
for (string,enum_value) in RESPONSES{
if read_line.contains(string){
log::debug!("Successful read of {:?} from tty {}, which matches pattern {:?}",read_line,self.tty.name().unwrap_or("unknown shell".to_string()),enum_value);
self.failed_read_count = 0;
return enum_value;
}
}
@ -115,6 +118,16 @@ impl TTY{
}
else {
log::debug!("Read an empty string. Possible read error.");
//Due to a linux kernel power-saving setting that is overly complicated to fix,
//Serial connections will drop for a moment before re-opening, at seemingly-random
//intervals. The below is an attempt to catch and recover from this behaviour.
self.failed_read_count += 1;
if self.failed_read_count >= 15{
self.failed_read_count = 0;
let tty_location = self.tty.name().expect("Unable to read tty name!");
self.tty = serialport::new(tty_location,BAUD_RATE).timeout(SERIAL_READ_TIMEOUT).open().expect("Unable to open serial connection!");
return self.read_from_device(_break_char);
}
return Response::Empty;
};
}