M-Labs/thermostat
9
0
Fork 5
Code Issues 9 Pull Requests 5 Releases Wiki Activity

ad7172: retry corrupt transfers

Browse Source
This commit is contained in:
Astro 2020-03-20 00:45:40 +01:00
parent 82dba2bb67
commit 4c3c8498e9
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ad7172/adc.rs
View File

@ -1,7 +1,7 @@
use core::fmt; use core::fmt;
use embedded_hal::digital::v2::OutputPin; use embedded_hal::digital::v2::OutputPin;
use embedded_hal::blocking::spi::Transfer; use embedded_hal::blocking::spi::Transfer;
use log::info; use log::{info, warn};
use super::checksum::{ChecksumMode, Checksum}; use super::checksum::{ChecksumMode, Checksum};
use super::AdcError; use super::AdcError;
use super::{ use super::{
@ -145,12 +145,16 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
checksum.feed(&[address]); checksum.feed(&[address]);
let checksum_out = checksum.result(); let checksum_out = checksum.result();
let checksum_in = self.transfer(address, reg_data.as_mut(), checksum_out)?; loop {
let checksum_in = self.transfer(address, reg_data.as_mut(), checksum_out)?;
checksum.feed(&reg_data); checksum.feed(&reg_data);
let checksum_expected = checksum.result(); let checksum_expected = checksum.result();
if checksum_expected != checksum_in { if checksum_expected == checksum_in {
return Err(AdcError::ChecksumMismatch(checksum_expected, checksum_in)); break;
}
// Retry
warn!("read_reg checksum error, retrying");
} }
Ok(reg_data) Ok(reg_data)
} }
@ -166,7 +170,13 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
checksum.feed(&[address]); checksum.feed(&[address]);
checksum.feed(&reg_data); checksum.feed(&reg_data);
let checksum_out = checksum.result(); let checksum_out = checksum.result();
self.transfer(address, reg_data.as_mut(), checksum_out)?; loop {
let checksum_in = self.transfer(address, reg_data.as_mut(), checksum_out)?;
if checksum_in.unwrap_or(0) == 0 {
break;
}
warn!("write_reg: checksum={:02X}, retrying", checksum_in.unwrap_or(0));
}
Ok(()) Ok(())
} }