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

format

Browse source
This commit is contained in:
josiahhiggs 2025-01-24 17:36:38 +13:00
parent 66c141ce27
commit 102db63ec4
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1183,8 +1183,8 @@ void update_values_battery() { //This function maps all the values fetched via
logging.println("."); logging.println(".");
logging.printf("PCS_ambientTemp: %.2f°C, DCDC_Temp: %.2f°C, ChgPhA: %.2f°C, ChgPhB: %.2f°C, ChgPhC: %.2f°C", logging.printf("PCS_ambientTemp: %.2f°C, DCDC_Temp: %.2f°C, ChgPhA: %.2f°C, ChgPhB: %.2f°C, ChgPhC: %.2f°C",
PCS_ambientTemp * 0.1 + 40, PCS_dcdcTemp * 0.1 + 40, PCS_chgPhATemp * 0.1 + 40, PCS_chgPhBTemp * 0.1 + 40, PCS_ambientTemp * 0.1 + 40, PCS_dcdcTemp * 0.1 + 40, PCS_chgPhATemp * 0.1 + 40,
PCS_chgPhCTemp * 0.1 + 40); PCS_chgPhBTemp * 0.1 + 40, PCS_chgPhCTemp * 0.1 + 40);
logging.println(""); logging.println("");
logging.println("Values passed to the inverter: "); logging.println("Values passed to the inverter: ");
@ -1456,11 +1456,14 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
BMS_pcsNoFlowRequest = ((rx_frame.data.u8[7] >> 6) & (0x01U)); // 62|1@1+ (1,0) [0|0] "" BMS_pcsNoFlowRequest = ((rx_frame.data.u8[7] >> 6) & (0x01U)); // 62|1@1+ (1,0) [0|0] ""
BMS_noFlowRequest = ((rx_frame.data.u8[7] >> 7) & (0x01U)); //63|1@1+ (1,0) [0|0] "" BMS_noFlowRequest = ((rx_frame.data.u8[7] >> 7) & (0x01U)); //63|1@1+ (1,0) [0|0] ""
break; break;
case 0x2A4: //676 PCS_thermalStatus case 0x2A4: //676 PCS_thermalStatus
PCS_chgPhATemp = (rx_frame.data.u8[0] & 0xFF) | ((rx_frame.data.u8[1] & 0x07) << 8); //0|11@1- (0.1,40) [0|0] "C" PCS_chgPhATemp = (rx_frame.data.u8[0] & 0xFF) | ((rx_frame.data.u8[1] & 0x07) << 8); //0|11@1- (0.1,40) [0|0] "C"
PCS_chgPhBTemp = ((rx_frame.data.u8[1] & 0xF8) >> 3) | ((rx_frame.data.u8[2] & 0x3F) << 5); //11|11@1- (0.1,40) [0|0] "C" PCS_chgPhBTemp =
PCS_chgPhCTemp = ((rx_frame.data.u8[2] & 0xC0) >> 6) | (rx_frame.data.u8[3] << 2) | ((rx_frame.data.u8[4] & 0x01) << 10); //22|11@1- (0.1,40) [0|0] "C" ((rx_frame.data.u8[1] & 0xF8) >> 3) | ((rx_frame.data.u8[2] & 0x3F) << 5); //11|11@1- (0.1,40) [0|0] "C"
PCS_dcdcTemp = ((rx_frame.data.u8[4] & 0xFE) >> 1) | ((rx_frame.data.u8[5] & 0x0F) << 7); //33|11@1- (0.1,40) [0|0] "C" PCS_chgPhCTemp = ((rx_frame.data.u8[2] & 0xC0) >> 6) | (rx_frame.data.u8[3] << 2) |
((rx_frame.data.u8[4] & 0x01) << 10); //22|11@1- (0.1,40) [0|0] "C"
PCS_dcdcTemp =
((rx_frame.data.u8[4] & 0xFE) >> 1) | ((rx_frame.data.u8[5] & 0x0F) << 7); //33|11@1- (0.1,40) [0|0] "C"
PCS_ambientTemp = ((rx_frame.data.u8[5] & 0xF0) >> 4) | (rx_frame.data.u8[6] << 4); //44|11@1- (0.1,40) [0|0] "C" PCS_ambientTemp = ((rx_frame.data.u8[5] & 0xF0) >> 4) | (rx_frame.data.u8[6] << 4); //44|11@1- (0.1,40) [0|0] "C"
break; break;
case 0x2C4: // 708 PCS_logging: not all frames are listed, just ones relating to dcdc case 0x2C4: // 708 PCS_logging: not all frames are listed, just ones relating to dcdc

10
Software/src/devboard/webserver/advanced_battery_html.cpp
View file

@ -714,11 +714,11 @@ String advanced_battery_processor(const String& var) {
//content += "<h4>Brick Model Temp Max: " + String(BrickModelTMax) + " C</h4>";// Not giving useable data //content += "<h4>Brick Model Temp Max: " + String(BrickModelTMax) + " C</h4>";// Not giving useable data
//content += "<h4>Brick Model Temp Min: " + String(BrickModelTMin) + " C</h4>";// Not giving useable data //content += "<h4>Brick Model Temp Min: " + String(BrickModelTMin) + " C</h4>";// Not giving useable data
//0x2A4 676 PCS_thermalStatus //0x2A4 676 PCS_thermalStatus
content += "<h4>PCS dcdc Temp: " + String(PCS_dcdcTemp,) + " DegC</h4>"; content += "<h4>PCS dcdc Temp: " + String(PCS_dcdcTemp, ) + " DegC</h4>";
content += "<h4>PCS Ambient Temp: " + String(PCS_ambientTemp,) + " DegC</h4>"; content += "<h4>PCS Ambient Temp: " + String(PCS_ambientTemp, ) + " DegC</h4>";
content += "<h4>PCS Chg PhA Temp: " + String(PCS_chgPhATemp,) + " DegC</h4>"; content += "<h4>PCS Chg PhA Temp: " + String(PCS_chgPhATemp, ) + " DegC</h4>";
content += "<h4>PCS Chg PhB Temp: " + String(PCS_chgPhBTemp,) + " DegC</h4>"; content += "<h4>PCS Chg PhB Temp: " + String(PCS_chgPhBTemp, ) + " DegC</h4>";
content += "<h4>PCS Chg PhC Temp: " + String(PCS_chgPhCTemp,) + " DegC</h4>"; content += "<h4>PCS Chg PhC Temp: " + String(PCS_chgPhCTemp, ) + " DegC</h4>";
//0x252 594 BMS_powerAvailable //0x252 594 BMS_powerAvailable
content += "<h4>Max Regen Power: " + String(BMS_maxRegenPower) + " KW</h4>"; content += "<h4>Max Regen Power: " + String(BMS_maxRegenPower) + " KW</h4>";
content += "<h4>Max Discharge Power: " + String(BMS_maxDischargePower) + " KW</h4>"; content += "<h4>Max Discharge Power: " + String(BMS_maxDischargePower) + " KW</h4>";