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

Merge pull request #1430 from dalathegreat/feature/raw-temp-readings-LEAF

Browse source 
Nissan LEAF: Add all temperature measurements to More Battery Info page
This commit is contained in:
Daniel Öster 2025-08-18 20:52:20 +03:00 • committed by GitHub
commit 689a0fb55c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Software/src/battery/NISSAN-LEAF-BATTERY.cpp
View file

@ -188,6 +188,10 @@ void NissanLeafBattery::
datalayer_nissan->HeatingStart = battery_Heating_Start; datalayer_nissan->HeatingStart = battery_Heating_Start;
datalayer_nissan->HeaterSendRequest = battery_Batt_Heater_Mail_Send_Request; datalayer_nissan->HeaterSendRequest = battery_Batt_Heater_Mail_Send_Request;
datalayer_nissan->battery_HX = battery_HX; datalayer_nissan->battery_HX = battery_HX;
datalayer_nissan->temperature1 = ((Temp_fromRAW_to_F(battery_temp_raw_1) - 320) * 5) / 9; //Convert from F to C
datalayer_nissan->temperature2 = ((Temp_fromRAW_to_F(battery_temp_raw_2) - 320) * 5) / 9; //Convert from F to C
datalayer_nissan->temperature3 = ((Temp_fromRAW_to_F(battery_temp_raw_3) - 320) * 5) / 9; //Convert from F to C
datalayer_nissan->temperature4 = ((Temp_fromRAW_to_F(battery_temp_raw_4) - 320) * 5) / 9; //Convert from F to C
datalayer_nissan->CryptoChallenge = incomingChallenge; datalayer_nissan->CryptoChallenge = incomingChallenge;
datalayer_nissan->SolvedChallengeMSB = datalayer_nissan->SolvedChallengeMSB =
((solvedChallenge[7] << 24) | (solvedChallenge[6] << 16) | (solvedChallenge[5] << 8) | solvedChallenge[4]); ((solvedChallenge[7] << 24) | (solvedChallenge[6] << 16) | (solvedChallenge[5] << 8) | solvedChallenge[4]);
@ -799,6 +803,8 @@ bool NissanLeafBattery::is_message_corrupt(CAN_frame rx_frame) {
uint16_t Temp_fromRAW_to_F(uint16_t temperature) { //This function feels horrible, but apparently works well uint16_t Temp_fromRAW_to_F(uint16_t temperature) { //This function feels horrible, but apparently works well
if (temperature == 1021) { if (temperature == 1021) {
return 10; return 10;
} else if (temperature == 65535) { //Value unavailable, sensor does not exist
return 718; //0*C final calculation
} else if (temperature >= 589) { } else if (temperature >= 589) {
return static_cast<uint16_t>(1620 - temperature * 1.81); return static_cast<uint16_t>(1620 - temperature * 1.81);
} else if (temperature >= 569) { } else if (temperature >= 569) {

8
Software/src/battery/NISSAN-LEAF-BATTERY.h
View file

@ -198,11 +198,11 @@ class NissanLeafBattery : public CanBattery {
uint16_t battery_min_max_voltage[2]; //contains cell min[0] and max[1] values in mV uint16_t battery_min_max_voltage[2]; //contains cell min[0] and max[1] values in mV
uint16_t battery_HX = 0; //Internal resistance uint16_t battery_HX = 0; //Internal resistance
uint16_t battery_insulation = 0; //Insulation resistance uint16_t battery_insulation = 0; //Insulation resistance
uint16_t battery_temp_raw_1 = 0; uint16_t battery_temp_raw_1 = 718;
uint8_t battery_temp_raw_2_highnibble = 0; uint8_t battery_temp_raw_2_highnibble = 0;
uint16_t battery_temp_raw_2 = 0; uint16_t battery_temp_raw_2 = 718;
uint16_t battery_temp_raw_3 = 0; uint16_t battery_temp_raw_3 = 718; //This measurement not available on 2013+
uint16_t battery_temp_raw_4 = 0; uint16_t battery_temp_raw_4 = 718;
uint16_t battery_temp_raw_max = 0; uint16_t battery_temp_raw_max = 0;
uint16_t battery_temp_raw_min = 0; uint16_t battery_temp_raw_min = 0;
int16_t battery_temp_polled_max = 0; int16_t battery_temp_polled_max = 0;

6
Software/src/battery/NISSAN-LEAF-HTML.h
View file

@ -54,6 +54,12 @@ class NissanLeafHtmlRenderer : public BatteryHtmlRenderer {
content += "<h4>Heating stopped: " + String(datalayer_extended.nissanleaf.HeatingStop) + "</h4>"; content += "<h4>Heating stopped: " + String(datalayer_extended.nissanleaf.HeatingStop) + "</h4>";
content += "<h4>Heating started: " + String(datalayer_extended.nissanleaf.HeatingStart) + "</h4>"; content += "<h4>Heating started: " + String(datalayer_extended.nissanleaf.HeatingStart) + "</h4>";
content += "<h4>Heating requested: " + String(datalayer_extended.nissanleaf.HeaterSendRequest) + "</h4>"; content += "<h4>Heating requested: " + String(datalayer_extended.nissanleaf.HeaterSendRequest) + "</h4>";
content += "<h4>Temperature 1: " + String(datalayer_extended.nissanleaf.temperature1 / 10.0) + " &deg;C</h4>";
content += "<h4>Temperature 2: " + String(datalayer_extended.nissanleaf.temperature2 / 10.0) + " &deg;C</h4>";
if (datalayer_extended.nissanleaf.LEAF_gen == 0) {
content += "<h4>Temperature 3: " + String(datalayer_extended.nissanleaf.temperature3 / 10.0) + " &deg;C</h4>";
}
content += "<h4>Temperature 4: " + String(datalayer_extended.nissanleaf.temperature4 / 10.0) + " &deg;C</h4>";
content += "<h4>CryptoChallenge: " + String(datalayer_extended.nissanleaf.CryptoChallenge) + "</h4>"; content += "<h4>CryptoChallenge: " + String(datalayer_extended.nissanleaf.CryptoChallenge) + "</h4>";
content += "<h4>SolvedChallenge: " + String(datalayer_extended.nissanleaf.SolvedChallengeMSB) + content += "<h4>SolvedChallenge: " + String(datalayer_extended.nissanleaf.SolvedChallengeMSB) +
String(datalayer_extended.nissanleaf.SolvedChallengeLSB) + "</h4>"; String(datalayer_extended.nissanleaf.SolvedChallengeLSB) + "</h4>";

6
Software/src/datalayer/datalayer_extended.h
View file

@ -625,6 +625,12 @@ struct DATALAYER_INFO_NISSAN_LEAF {
/** int16_t */ /** int16_t */
/** Insulation resistance, most likely kOhm */ /** Insulation resistance, most likely kOhm */
uint16_t Insulation = 0; uint16_t Insulation = 0;
/** int16_t */
/** Temperature sensoros 1-4 */
int16_t temperature1 = 0;
int16_t temperature2 = 0;
int16_t temperature3 = 0; // This sensor not available on 2013+ packs
int16_t temperature4 = 0;
/** uint8_t */ /** uint8_t */
/** battery_FAIL status */ /** battery_FAIL status */
uint8_t RelayCutRequest = 0; uint8_t RelayCutRequest = 0;