alex/tesla-charge-controller
1
0
Fork 0
Code Releases40 Packages2 Activity Actions

tristar: fix ram over modbus

Browse source
This commit is contained in:
Alex Janka 2024-12-26 14:55:03 +11:00
parent d032d0120f
commit 272d0052ce
1 changed files with 4 additions and 8 deletions

12
src/charge_controllers/tristar.rs
View file

@ -13,7 +13,6 @@ use crate::{
const DEVICE_ID: u8 = 0x01; const DEVICE_ID: u8 = 0x01;
const RAM_DATA_SIZE: u16 = 0x005B; const RAM_DATA_SIZE: u16 = 0x005B;
const RAM_ARRAY_SIZE: usize = RAM_DATA_SIZE as usize + 1;
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub struct Scaling { pub struct Scaling {
@ -50,7 +49,6 @@ pub struct Tristar {
state: TristarState, state: TristarState,
port_name: String, port_name: String,
modbus: tokio_modbus::client::Context, modbus: tokio_modbus::client::Context,
data_in: [u16; RAM_ARRAY_SIZE],
charge_state_gauges: ChargeStateGauges, charge_state_gauges: ChargeStateGauges,
consecutive_errors: usize, consecutive_errors: usize,
} }
@ -72,7 +70,8 @@ pub struct TristarState {
} }
impl TristarState { impl TristarState {
fn from_ram(scaling: Scaling, ram: &[u16]) -> Self { fn from_ram(ram: &[u16]) -> Self {
let scaling = Scaling::from(ram);
Self { Self {
battery_voltage: scaling.get_voltage(ram[TristarRamAddress::AdcVbFMed]), battery_voltage: scaling.get_voltage(ram[TristarRamAddress::AdcVbFMed]),
target_voltage: scaling.get_voltage(ram[TristarRamAddress::VbRef]), target_voltage: scaling.get_voltage(ram[TristarRamAddress::VbRef]),
@ -249,7 +248,6 @@ impl Tristar {
state: Default::default(), state: Default::default(),
port_name: serial_port, port_name: serial_port,
modbus, modbus,
data_in: [0; RAM_ARRAY_SIZE],
charge_state_gauges, charge_state_gauges,
consecutive_errors: 0, consecutive_errors: 0,
}) })
@ -260,7 +258,6 @@ impl Tristar {
.get_data() .get_data()
.await .await
.some_or_print_with("reading tristar state") .some_or_print_with("reading tristar state")
.map(|scaling| TristarState::from_ram(scaling, &self.data_in))
{ {
self.consecutive_errors = 0; self.consecutive_errors = 0;
BATTERY_VOLTAGE BATTERY_VOLTAGE
@ -311,13 +308,12 @@ impl Tristar {
// } // }
} }
async fn get_data(&mut self) -> Result<Scaling, TristarError> { async fn get_data(&mut self) -> Result<TristarState, TristarError> {
let data = self let data = self
.modbus .modbus
.read_holding_registers(0x0000, RAM_DATA_SIZE + 1) .read_holding_registers(0x0000, RAM_DATA_SIZE + 1)
.await??; .await??;
let scaling = Scaling::from(&data); Ok(TristarState::from_ram(&data))
Ok(scaling)
} }
} }