alex/mppt-modbus
1
0
Fork 0
mirror of https://github.com/italicsjenga/mppt-modbus.git synced 2024-12-23 16:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

MORE STINKO>>>

Browse source
This commit is contained in:
Alex Janka 2022-09-09 17:13:50 +10:00
parent 2192d86c31
commit 4673ca96b9
1 changed files with 50 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
src/main.rs
View file

@ -119,6 +119,7 @@ struct MpptEeprom {
trait Scaled { trait Scaled {
fn get_scaled(&self, info: &Info) -> f32; fn get_scaled(&self, info: &Info) -> f32;
fn new(input: f32, info: &Info) -> Self; fn new(input: f32, info: &Info) -> Self;
fn from_u16(input: u16) -> Self;
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -136,6 +137,10 @@ impl Scaled for Tempcomp {
data: ((input / f32::powf(2., -16.)) / info.v_scale) as u16, data: ((input / f32::powf(2., -16.)) / info.v_scale) as u16,
} }
} }
fn from_u16(input: u16) -> Self {
Self { data: input }
}
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -153,6 +158,10 @@ impl Scaled for Voltage {
data: ((input / f32::powf(2., -15.)) / info.v_scale) as u16, data: ((input / f32::powf(2., -15.)) / info.v_scale) as u16,
} }
} }
fn from_u16(input: u16) -> Self {
Self { data: input }
}
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -170,6 +179,10 @@ impl Scaled for VoltagePercentage {
data: ((input / f32::powf(2., -16.)) / 100.) as u16, data: ((input / f32::powf(2., -16.)) / 100.) as u16,
} }
} }
fn from_u16(input: u16) -> Self {
Self { data: input }
}
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -187,6 +200,10 @@ impl Scaled for Current {
data: ((input / f32::powf(2., -15.)) / info.i_scale) as u16, data: ((input / f32::powf(2., -15.)) / info.i_scale) as u16,
} }
} }
fn from_u16(input: u16) -> Self {
Self { data: input }
}
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -202,6 +219,10 @@ impl Scaled for Raw {
fn new(input: f32, _: &Info) -> Self { fn new(input: f32, _: &Info) -> Self {
Self { data: input as u16 } Self { data: input as u16 }
} }
fn from_u16(input: u16) -> Self {
Self { data: input }
}
} }
#[derive(Parser)] #[derive(Parser)]
@ -388,87 +409,35 @@ fn main() {
.expect("could not get eeprom data"); .expect("could not get eeprom data");
let eeprom_data = MpptEeprom { let eeprom_data = MpptEeprom {
ev_absorp: Voltage { ev_absorp: Voltage::from_u16(data_in[OffsetsEeprom::EV_ABSORP]),
data: data_in[OffsetsEeprom::EV_ABSORP], ev_float: Voltage::from_u16(data_in[OffsetsEeprom::EV_FLOAT]),
}, et_absorp: Raw::from_u16(data_in[OffsetsEeprom::ET_ABSORP]),
ev_float: Voltage { et_absorp_ext: Raw::from_u16(data_in[OffsetsEeprom::ET_ABSORP_EXT]),
data: data_in[OffsetsEeprom::EV_FLOAT], ev_absorp_ext: Voltage::from_u16(data_in[OffsetsEeprom::EV_ABSORP_EXT]),
}, ev_float_cancel: Voltage::from_u16(data_in[OffsetsEeprom::EV_FLOAT_CANCEL]),
et_absorp: Raw { et_float_exit_cum: Raw::from_u16(data_in[OffsetsEeprom::ET_FLOAT_EXIT_CUM]),
data: data_in[OffsetsEeprom::ET_ABSORP], ev_eq: Voltage::from_u16(data_in[OffsetsEeprom::EV_EQ]),
}, et_eqcalendar: Raw::from_u16(data_in[OffsetsEeprom::ET_EQCALENDAR]),
et_absorp_ext: Raw { et_eq_above: Raw::from_u16(data_in[OffsetsEeprom::ET_EQ_ABOVE]),
data: data_in[OffsetsEeprom::ET_ABSORP_EXT], et_eq_reg: Raw::from_u16(data_in[OffsetsEeprom::ET_EQ_REG]),
}, et_batt_service: Raw::from_u16(data_in[OffsetsEeprom::ET_BATT_SERVICE]),
ev_absorp_ext: Voltage { ev_tempcomp: Tempcomp::from_u16(data_in[OffsetsEeprom::EV_TEMPCOMP]),
data: data_in[OffsetsEeprom::EV_ABSORP_EXT], ev_hvd: Voltage::from_u16(data_in[OffsetsEeprom::EV_HVD]),
}, ev_hvr: Voltage::from_u16(data_in[OffsetsEeprom::EV_HVR]),
ev_float_cancel: Voltage { evb_ref_lim: Voltage::from_u16(data_in[OffsetsEeprom::EVB_REF_LIM]),
data: data_in[OffsetsEeprom::EV_FLOAT_CANCEL], etb_max: Raw::from_u16(data_in[OffsetsEeprom::ETB_MAX]),
}, etb_min: Raw::from_u16(data_in[OffsetsEeprom::ETB_MIN]),
et_float_exit_cum: Raw { ev_soc_g_gy: Voltage::from_u16(data_in[OffsetsEeprom::EV_SOC_G_GY]),
data: data_in[OffsetsEeprom::ET_FLOAT_EXIT_CUM], ev_soc_gy_y: Voltage::from_u16(data_in[OffsetsEeprom::EV_SOC_GY_Y]),
}, ev_soc_y_yr: Voltage::from_u16(data_in[OffsetsEeprom::EV_SOC_Y_YR]),
ev_eq: Voltage { ev_soc_yr_r: Voltage::from_u16(data_in[OffsetsEeprom::EV_SOC_YR_R]),
data: data_in[OffsetsEeprom::EV_EQ], emodbus_id: Raw::from_u16(data_in[OffsetsEeprom::EMODBUS_ID]),
}, emeterbus_id: Raw::from_u16(data_in[OffsetsEeprom::EMETERBUS_ID]),
et_eqcalendar: Raw { eib_lim: Current::from_u16(data_in[OffsetsEeprom::EIB_LIM]),
data: data_in[OffsetsEeprom::ET_EQCALENDAR], eva_ref_fixed_init: Voltage::from_u16(data_in[OffsetsEeprom::EVA_REF_FIXED_INIT]),
}, eva_ref_fixed_pct_init: VoltagePercentage::from_u16(
et_eq_above: Raw { data_in[OffsetsEeprom::EVA_REF_FIXED_PCT_INIT],
data: data_in[OffsetsEeprom::ET_EQ_ABOVE], ),
},
et_eq_reg: Raw {
data: data_in[OffsetsEeprom::ET_EQ_REG],
},
et_batt_service: Raw {
data: data_in[OffsetsEeprom::ET_BATT_SERVICE],
},
ev_tempcomp: Tempcomp {
data: data_in[OffsetsEeprom::EV_TEMPCOMP],
},
ev_hvd: Voltage {
data: data_in[OffsetsEeprom::EV_HVD],
},
ev_hvr: Voltage {
data: data_in[OffsetsEeprom::EV_HVR],
},
evb_ref_lim: Voltage {
data: data_in[OffsetsEeprom::EVB_REF_LIM],
},
etb_max: Raw {
data: data_in[OffsetsEeprom::ETB_MAX],
},
etb_min: Raw {
data: data_in[OffsetsEeprom::ETB_MIN],
},
ev_soc_g_gy: Voltage {
data: data_in[OffsetsEeprom::EV_SOC_G_GY],
},
ev_soc_gy_y: Voltage {
data: data_in[OffsetsEeprom::EV_SOC_GY_Y],
},
ev_soc_y_yr: Voltage {
data: data_in[OffsetsEeprom::EV_SOC_Y_YR],
},
ev_soc_yr_r: Voltage {
data: data_in[OffsetsEeprom::EV_SOC_YR_R],
},
emodbus_id: Raw {
data: data_in[OffsetsEeprom::EMODBUS_ID],
},
emeterbus_id: Raw {
data: data_in[OffsetsEeprom::EMETERBUS_ID],
},
eib_lim: Current {
data: data_in[OffsetsEeprom::EIB_LIM],
},
eva_ref_fixed_init: Voltage {
data: data_in[OffsetsEeprom::EVA_REF_FIXED_INIT],
},
eva_ref_fixed_pct_init: VoltagePercentage {
data: data_in[OffsetsEeprom::EVA_REF_FIXED_PCT_INIT],
},
}; };
println!("eeprom: {:#?}", eeprom_data); println!("eeprom: {:#?}", eeprom_data);