yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-04 18:29:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update TESLA-BATTERY.cpp

Browse source
This commit is contained in:
josiahhiggs 2024-12-18 22:06:28 +13:00
parent 6ed3b7ea08
commit b4ea3dcf35
1 changed files with 80 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Software/src/battery/TESLA-BATTERY.cpp
View file

@ -1783,9 +1783,11 @@ void receive_can_battery2(CAN_frame rx_frame) {
battery2_energy_buffer_m1 = battery2_energy_buffer_m1 =
(rx_frame.data.u8[3] | rx_frame.data.u8[2]); //BMS_energyBuffer m1 : 16|16@1+ (0.01,0) [0|0] "kWh" X (rx_frame.data.u8[3] | rx_frame.data.u8[2]); //BMS_energyBuffer m1 : 16|16@1+ (0.01,0) [0|0] "kWh" X
battery2_expected_energy_remaining_m1 = battery2_expected_energy_remaining_m1 =
(rx_frame.data.u8[5] | rx_frame.data.u8[4]); //BMS_expectedEnergyRemaining m1 : 32|16@1+ (0.02,0) [0|0] "kWh" X (rx_frame.data.u8[5] |
rx_frame.data.u8[4]); //BMS_expectedEnergyRemaining m1 : 32|16@1+ (0.02,0) [0|0] "kWh" X
battery2_energy_to_charge_complete_m1 = battery2_energy_to_charge_complete_m1 =
(rx_frame.data.u8[7] | rx_frame.data.u8[6]); //BMS_energyToChargeComplete m1 : 48|16@1+ (0.02,0) [0|0] "kWh" X (rx_frame.data.u8[7] |
rx_frame.data.u8[6]); //BMS_energyToChargeComplete m1 : 48|16@1+ (0.02,0) [0|0] "kWh" X
} }
if (mux == 2) {} if (mux == 2) {}
// Additional information needed on this mux, example frame: 02 26 02 20 02 80 00 00 doesn't change // Additional information needed on this mux, example frame: 02 26 02 20 02 80 00 00 doesn't change
@ -1864,7 +1866,8 @@ void receive_can_battery2(CAN_frame rx_frame) {
battery2_BMS_diLimpRequest = ((rx_frame.data.u8[4] >> 3) & (0x01U)); battery2_BMS_diLimpRequest = ((rx_frame.data.u8[4] >> 3) & (0x01U));
battery2_BMS_okToShipByAir = ((rx_frame.data.u8[4] >> 4) & (0x01U)); battery2_BMS_okToShipByAir = ((rx_frame.data.u8[4] >> 4) & (0x01U));
battery2_BMS_okToShipByLand = ((rx_frame.data.u8[4] >> 5) & (0x01U)); battery2_BMS_okToShipByLand = ((rx_frame.data.u8[4] >> 5) & (0x01U));
battery2_BMS_chgPowerAvailable = ((rx_frame.data.u8[6] & (0x01U)) << 10) | ((rx_frame.data.u8[5] & (0xFFU)) << 2) | battery2_BMS_chgPowerAvailable = ((rx_frame.data.u8[6] & (0x01U)) << 10) |
((rx_frame.data.u8[5] & (0xFFU)) << 2) |
((rx_frame.data.u8[4] >> 6) & (0x03U)); //38|11@1+ (0.125,0) [0|0] "kW" ((rx_frame.data.u8[4] >> 6) & (0x03U)); //38|11@1+ (0.125,0) [0|0] "kW"
battery2_BMS_chargeRetryCount = ((rx_frame.data.u8[6] >> 1) & (0x0FU)); battery2_BMS_chargeRetryCount = ((rx_frame.data.u8[6] >> 1) & (0x0FU));
battery2_BMS_pcsPwmEnabled = ((rx_frame.data.u8[6] >> 5) & (0x01U)); battery2_BMS_pcsPwmEnabled = ((rx_frame.data.u8[6] >> 5) & (0x01U));
@ -2002,7 +2005,8 @@ void receive_can_battery2(CAN_frame rx_frame) {
((rx_frame.data.u8[3] >> 4) & (0x0FU)); //m6 : 28|12@1+ (0.1,0) [0|0] "A" X ((rx_frame.data.u8[3] >> 4) & (0x0FU)); //m6 : 28|12@1+ (0.1,0) [0|0] "A" X
PCS2_dcdcCurrentLimit = ((rx_frame.data.u8[6] & (0x0FU)) << 8) | PCS2_dcdcCurrentLimit = ((rx_frame.data.u8[6] & (0x0FU)) << 8) |
(rx_frame.data.u8[5] & (0xFFU)); //m6 : 40|12@1+ (0.1,0) [0|0] "A" X (rx_frame.data.u8[5] & (0xFFU)); //m6 : 40|12@1+ (0.1,0) [0|0] "A" X
PCS2_dcdcLvOutputCurrentTempLimit = ((rx_frame.data.u8[7] & (0xFFU)) << 4) | PCS2_dcdcLvOutputCurrentTempLimit =
((rx_frame.data.u8[7] & (0xFFU)) << 4) |
((rx_frame.data.u8[6] >> 4) & (0x0FU)); //m6 : 52|12@1+ (0.1,0) [0|0] "A" X ((rx_frame.data.u8[6] >> 4) & (0x0FU)); //m6 : 52|12@1+ (0.1,0) [0|0] "A" X
} }
if (mux == 7) { if (mux == 7) {
@ -2201,7 +2205,8 @@ void receive_can_battery2(CAN_frame rx_frame) {
(rx_frame.data.u8[3] & (0xFFU)); //: 24|12@1+ (0.1,0) [0|7.5] "A" Receiver (rx_frame.data.u8[3] & (0xFFU)); //: 24|12@1+ (0.1,0) [0|7.5] "A" Receiver
HVP2_battery12V = ((rx_frame.data.u8[5] & (0xFFU)) << 4) | HVP2_battery12V = ((rx_frame.data.u8[5] & (0xFFU)) << 4) |
((rx_frame.data.u8[4] >> 4) & (0x0FU)); //: 36|12@1+ (0.1,0) [0|30] "V" Receiver ((rx_frame.data.u8[4] >> 4) & (0x0FU)); //: 36|12@1+ (0.1,0) [0|30] "V" Receiver
HVP2_shuntRefVoltageDbg = ((rx_frame.data.u8[7] & (0xFFU)) << 8) | HVP2_shuntRefVoltageDbg =
((rx_frame.data.u8[7] & (0xFFU)) << 8) |
(rx_frame.data.u8[6] & (0xFFU)); //: 48|16@1- (0.001,0) [-32.768|32.767] "V" Receiver (rx_frame.data.u8[6] & (0xFFU)); //: 48|16@1- (0.001,0) [-32.768|32.767] "V" Receiver
} }
if (mux == 6) { if (mux == 6) {