alex/tesla-charge-controller
1
0
Fork 0
Code Releases 40 Packages 2 Activity Actions

ccs: pl: retry reads

Browse source
This commit is contained in:
Alex Janka 2025-01-09 09:51:30 +11:00
parent 7ceaf73037
commit cc2f493401
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
charge-controller-supervisor/src/pl.rs
View file

@ -163,7 +163,7 @@ impl Pli {
pub async fn process_request(&mut self, message: PliRequest) -> eyre::Result<()> { pub async fn process_request(&mut self, message: PliRequest) -> eyre::Result<()> {
match message { match message {
PliRequest::ReadRam(address) => { PliRequest::ReadRam(address) => {
let data = self.read_ram(address).await?; let data = self.read_ram_with_retires(address).await?;
log::warn!("Read RAM at {address}: data {data}"); log::warn!("Read RAM at {address}: data {data}");
} }
PliRequest::ReadEeprom(address) => { PliRequest::ReadEeprom(address) => {
@ -232,14 +232,21 @@ impl Pli {
// let external_load_ah = u16::from_le_bytes([ext_load_low, ext_load_high]); // let external_load_ah = u16::from_le_bytes([ext_load_low, ext_load_high]);
Ok(PlState { Ok(PlState {
battery_voltage: f64::from(self.read_ram(PlRamAddress::Batv).await?) * (4. / 10.), battery_voltage: f64::from(self.read_ram_with_retires(PlRamAddress::Batv).await?)
target_voltage: f64::from(self.read_ram(PlRamAddress::Vreg).await?) * (4. / 10.),
duty_cycle: f64::from(self.read_ram(PlRamAddress::Dutycyc).await?) / 255.,
internal_charge_current: f64::from(self.read_ram(PlRamAddress::Cint).await?)
* (4. / 10.), * (4. / 10.),
internal_load_current: f64::from(self.read_ram(PlRamAddress::Lint).await?) * (2. / 10.), target_voltage: f64::from(self.read_ram_with_retires(PlRamAddress::Vreg).await?)
battery_temp: f64::from(self.read_ram(PlRamAddress::Battemp).await?), * (4. / 10.),
regulator_state: self.read_ram(PlRamAddress::Rstate).await?.into(), duty_cycle: f64::from(self.read_ram_with_retires(PlRamAddress::Dutycyc).await?) / 255.,
internal_charge_current: f64::from(
self.read_ram_with_retires(PlRamAddress::Cint).await?,
) * (4. / 10.),
internal_load_current: f64::from(self.read_ram_with_retires(PlRamAddress::Lint).await?)
* (2. / 10.),
battery_temp: f64::from(self.read_ram_with_retires(PlRamAddress::Battemp).await?),
regulator_state: self
.read_ram_with_retires(PlRamAddress::Rstate)
.await?
.into(),
// internal_charge_ah_accumulator, // internal_charge_ah_accumulator,
// external_charge_ah_accumulator, // external_charge_ah_accumulator,
// internal_load_ah_accumulator, // internal_load_ah_accumulator,
@ -268,7 +275,27 @@ impl Pli {
Ok(buf) Ok(buf)
} }
async fn read_ram<T>(&mut self, address: T) -> eyre::Result<u8> async fn read_ram_with_retires<T>(&mut self, address: T) -> eyre::Result<u8>
where
T: Into<u8>,
{
const READ_TRIES: usize = 3;
let address: u8 = address.into();
let mut last_err = None;
for _ in 0..READ_TRIES {
match self.read_ram_single(address).await {
Ok(v) => return Ok(v),
Err(e) => last_err = Some(e),
}
}
Err(last_err.unwrap_or(eyre::eyre!(
"no error was stored in read_ram_with_retries: this should be unreachable??"
)))
}
async fn read_ram_single<T>(&mut self, address: T) -> eyre::Result<u8>
where where
T: Into<u8>, T: Into<u8>,
{ {