projects/evDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed this->

Browse Source
This commit is contained in:
Lubos Petrovic
2020-12-03 11:24:58 +01:00
parent 56198a6fd0
commit e2100ad6bf
11 changed files with 1631 additions and 1598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1112
Board320_240.cpp
View File

File diff suppressed because it is too large Load Diff

78
BoardInterface.cpp
View File

@@ -10,14 +10,14 @@
Set live data
*/
void BoardInterface::setLiveData(LiveData* pLiveData) {
this->liveData = pLiveData;
liveData = pLiveData;
}
/**
Attach car interface
*/
void BoardInterface::attachCar(CarInterface* pCarInterface) {
this->carInterface = pCarInterface;
carInterface = pCarInterface;
}
@@ -28,11 +28,11 @@ void BoardInterface::shutdownDevice() {
Serial.println("Shutdown.");
this->displayMessage("Shutdown in 3 sec.", "");
displayMessage("Shutdown in 3 sec.", "");
delay(3000);
setCpuFrequencyMhz(80);
this->setBrightness(0);
setBrightness(0);
//WiFi.disconnect(true);
//WiFi.mode(WIFI_OFF);
btStop();
@@ -52,7 +52,7 @@ void BoardInterface::saveSettings() {
// Flash to memory
Serial.println("Settings saved to eeprom.");
EEPROM.put(0, this->liveData->settings);
EEPROM.put(0, liveData->settings);
EEPROM.commit();
}
@@ -63,11 +63,11 @@ void BoardInterface::resetSettings() {
// Flash to memory
Serial.println("Factory reset.");
this->liveData->settings.initFlag = 1;
EEPROM.put(0, this->liveData->settings);
liveData->settings.initFlag = 1;
EEPROM.put(0, liveData->settings);
EEPROM.commit();
this->displayMessage("Settings erased", "Restarting in 5 seconds");
displayMessage("Settings erased", "Restarting in 5 seconds");
delay(5000);
ESP.restart();
@@ -81,28 +81,28 @@ void BoardInterface::loadSettings() {
String tmpStr;
// Init
this->liveData->settings.initFlag = 183;
this->liveData->settings.settingsVersion = 3;
this->liveData->settings.carType = CAR_KIA_ENIRO_2020_64;
liveData->settings.initFlag = 183;
liveData->settings.settingsVersion = 3;
liveData->settings.carType = CAR_KIA_ENIRO_2020_64;
// Default OBD adapter MAC and UUID's
tmpStr = "00:00:00:00:00:00"; // Pair via menu (middle button)
tmpStr.toCharArray(this->liveData->settings.obdMacAddress, tmpStr.length() + 1);
tmpStr.toCharArray(liveData->settings.obdMacAddress, tmpStr.length() + 1);
tmpStr = "000018f0-0000-1000-8000-00805f9b34fb"; // Default UUID's for VGate iCar Pro BLE4 adapter
tmpStr.toCharArray(this->liveData->settings.serviceUUID, tmpStr.length() + 1);
tmpStr.toCharArray(liveData->settings.serviceUUID, tmpStr.length() + 1);
tmpStr = "00002af0-0000-1000-8000-00805f9b34fb";
tmpStr.toCharArray(this->liveData->settings.charTxUUID, tmpStr.length() + 1);
tmpStr.toCharArray(liveData->settings.charTxUUID, tmpStr.length() + 1);
tmpStr = "00002af1-0000-1000-8000-00805f9b34fb";
tmpStr.toCharArray(this->liveData->settings.charRxUUID, tmpStr.length() + 1);
tmpStr.toCharArray(liveData->settings.charRxUUID, tmpStr.length() + 1);
this->liveData->settings.displayRotation = 1; // 1,3
this->liveData->settings.distanceUnit = 'k';
this->liveData->settings.temperatureUnit = 'c';
this->liveData->settings.pressureUnit = 'b';
this->liveData->settings.defaultScreen = 1;
this->liveData->settings.lcdBrightness = 0;
this->liveData->settings.debugScreen = 0;
this->liveData->settings.predrawnChargingGraphs = 1;
liveData->settings.displayRotation = 1; // 1,3
liveData->settings.distanceUnit = 'k';
liveData->settings.temperatureUnit = 'c';
liveData->settings.pressureUnit = 'b';
liveData->settings.defaultScreen = 1;
liveData->settings.lcdBrightness = 0;
liveData->settings.debugScreen = 0;
liveData->settings.predrawnChargingGraphs = 1;
#ifdef SIM800L_ENABLED
tmpStr = "internet.t-mobile.cz";
@@ -116,34 +116,34 @@ void BoardInterface::loadSettings() {
// Load settings and replace default values
Serial.println("Reading settings from eeprom.");
EEPROM.begin(sizeof(SETTINGS_STRUC));
EEPROM.get(0, this->liveData->tmpSettings);
EEPROM.get(0, liveData->tmpSettings);
// Init flash with default settings
if (this->liveData->tmpSettings.initFlag != 183) {
if (liveData->tmpSettings.initFlag != 183) {
Serial.println("Settings not found. Initialization.");
this->saveSettings();
saveSettings();
} else {
Serial.print("Loaded settings ver.: ");
Serial.println(this->liveData->settings.settingsVersion);
Serial.println(liveData->settings.settingsVersion);
// Upgrade structure
if (this->liveData->settings.settingsVersion != this->liveData->tmpSettings.settingsVersion) {
if (this->liveData->tmpSettings.settingsVersion == 1) {
this->liveData->tmpSettings.settingsVersion = 2;
this->liveData->tmpSettings.defaultScreen = this->liveData->settings.defaultScreen;
this->liveData->tmpSettings.lcdBrightness = this->liveData->settings.lcdBrightness;
this->liveData->tmpSettings.debugScreen = this->liveData->settings.debugScreen;
if (liveData->settings.settingsVersion != liveData->tmpSettings.settingsVersion) {
if (liveData->tmpSettings.settingsVersion == 1) {
liveData->tmpSettings.settingsVersion = 2;
liveData->tmpSettings.defaultScreen = liveData->settings.defaultScreen;
liveData->tmpSettings.lcdBrightness = liveData->settings.lcdBrightness;
liveData->tmpSettings.debugScreen = liveData->settings.debugScreen;
}
if (this->liveData->tmpSettings.settingsVersion == 2) {
this->liveData->tmpSettings.settingsVersion = 3;
this->liveData->tmpSettings.predrawnChargingGraphs = this->liveData->settings.predrawnChargingGraphs;
if (liveData->tmpSettings.settingsVersion == 2) {
liveData->tmpSettings.settingsVersion = 3;
liveData->tmpSettings.predrawnChargingGraphs = liveData->settings.predrawnChargingGraphs;
}
this->saveSettings();
saveSettings();
}
// Save version? No need to upgrade structure
if (this->liveData->settings.settingsVersion == this->liveData->tmpSettings.settingsVersion) {
this->liveData->settings = this->liveData->tmpSettings;
if (liveData->settings.settingsVersion == liveData->tmpSettings.settingsVersion) {
liveData->settings = liveData->tmpSettings;
}
}
}

51
BoardM5stackCore.cpp
View File

@@ -4,21 +4,58 @@
#include "BoardInterface.h"
#include "Board320_240.h"
#include "BoardM5stackCore.h"
#include <SPI.h>
#include <SD.h>
/**
Init board
*/
void BoardM5stackCore::initBoard() {
this->invertDisplay = true;
this->pinButtonLeft = BUTTON_LEFT;
this->pinButtonRight = BUTTON_RIGHT;
this->pinButtonMiddle = BUTTON_MIDDLE;
this->pinSpeaker = SPEAKER_PIN;
this->pinBrightness = TFT_BL;
invertDisplay = true;
pinButtonLeft = BUTTON_LEFT;
pinButtonRight = BUTTON_RIGHT;
pinButtonMiddle = BUTTON_MIDDLE;
pinSpeaker = SPEAKER_PIN;
pinBrightness = TFT_BL;
Board320_240::initBoard();
}
void BoardM5stackCore::mainLoop() {
Board320_240::mainLoop();
/*#define TFCARD_CS_PIN 4
if (!SD.begin(TFCARD_CS_PIN, SPI, 40000000)) {
Serial.println("Card Mount Failed");
return;
}
uint8_t cardType = SD.cardType();
if (cardType == CARD_NONE) {
Serial.println("No SD card attached");
return;
}
Serial.print("SD Card Type: ");
if (cardType == CARD_MMC) {
Serial.println("MMC");
} else if (cardType == CARD_SD) {
Serial.println("SDSC");
} else if (cardType == CARD_SDHC) {
Serial.println("SDHC");
} else {
Serial.println("UNKNOWN");
}
uint64_t cardSize = SD.cardSize() / (1024 * 1024);
Serial.printf("SD Card Size: %lluMB\n", cardSize);
Serial.printf("Total space: %lluMB\n", SD.totalBytes() / (1024 * 1024));
Serial.printf("Used space: %lluMB\n", SD.usedBytes() / (1024 * 1024));
*/
}
#endif // BOARDM5STACKCORE_CPP

6
BoardM5stackCore.h
View File

@@ -34,11 +34,11 @@
#include "Board320_240.h"
class BoardM5stackCore : public Board320_240 {
private:
private:
public:
void initBoard() override;
void mainLoop() override;
};
#endif // BOARDM5STACKCORE_H

10
BoardTtgoT4v13.cpp
View File

@@ -10,11 +10,11 @@
*/
void BoardTtgoT4v13::initBoard() {
this->pinButtonLeft = BUTTON_LEFT;
this->pinButtonRight = BUTTON_RIGHT;
this->pinButtonMiddle = BUTTON_MIDDLE;
//this->pinSpeaker = SPEAKER_PIN;
this->pinBrightness = TFT_BL;
pinButtonLeft = BUTTON_LEFT;
pinButtonRight = BUTTON_RIGHT;
pinButtonMiddle = BUTTON_MIDDLE;
//pinSpeaker = SPEAKER_PIN;
pinBrightness = TFT_BL;
Board320_240::initBoard();
}

420
CarHyundaiIoniq.cpp
View File

@@ -7,7 +7,7 @@
#define commandQueueLoopFromHyundaiIoniq 8
/**
activatethis->liveData->commandQueue
activateliveData->commandQueue
*/
void CarHyundaiIoniq::activateCommandQueue() {
@@ -63,19 +63,19 @@ void CarHyundaiIoniq::activateCommandQueue() {
};
// 28kWh version
this->liveData->params.batteryTotalAvailableKWh = 28;
this->liveData->params.batModuleTempCount = 12;
liveData->params.batteryTotalAvailableKWh = 28;
liveData->params.batModuleTempCount = 12;
// Empty and fill command queue
for (int i = 0; i < 300; i++) {
this->liveData->commandQueue[i] = "";
liveData->commandQueue[i] = "";
}
for (int i = 0; i < commandQueueCountHyundaiIoniq; i++) {
this->liveData->commandQueue[i] = commandQueueHyundaiIoniq[i];
liveData->commandQueue[i] = commandQueueHyundaiIoniq[i];
}
this->liveData->commandQueueLoopFrom = commandQueueLoopFromHyundaiIoniq;
this->liveData->commandQueueCount = commandQueueCountHyundaiIoniq;
liveData->commandQueueLoopFrom = commandQueueLoopFromHyundaiIoniq;
liveData->commandQueueCount = commandQueueCountHyundaiIoniq;
}
/**
@@ -84,157 +84,157 @@ void CarHyundaiIoniq::activateCommandQueue() {
void CarHyundaiIoniq::parseRowMerged() {
// VMCU 7E2
if (this->liveData->currentAtshRequest.equals("ATSH7E2")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.speedKmh = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (this->liveData->params.speedKmh < -99 || this->liveData->params.speedKmh > 200)
this->liveData->params.speedKmh = 0;
if (liveData->currentAtshRequest.equals("ATSH7E2")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.speedKmh = liveData->hexToDec(liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (liveData->params.speedKmh < -99 || liveData->params.speedKmh > 200)
liveData->params.speedKmh = 0;
}
if (this->liveData->commandRequest.equals("2102")) {
this->liveData->params.auxPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
this->liveData->params.auxCurrentAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
if (liveData->commandRequest.equals("2102")) {
liveData->params.auxPerc = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
liveData->params.auxCurrentAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
}
}
// Cluster module 7c6
if (this->liveData->currentAtshRequest.equals("ATSH7C6")) {
if (this->liveData->commandRequest.equals("22B002")) {
this->liveData->params.odoKm = float(strtol(this->liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
if (liveData->currentAtshRequest.equals("ATSH7C6")) {
if (liveData->commandRequest.equals("22B002")) {
liveData->params.odoKm = float(strtol(liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
}
}
// Aircon 7b3
if (this->liveData->currentAtshRequest.equals("ATSH7B3")) {
if (this->liveData->commandRequest.equals("220100")) {
this->liveData->params.indoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
this->liveData->params.outdoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
if (liveData->currentAtshRequest.equals("ATSH7B3")) {
if (liveData->commandRequest.equals("220100")) {
liveData->params.indoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
liveData->params.outdoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
}
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "00") {
this->liveData->params.coolantTemp1C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
this->liveData->params.coolantTemp2C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "00") {
liveData->params.coolantTemp1C = (liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
liveData->params.coolantTemp2C = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
}
}
// BMS 7e4
if (this->liveData->currentAtshRequest.equals("ATSH7E4")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.cumulativeEnergyChargedKWh = float(strtol(this->liveData->responseRowMerged.substring(80, 88).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyChargedKWhStart == -1)
this->liveData->params.cumulativeEnergyChargedKWhStart = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.cumulativeEnergyDischargedKWh = float(strtol(this->liveData->responseRowMerged.substring(88, 96).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyDischargedKWhStart == -1)
this->liveData->params.cumulativeEnergyDischargedKWhStart = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.availableChargePower = float(strtol(this->liveData->responseRowMerged.substring(16, 20).c_str(), 0, 16)) / 100.0;
this->liveData->params.availableDischargePower = float(strtol(this->liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
this->liveData->params.isolationResistanceKOhm = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
this->liveData->params.batFanStatus = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(58, 60).c_str(), 2, true);
this->liveData->params.batFanFeedbackHz = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(62, 64).c_str(), 2, true) / 10.0;
this->liveData->params.batPowerAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 28).c_str(), 2, true) / 10.0;
this->liveData->params.batVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(28, 32).c_str(), 2, false) / 10.0;
this->liveData->params.batPowerKw = (this->liveData->params.batPowerAmp * this->liveData->params.batVoltage) / 1000.0;
if (this->liveData->params.batPowerKw < 1) // Reset charging start time
this->liveData->params.chargingStartTime = this->liveData->params.currentTime;
this->liveData->params.batPowerKwh100 = this->liveData->params.batPowerKw / this->liveData->params.speedKmh * 100;
this->liveData->params.batCellMaxV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, false) / 50.0;
this->liveData->params.batCellMinV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(54, 56).c_str(), 1, false) / 50.0;
this->liveData->params.batModuleTempC[0] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
this->liveData->params.batModuleTempC[1] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
this->liveData->params.batModuleTempC[2] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
this->liveData->params.batModuleTempC[3] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
this->liveData->params.batModuleTempC[4] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
//this->liveData->params.batTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//this->liveData->params.batMaxC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 1, true);
//this->liveData->params.batMinC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
if (liveData->currentAtshRequest.equals("ATSH7E4")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.cumulativeEnergyChargedKWh = float(strtol(liveData->responseRowMerged.substring(80, 88).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyChargedKWhStart == -1)
liveData->params.cumulativeEnergyChargedKWhStart = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.cumulativeEnergyDischargedKWh = float(strtol(liveData->responseRowMerged.substring(88, 96).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyDischargedKWhStart == -1)
liveData->params.cumulativeEnergyDischargedKWhStart = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.availableChargePower = float(strtol(liveData->responseRowMerged.substring(16, 20).c_str(), 0, 16)) / 100.0;
liveData->params.availableDischargePower = float(strtol(liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
liveData->params.isolationResistanceKOhm = liveData->hexToDec(liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
liveData->params.batFanStatus = liveData->hexToDec(liveData->responseRowMerged.substring(58, 60).c_str(), 2, true);
liveData->params.batFanFeedbackHz = liveData->hexToDec(liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
liveData->params.auxVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(62, 64).c_str(), 2, true) / 10.0;
liveData->params.batPowerAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(24, 28).c_str(), 2, true) / 10.0;
liveData->params.batVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(28, 32).c_str(), 2, false) / 10.0;
liveData->params.batPowerKw = (liveData->params.batPowerAmp * liveData->params.batVoltage) / 1000.0;
if (liveData->params.batPowerKw < 1) // Reset charging start time
liveData->params.chargingStartTime = liveData->params.currentTime;
liveData->params.batPowerKwh100 = liveData->params.batPowerKw / liveData->params.speedKmh * 100;
liveData->params.batCellMaxV = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, false) / 50.0;
liveData->params.batCellMinV = liveData->hexToDec(liveData->responseRowMerged.substring(54, 56).c_str(), 1, false) / 50.0;
liveData->params.batModuleTempC[0] = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
liveData->params.batModuleTempC[1] = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
liveData->params.batModuleTempC[2] = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
liveData->params.batModuleTempC[3] = liveData->hexToDec(liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
liveData->params.batModuleTempC[4] = liveData->hexToDec(liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
//liveData->params.batTempC = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//liveData->params.batMaxC = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 1, true);
//liveData->params.batMinC = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batInletC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(48, 50).c_str(), 1, true);
if (this->liveData->params.speedKmh < 10 && this->liveData->params.batPowerKw >= 1 && this->liveData->params.socPerc > 0 && this->liveData->params.socPerc <= 100) {
if ( this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] == -100 || this->liveData->params.batPowerKw < this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
if ( this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] == -100 || this->liveData->params.batPowerKw > this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
this->liveData->params.chargingGraphBatMinTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMinC;
this->liveData->params.chargingGraphBatMaxTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMaxC;
this->liveData->params.chargingGraphHeaterTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batHeaterC;
liveData->params.batInletC = liveData->hexToDec(liveData->responseRowMerged.substring(48, 50).c_str(), 1, true);
if (liveData->params.speedKmh < 10 && liveData->params.batPowerKw >= 1 && liveData->params.socPerc > 0 && liveData->params.socPerc <= 100) {
if ( liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] == -100 || liveData->params.batPowerKw < liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
if ( liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] == -100 || liveData->params.batPowerKw > liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
liveData->params.chargingGraphBatMinTempC[int(liveData->params.socPerc)] = liveData->params.batMinC;
liveData->params.chargingGraphBatMaxTempC[int(liveData->params.socPerc)] = liveData->params.batMaxC;
liveData->params.chargingGraphHeaterTempC[int(liveData->params.socPerc)] = liveData->params.batHeaterC;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("2102") && this->liveData->responseRowMerged.substring(10, 12) == "FF") {
if (liveData->commandRequest.equals("2102") && liveData->responseRowMerged.substring(10, 12) == "FF") {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[i] = liveData->hexToDec(liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("2103")) {
if (liveData->commandRequest.equals("2103")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[32 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[32 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("2104")) {
if (liveData->commandRequest.equals("2104")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[64 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[64 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(12 + (i * 2), 12 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("2105")) {
this->liveData->params.socPercPrevious = this->liveData->params.socPerc;
this->liveData->params.sohPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(54, 58).c_str(), 2, false) / 10.0;
this->liveData->params.socPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(66, 68).c_str(), 1, false) / 2.0;
if (liveData->commandRequest.equals("2105")) {
liveData->params.socPercPrevious = liveData->params.socPerc;
liveData->params.sohPerc = liveData->hexToDec(liveData->responseRowMerged.substring(54, 58).c_str(), 2, false) / 10.0;
liveData->params.socPerc = liveData->hexToDec(liveData->responseRowMerged.substring(66, 68).c_str(), 1, false) / 2.0;
// Remaining battery modules (tempC)
this->liveData->params.batModuleTempC[5] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 1, true);
this->liveData->params.batModuleTempC[6] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 26).c_str(), 1, true);
this->liveData->params.batModuleTempC[7] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(26, 28).c_str(), 1, true);
this->liveData->params.batModuleTempC[8] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(28, 30).c_str(), 1, true);
this->liveData->params.batModuleTempC[9] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
this->liveData->params.batModuleTempC[10] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 1, true);
this->liveData->params.batModuleTempC[11] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
liveData->params.batModuleTempC[5] = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 1, true);
liveData->params.batModuleTempC[6] = liveData->hexToDec(liveData->responseRowMerged.substring(24, 26).c_str(), 1, true);
liveData->params.batModuleTempC[7] = liveData->hexToDec(liveData->responseRowMerged.substring(26, 28).c_str(), 1, true);
liveData->params.batModuleTempC[8] = liveData->hexToDec(liveData->responseRowMerged.substring(28, 30).c_str(), 1, true);
liveData->params.batModuleTempC[9] = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
liveData->params.batModuleTempC[10] = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 1, true);
liveData->params.batModuleTempC[11] = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
// Soc10ced table, record x0% CEC/CED table (ex. 90%->89%, 80%->79%)
if (this->liveData->params.socPercPrevious - this->liveData->params.socPerc > 0) {
byte index = (int(this->liveData->params.socPerc) == 4) ? 0 : (int)(this->liveData->params.socPerc / 10) + 1;
if ((int(this->liveData->params.socPerc) % 10 == 9 || int(this->liveData->params.socPerc) == 4) && this->liveData->params.soc10ced[index] == -1) {
this->liveData->params.soc10ced[index] = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.soc10cec[index] = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.soc10odo[index] = this->liveData->params.odoKm;
this->liveData->params.soc10time[index] = this->liveData->params.currentTime;
if (liveData->params.socPercPrevious - liveData->params.socPerc > 0) {
byte index = (int(liveData->params.socPerc) == 4) ? 0 : (int)(liveData->params.socPerc / 10) + 1;
if ((int(liveData->params.socPerc) % 10 == 9 || int(liveData->params.socPerc) == 4) && liveData->params.soc10ced[index] == -1) {
liveData->params.soc10ced[index] = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.soc10cec[index] = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.soc10odo[index] = liveData->params.odoKm;
liveData->params.soc10time[index] = liveData->params.currentTime;
}
}
this->liveData->params.batHeaterC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
liveData->params.batHeaterC = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
//
for (int i = 30; i < 32; i++) { // ai/aj position
this->liveData->params.cellVoltage[96 - 30 + i] = -1;
liveData->params.cellVoltage[96 - 30 + i] = -1;
}
}
// BMS 7e4
// IONIQ FAILED
if (this->liveData->commandRequest.equals("2106")) {
this->liveData->params.coolingWaterTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
if (liveData->commandRequest.equals("2106")) {
liveData->params.coolingWaterTempC = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
}
}
// TPMS 7a0
if (this->liveData->currentAtshRequest.equals("ATSH7A0")) {
if (this->liveData->commandRequest.equals("22c00b")) {
this->liveData->params.tireFrontLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireFrontRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
if (liveData->currentAtshRequest.equals("ATSH7A0")) {
if (liveData->commandRequest.equals("22c00b")) {
liveData->params.tireFrontLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireFrontRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
}
}
@@ -246,134 +246,134 @@ void CarHyundaiIoniq::parseRowMerged() {
void CarHyundaiIoniq::loadTestData() {
// VMCU ATSH7E2
this->liveData->currentAtshRequest = "ATSH7E2";
liveData->currentAtshRequest = "ATSH7E2";
// 2101
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101FFE0000009211222062F03000000001D7734";
this->parseRowMerged();
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101FFE0000009211222062F03000000001D7734";
parseRowMerged();
// 2102
this->liveData->commandRequest = "2102";
this->liveData->responseRowMerged = "6102FF80000001010000009315B2888D390B08618B683900000000";
this->parseRowMerged();
liveData->commandRequest = "2102";
liveData->responseRowMerged = "6102FF80000001010000009315B2888D390B08618B683900000000";
parseRowMerged();
// "ATSH7DF",
this->liveData->currentAtshRequest = "ATSH7DF";
liveData->currentAtshRequest = "ATSH7DF";
// AIRCON / ACU ATSH7B3
this->liveData->currentAtshRequest = "ATSH7B3";
liveData->currentAtshRequest = "ATSH7B3";
// 220100
this->liveData->commandRequest = "220100";
this->liveData->responseRowMerged = "6201007E5007C8FF8A876A011010FFFF10FF10FFFFFFFFFFFFFFFFFF2EEF767D00FFFF00FFFF000000";
this->parseRowMerged();
liveData->commandRequest = "220100";
liveData->responseRowMerged = "6201007E5007C8FF8A876A011010FFFF10FF10FFFFFFFFFFFFFFFFFF2EEF767D00FFFF00FFFF000000";
parseRowMerged();
// 220102
this->liveData->commandRequest = "220102";
this->liveData->responseRowMerged = "620102FF800000A3950000000000002600000000";
this->parseRowMerged();
liveData->commandRequest = "220102";
liveData->responseRowMerged = "620102FF800000A3950000000000002600000000";
parseRowMerged();
// BMS ATSH7E4
this->liveData->currentAtshRequest = "ATSH7E4";
liveData->currentAtshRequest = "ATSH7E4";
// 220101
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101FFFFFFFF5026482648A3FFC30D9E181717171718170019B50FB501000090000142230001425F0000771B00007486007815D809015C0000000003E800";
this->parseRowMerged();
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101FFFFFFFF5026482648A3FFC30D9E181717171718170019B50FB501000090000142230001425F0000771B00007486007815D809015C0000000003E800";
parseRowMerged();
// 220102
this->liveData->commandRequest = "2102";
this->liveData->responseRowMerged = "6102FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
this->parseRowMerged();
liveData->commandRequest = "2102";
liveData->responseRowMerged = "6102FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
parseRowMerged();
// 220103
this->liveData->commandRequest = "2103";
this->liveData->responseRowMerged = "6103FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
this->parseRowMerged();
liveData->commandRequest = "2103";
liveData->responseRowMerged = "6103FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
parseRowMerged();
// 220104
this->liveData->commandRequest = "2104";
this->liveData->responseRowMerged = "6104FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
this->parseRowMerged();
liveData->commandRequest = "2104";
liveData->responseRowMerged = "6104FFFFFFFFB5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5000000";
parseRowMerged();
// 220105
this->liveData->commandRequest = "2105";
this->liveData->responseRowMerged = "6105FFFFFFFF00000000001717171817171726482648000150181703E81A03E801520029000000000000000000000000";
this->parseRowMerged();
liveData->commandRequest = "2105";
liveData->responseRowMerged = "6105FFFFFFFF00000000001717171817171726482648000150181703E81A03E801520029000000000000000000000000";
parseRowMerged();
// 220106
this->liveData->commandRequest = "2106";
this->liveData->responseRowMerged = "7F2112"; // n/a on ioniq
this->parseRowMerged();
liveData->commandRequest = "2106";
liveData->responseRowMerged = "7F2112"; // n/a on ioniq
parseRowMerged();
// BCM / TPMS ATSH7A0
this->liveData->currentAtshRequest = "ATSH7A0";
liveData->currentAtshRequest = "ATSH7A0";
// 22c00b
this->liveData->commandRequest = "22c00b";
this->liveData->responseRowMerged = "62C00BFFFF0000B9510100B9510100B84F0100B54F0100AAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22c00b";
liveData->responseRowMerged = "62C00BFFFF0000B9510100B9510100B84F0100B54F0100AAAAAAAA";
parseRowMerged();
// ATSH7C6
this->liveData->currentAtshRequest = "ATSH7C6";
liveData->currentAtshRequest = "ATSH7C6";
// 22b002
this->liveData->commandRequest = "22b002";
this->liveData->responseRowMerged = "62B002E000000000AD003D2D0000000000000000";
this->parseRowMerged();
liveData->commandRequest = "22b002";
liveData->responseRowMerged = "62B002E000000000AD003D2D0000000000000000";
parseRowMerged();
/* this->liveData->params.batModule01TempC = 28;
this->liveData->params.batModule02TempC = 29;
this->liveData->params.batModule03TempC = 28;
this->liveData->params.batModule04TempC = 30;
//this->liveData->params.batTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//this->liveData->params.batMaxC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//this->liveData->params.batMinC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
/* liveData->params.batModule01TempC = 28;
liveData->params.batModule02TempC = 29;
liveData->params.batModule03TempC = 28;
liveData->params.batModule04TempC = 30;
//liveData->params.batTempC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//liveData->params.batMaxC = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//liveData->params.batMinC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModule01TempC;
this->liveData->params.batMinC = (this->liveData->params.batModule02TempC < this->liveData->params.batMinC) ? this->liveData->params.batModule02TempC : this->liveData->params.batMinC ;
this->liveData->params.batMinC = (this->liveData->params.batModule03TempC < this->liveData->params.batMinC) ? this->liveData->params.batModule03TempC : this->liveData->params.batMinC ;
this->liveData->params.batMinC = (this->liveData->params.batModule04TempC < this->liveData->params.batMinC) ? this->liveData->params.batModule04TempC : this->liveData->params.batMinC ;
this->liveData->params.batMaxC = (this->liveData->params.batModule02TempC > this->liveData->params.batMaxC) ? this->liveData->params.batModule02TempC : this->liveData->params.batMaxC ;
this->liveData->params.batMaxC = (this->liveData->params.batModule03TempC > this->liveData->params.batMaxC) ? this->liveData->params.batModule03TempC : this->liveData->params.batMaxC ;
this->liveData->params.batMaxC = (this->liveData->params.batModule04TempC > this->liveData->params.batMaxC) ? this->liveData->params.batModule04TempC : this->liveData->params.batMaxC ;
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModule01TempC;
liveData->params.batMinC = (liveData->params.batModule02TempC < liveData->params.batMinC) ? liveData->params.batModule02TempC : liveData->params.batMinC ;
liveData->params.batMinC = (liveData->params.batModule03TempC < liveData->params.batMinC) ? liveData->params.batModule03TempC : liveData->params.batMinC ;
liveData->params.batMinC = (liveData->params.batModule04TempC < liveData->params.batMinC) ? liveData->params.batModule04TempC : liveData->params.batMinC ;
liveData->params.batMaxC = (liveData->params.batModule02TempC > liveData->params.batMaxC) ? liveData->params.batModule02TempC : liveData->params.batMaxC ;
liveData->params.batMaxC = (liveData->params.batModule03TempC > liveData->params.batMaxC) ? liveData->params.batModule03TempC : liveData->params.batMaxC ;
liveData->params.batMaxC = (liveData->params.batModule04TempC > liveData->params.batMaxC) ? liveData->params.batModule04TempC : liveData->params.batMaxC ;
liveData->params.batTempC = liveData->params.batMinC;
//
this->liveData->params.soc10ced[10] = 2200;
this->liveData->params.soc10cec[10] = 2500;
this->liveData->params.soc10odo[10] = 13000;
this->liveData->params.soc10time[10] = 13000;
this->liveData->params.soc10ced[9] = this->liveData->params.soc10ced[10] + 6.4;
this->liveData->params.soc10cec[9] = this->liveData->params.soc10cec[10] + 0;
this->liveData->params.soc10odo[9] = this->liveData->params.soc10odo[10] + 30;
this->liveData->params.soc10time[9] = this->liveData->params.soc10time[10] + 900;
this->liveData->params.soc10ced[8] = this->liveData->params.soc10ced[9] + 6.8;
this->liveData->params.soc10cec[8] = this->liveData->params.soc10cec[9] + 0;
this->liveData->params.soc10odo[8] = this->liveData->params.soc10odo[9] + 30;
this->liveData->params.soc10time[8] = this->liveData->params.soc10time[9] + 900;
this->liveData->params.soc10ced[7] = this->liveData->params.soc10ced[8] + 7.2;
this->liveData->params.soc10cec[7] = this->liveData->params.soc10cec[8] + 0.6;
this->liveData->params.soc10odo[7] = this->liveData->params.soc10odo[8] + 30;
this->liveData->params.soc10time[7] = this->liveData->params.soc10time[8] + 900;
this->liveData->params.soc10ced[6] = this->liveData->params.soc10ced[7] + 6.7;
this->liveData->params.soc10cec[6] = this->liveData->params.soc10cec[7] + 0;
this->liveData->params.soc10odo[6] = this->liveData->params.soc10odo[7] + 30;
this->liveData->params.soc10time[6] = this->liveData->params.soc10time[7] + 900;
this->liveData->params.soc10ced[5] = this->liveData->params.soc10ced[6] + 6.7;
this->liveData->params.soc10cec[5] = this->liveData->params.soc10cec[6] + 0;
this->liveData->params.soc10odo[5] = this->liveData->params.soc10odo[6] + 30;
this->liveData->params.soc10time[5] = this->liveData->params.soc10time[6] + 900;
this->liveData->params.soc10ced[4] = this->liveData->params.soc10ced[5] + 6.4;
this->liveData->params.soc10cec[4] = this->liveData->params.soc10cec[5] + 0.3;
this->liveData->params.soc10odo[4] = this->liveData->params.soc10odo[5] + 30;
this->liveData->params.soc10time[4] = this->liveData->params.soc10time[5] + 900;
this->liveData->params.soc10ced[3] = this->liveData->params.soc10ced[4] + 6.4;
this->liveData->params.soc10cec[3] = this->liveData->params.soc10cec[4] + 0;
this->liveData->params.soc10odo[3] = this->liveData->params.soc10odo[4] + 30;
this->liveData->params.soc10time[3] = this->liveData->params.soc10time[4] + 900;
this->liveData->params.soc10ced[2] = this->liveData->params.soc10ced[3] + 5.4;
this->liveData->params.soc10cec[2] = this->liveData->params.soc10cec[3] + 0.1;
this->liveData->params.soc10odo[2] = this->liveData->params.soc10odo[3] + 30;
this->liveData->params.soc10time[2] = this->liveData->params.soc10time[3] + 900;
this->liveData->params.soc10ced[1] = this->liveData->params.soc10ced[2] + 6.2;
this->liveData->params.soc10cec[1] = this->liveData->params.soc10cec[2] + 0.1;
this->liveData->params.soc10odo[1] = this->liveData->params.soc10odo[2] + 30;
this->liveData->params.soc10time[1] = this->liveData->params.soc10time[2] + 900;
this->liveData->params.soc10ced[0] = this->liveData->params.soc10ced[1] + 2.9;
this->liveData->params.soc10cec[0] = this->liveData->params.soc10cec[1] + 0.5;
this->liveData->params.soc10odo[0] = this->liveData->params.soc10odo[1] + 15;
this->liveData->params.soc10time[0] = this->liveData->params.soc10time[1] + 900;
liveData->params.soc10ced[10] = 2200;
liveData->params.soc10cec[10] = 2500;
liveData->params.soc10odo[10] = 13000;
liveData->params.soc10time[10] = 13000;
liveData->params.soc10ced[9] = liveData->params.soc10ced[10] + 6.4;
liveData->params.soc10cec[9] = liveData->params.soc10cec[10] + 0;
liveData->params.soc10odo[9] = liveData->params.soc10odo[10] + 30;
liveData->params.soc10time[9] = liveData->params.soc10time[10] + 900;
liveData->params.soc10ced[8] = liveData->params.soc10ced[9] + 6.8;
liveData->params.soc10cec[8] = liveData->params.soc10cec[9] + 0;
liveData->params.soc10odo[8] = liveData->params.soc10odo[9] + 30;
liveData->params.soc10time[8] = liveData->params.soc10time[9] + 900;
liveData->params.soc10ced[7] = liveData->params.soc10ced[8] + 7.2;
liveData->params.soc10cec[7] = liveData->params.soc10cec[8] + 0.6;
liveData->params.soc10odo[7] = liveData->params.soc10odo[8] + 30;
liveData->params.soc10time[7] = liveData->params.soc10time[8] + 900;
liveData->params.soc10ced[6] = liveData->params.soc10ced[7] + 6.7;
liveData->params.soc10cec[6] = liveData->params.soc10cec[7] + 0;
liveData->params.soc10odo[6] = liveData->params.soc10odo[7] + 30;
liveData->params.soc10time[6] = liveData->params.soc10time[7] + 900;
liveData->params.soc10ced[5] = liveData->params.soc10ced[6] + 6.7;
liveData->params.soc10cec[5] = liveData->params.soc10cec[6] + 0;
liveData->params.soc10odo[5] = liveData->params.soc10odo[6] + 30;
liveData->params.soc10time[5] = liveData->params.soc10time[6] + 900;
liveData->params.soc10ced[4] = liveData->params.soc10ced[5] + 6.4;
liveData->params.soc10cec[4] = liveData->params.soc10cec[5] + 0.3;
liveData->params.soc10odo[4] = liveData->params.soc10odo[5] + 30;
liveData->params.soc10time[4] = liveData->params.soc10time[5] + 900;
liveData->params.soc10ced[3] = liveData->params.soc10ced[4] + 6.4;
liveData->params.soc10cec[3] = liveData->params.soc10cec[4] + 0;
liveData->params.soc10odo[3] = liveData->params.soc10odo[4] + 30;
liveData->params.soc10time[3] = liveData->params.soc10time[4] + 900;
liveData->params.soc10ced[2] = liveData->params.soc10ced[3] + 5.4;
liveData->params.soc10cec[2] = liveData->params.soc10cec[3] + 0.1;
liveData->params.soc10odo[2] = liveData->params.soc10odo[3] + 30;
liveData->params.soc10time[2] = liveData->params.soc10time[3] + 900;
liveData->params.soc10ced[1] = liveData->params.soc10ced[2] + 6.2;
liveData->params.soc10cec[1] = liveData->params.soc10cec[2] + 0.1;
liveData->params.soc10odo[1] = liveData->params.soc10odo[2] + 30;
liveData->params.soc10time[1] = liveData->params.soc10time[2] + 900;
liveData->params.soc10ced[0] = liveData->params.soc10ced[1] + 2.9;
liveData->params.soc10cec[0] = liveData->params.soc10cec[1] + 0.5;
liveData->params.soc10odo[0] = liveData->params.soc10odo[1] + 15;
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
*/
}

2
CarInterface.cpp
View File

@@ -5,7 +5,7 @@
#include "LiveData.h"
void CarInterface::setLiveData(LiveData* pLiveData) {
this->liveData = pLiveData;
liveData = pLiveData;
}
void CarInterface::activateCommandQueue() {

388
CarKiaDebugObd2.cpp
View File

@@ -219,18 +219,18 @@ void CarKiaDebugObd2::activateCommandQueue() {
};
// 39 or 64 kWh model?
this->liveData->params.batteryTotalAvailableKWh = 64;
liveData->params.batteryTotalAvailableKWh = 64;
// Empty and fill command queue
for (uint16_t i = 0; i < 300; i++) {
this->liveData->commandQueue[i] = "";
liveData->commandQueue[i] = "";
}
for (uint16_t i = 0; i < commandQueueCountDebugObd2Kia; i++) {
this->liveData->commandQueue[i] = commandQueueDebugObd2Kia[i];
liveData->commandQueue[i] = commandQueueDebugObd2Kia[i];
}
this->liveData->commandQueueLoopFrom = commandQueueLoopFromDebugObd2Kia;
this->liveData->commandQueueCount = commandQueueCountDebugObd2Kia;
liveData->commandQueueLoopFrom = commandQueueLoopFromDebugObd2Kia;
liveData->commandQueueCount = commandQueueCountDebugObd2Kia;
}
/**
@@ -239,142 +239,142 @@ void CarKiaDebugObd2::activateCommandQueue() {
void CarKiaDebugObd2::parseRowMerged() {
// VMCU 7E2
if (this->liveData->currentAtshRequest.equals("ATSH7E2")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.speedKmh = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (this->liveData->params.speedKmh < -99 || this->liveData->params.speedKmh > 200)
this->liveData->params.speedKmh = 0;
if (liveData->currentAtshRequest.equals("ATSH7E2")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.speedKmh = liveData->hexToDec(liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (liveData->params.speedKmh < -99 || liveData->params.speedKmh > 200)
liveData->params.speedKmh = 0;
}
if (this->liveData->commandRequest.equals("2102")) {
this->liveData->params.auxPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
this->liveData->params.auxCurrentAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
if (liveData->commandRequest.equals("2102")) {
liveData->params.auxPerc = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
liveData->params.auxCurrentAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
}
}
// Cluster module 7c6
if (this->liveData->currentAtshRequest.equals("ATSH7C6")) {
if (this->liveData->commandRequest.equals("22B002")) {
this->liveData->params.odoKm = float(strtol(this->liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
if (liveData->currentAtshRequest.equals("ATSH7C6")) {
if (liveData->commandRequest.equals("22B002")) {
liveData->params.odoKm = float(strtol(liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
}
}
// Aircon 7b3
if (this->liveData->currentAtshRequest.equals("ATSH7B3")) {
if (this->liveData->commandRequest.equals("220100")) {
this->liveData->params.indoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
this->liveData->params.outdoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
if (liveData->currentAtshRequest.equals("ATSH7B3")) {
if (liveData->commandRequest.equals("220100")) {
liveData->params.indoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
liveData->params.outdoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
}
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "00") {
this->liveData->params.coolantTemp1C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
this->liveData->params.coolantTemp2C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "00") {
liveData->params.coolantTemp1C = (liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
liveData->params.coolantTemp2C = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
}
}
// BMS 7e4
if (this->liveData->currentAtshRequest.equals("ATSH7E4")) {
if (this->liveData->commandRequest.equals("220101")) {
this->liveData->params.cumulativeEnergyChargedKWh = float(strtol(this->liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyChargedKWhStart == -1)
this->liveData->params.cumulativeEnergyChargedKWhStart = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.cumulativeEnergyDischargedKWh = float(strtol(this->liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyDischargedKWhStart == -1)
this->liveData->params.cumulativeEnergyDischargedKWhStart = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
this->liveData->params.batPowerAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(26, 30).c_str(), 2, true) / 10.0;
this->liveData->params.batVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
this->liveData->params.batPowerKw = (this->liveData->params.batPowerAmp * this->liveData->params.batVoltage) / 1000.0;
this->liveData->params.batPowerKwh100 = this->liveData->params.batPowerKw / this->liveData->params.speedKmh * 100;
this->liveData->params.batCellMaxV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(52, 54).c_str(), 1, false) / 50.0;
this->liveData->params.batCellMinV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 58).c_str(), 1, false) / 50.0;
this->liveData->params.batModuleTempC[0] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
this->liveData->params.batModuleTempC[1] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
this->liveData->params.batModuleTempC[2] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
this->liveData->params.batModuleTempC[3] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
//this->liveData->params.batTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//this->liveData->params.batMaxC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//this->liveData->params.batMinC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
if (liveData->currentAtshRequest.equals("ATSH7E4")) {
if (liveData->commandRequest.equals("220101")) {
liveData->params.cumulativeEnergyChargedKWh = float(strtol(liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyChargedKWhStart == -1)
liveData->params.cumulativeEnergyChargedKWhStart = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.cumulativeEnergyDischargedKWh = float(strtol(liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyDischargedKWhStart == -1)
liveData->params.cumulativeEnergyDischargedKWhStart = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.auxVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
liveData->params.batPowerAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(26, 30).c_str(), 2, true) / 10.0;
liveData->params.batVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
liveData->params.batPowerKw = (liveData->params.batPowerAmp * liveData->params.batVoltage) / 1000.0;
liveData->params.batPowerKwh100 = liveData->params.batPowerKw / liveData->params.speedKmh * 100;
liveData->params.batCellMaxV = liveData->hexToDec(liveData->responseRowMerged.substring(52, 54).c_str(), 1, false) / 50.0;
liveData->params.batCellMinV = liveData->hexToDec(liveData->responseRowMerged.substring(56, 58).c_str(), 1, false) / 50.0;
liveData->params.batModuleTempC[0] = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
liveData->params.batModuleTempC[1] = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
liveData->params.batModuleTempC[2] = liveData->hexToDec(liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
liveData->params.batModuleTempC[3] = liveData->hexToDec(liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
//liveData->params.batTempC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//liveData->params.batMaxC = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//liveData->params.batMinC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
this->liveData->params.batMinC = (this->liveData->params.batModuleTempC[1] < this->liveData->params.batMinC) ? this->liveData->params.batModuleTempC[1] : this->liveData->params.batMinC;
this->liveData->params.batMinC = (this->liveData->params.batModuleTempC[2] < this->liveData->params.batMinC) ? this->liveData->params.batModuleTempC[2] : this->liveData->params.batMinC;
this->liveData->params.batMinC = (this->liveData->params.batModuleTempC[3] < this->liveData->params.batMinC) ? this->liveData->params.batModuleTempC[3] : this->liveData->params.batMinC;
this->liveData->params.batMaxC = (this->liveData->params.batModuleTempC[1] > this->liveData->params.batMaxC) ? this->liveData->params.batModuleTempC[1] : this->liveData->params.batMaxC;
this->liveData->params.batMaxC = (this->liveData->params.batModuleTempC[2] > this->liveData->params.batMaxC) ? this->liveData->params.batModuleTempC[2] : this->liveData->params.batMaxC;
this->liveData->params.batMaxC = (this->liveData->params.batModuleTempC[3] > this->liveData->params.batMaxC) ? this->liveData->params.batModuleTempC[3] : this->liveData->params.batMaxC;
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
liveData->params.batMinC = (liveData->params.batModuleTempC[1] < liveData->params.batMinC) ? liveData->params.batModuleTempC[1] : liveData->params.batMinC;
liveData->params.batMinC = (liveData->params.batModuleTempC[2] < liveData->params.batMinC) ? liveData->params.batModuleTempC[2] : liveData->params.batMinC;
liveData->params.batMinC = (liveData->params.batModuleTempC[3] < liveData->params.batMinC) ? liveData->params.batModuleTempC[3] : liveData->params.batMinC;
liveData->params.batMaxC = (liveData->params.batModuleTempC[1] > liveData->params.batMaxC) ? liveData->params.batModuleTempC[1] : liveData->params.batMaxC;
liveData->params.batMaxC = (liveData->params.batModuleTempC[2] > liveData->params.batMaxC) ? liveData->params.batModuleTempC[2] : liveData->params.batMaxC;
liveData->params.batMaxC = (liveData->params.batModuleTempC[3] > liveData->params.batMaxC) ? liveData->params.batModuleTempC[3] : liveData->params.batMaxC;
liveData->params.batTempC = liveData->params.batMinC;
this->liveData->params.batInletC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (this->liveData->params.speedKmh < 10 && this->liveData->params.batPowerKw >= 1 && this->liveData->params.socPerc > 0 && this->liveData->params.socPerc <= 100) {
if ( this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] == -100 || this->liveData->params.batPowerKw < this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
if ( this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] == -100 || this->liveData->params.batPowerKw > this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
this->liveData->params.chargingGraphBatMinTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMinC;
this->liveData->params.chargingGraphBatMaxTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMaxC;
this->liveData->params.chargingGraphHeaterTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batHeaterC;
liveData->params.batInletC = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (liveData->params.speedKmh < 10 && liveData->params.batPowerKw >= 1 && liveData->params.socPerc > 0 && liveData->params.socPerc <= 100) {
if ( liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] == -100 || liveData->params.batPowerKw < liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
if ( liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] == -100 || liveData->params.batPowerKw > liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
liveData->params.chargingGraphBatMinTempC[int(liveData->params.socPerc)] = liveData->params.batMinC;
liveData->params.chargingGraphBatMaxTempC[int(liveData->params.socPerc)] = liveData->params.batMaxC;
liveData->params.chargingGraphHeaterTempC[int(liveData->params.socPerc)] = liveData->params.batHeaterC;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "FF") {
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "FF") {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220103")) {
if (liveData->commandRequest.equals("220103")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[32 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[32 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220104")) {
if (liveData->commandRequest.equals("220104")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[64 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[64 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220105")) {
this->liveData->params.socPercPrevious = this->liveData->params.socPerc;
this->liveData->params.sohPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
this->liveData->params.socPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
if (liveData->commandRequest.equals("220105")) {
liveData->params.socPercPrevious = liveData->params.socPerc;
liveData->params.sohPerc = liveData->hexToDec(liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
liveData->params.socPerc = liveData->hexToDec(liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
// Soc10ced table, record x0% CEC/CED table (ex. 90%->89%, 80%->79%)
if (this->liveData->params.socPercPrevious - this->liveData->params.socPerc > 0) {
byte index = (int(this->liveData->params.socPerc) == 4) ? 0 : (int)(this->liveData->params.socPerc / 10) + 1;
if ((int(this->liveData->params.socPerc) % 10 == 9 || int(this->liveData->params.socPerc) == 4) && this->liveData->params.soc10ced[index] == -1) {
if (liveData->params.socPercPrevious - liveData->params.socPerc > 0) {
byte index = (int(liveData->params.socPerc) == 4) ? 0 : (int)(liveData->params.socPerc / 10) + 1;
if ((int(liveData->params.socPerc) % 10 == 9 || int(liveData->params.socPerc) == 4) && liveData->params.soc10ced[index] == -1) {
struct tm now;
getLocalTime(&now, 0);
time_t time_now_epoch = mktime(&now);
this->liveData->params.soc10ced[index] = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.soc10cec[index] = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.soc10odo[index] = this->liveData->params.odoKm;
this->liveData->params.soc10time[index] = time_now_epoch;
liveData->params.soc10ced[index] = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.soc10cec[index] = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.soc10odo[index] = liveData->params.odoKm;
liveData->params.soc10time[index] = time_now_epoch;
}
}
this->liveData->params.batHeaterC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
liveData->params.batHeaterC = liveData->hexToDec(liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
//
for (int i = 30; i < 32; i++) { // ai/aj position
this->liveData->params.cellVoltage[96 - 30 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[96 - 30 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220106")) {
this->liveData->params.coolingWaterTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
if (liveData->commandRequest.equals("220106")) {
liveData->params.coolingWaterTempC = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
}
}
// TPMS 7a0
if (this->liveData->currentAtshRequest.equals("ATSH7A0")) {
if (this->liveData->commandRequest.equals("22c00b")) {
this->liveData->params.tireFrontLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireFrontRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
if (liveData->currentAtshRequest.equals("ATSH7A0")) {
if (liveData->commandRequest.equals("22c00b")) {
liveData->params.tireFrontLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireFrontRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
}
}
@@ -386,134 +386,134 @@ void CarKiaDebugObd2::parseRowMerged() {
void CarKiaDebugObd2::loadTestData() {
// VMCU ATSH7E2
this->liveData->currentAtshRequest = "ATSH7E2";
liveData->currentAtshRequest = "ATSH7E2";
// 2101
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
this->parseRowMerged();
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
parseRowMerged();
// 2102
this->liveData->commandRequest = "2102";
this->liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
this->liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
this->parseRowMerged();
liveData->commandRequest = "2102";
liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
parseRowMerged();
// "ATSH7DF",
this->liveData->currentAtshRequest = "ATSH7DF";
liveData->currentAtshRequest = "ATSH7DF";
// 2106
this->liveData->commandRequest = "2106";
this->liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
this->parseRowMerged();
liveData->commandRequest = "2106";
liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
parseRowMerged();
// AIRCON / ACU ATSH7B3
this->liveData->currentAtshRequest = "ATSH7B3";
liveData->currentAtshRequest = "ATSH7B3";
// 220100
this->liveData->commandRequest = "220100";
this->liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
this->liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
this->parseRowMerged();
liveData->commandRequest = "220100";
liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
parseRowMerged();
// BMS ATSH7E4
this->liveData->currentAtshRequest = "ATSH7E4";
liveData->currentAtshRequest = "ATSH7E4";
// 220101
this->liveData->commandRequest = "220101";
this->liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
this->liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
this->parseRowMerged();
liveData->commandRequest = "220101";
liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
parseRowMerged();
// 220102
this->liveData->commandRequest = "220102";
this->liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220102";
liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220103
this->liveData->commandRequest = "220103";
this->liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220103";
liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220104
this->liveData->commandRequest = "220104";
this->liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220104";
liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220105
this->liveData->commandRequest = "220105";
this->liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
this->liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
this->parseRowMerged();
liveData->commandRequest = "220105";
liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
parseRowMerged();
// 220106
this->liveData->commandRequest = "220106";
this->liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
this->parseRowMerged();
liveData->commandRequest = "220106";
liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
parseRowMerged();
// BCM / TPMS ATSH7A0
this->liveData->currentAtshRequest = "ATSH7A0";
liveData->currentAtshRequest = "ATSH7A0";
// 22c00b
this->liveData->commandRequest = "22c00b";
this->liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22c00b";
liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
parseRowMerged();
// ATSH7C6
this->liveData->currentAtshRequest = "ATSH7C6";
liveData->currentAtshRequest = "ATSH7C6";
// 22b002
this->liveData->commandRequest = "22b002";
this->liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
this->parseRowMerged();
liveData->commandRequest = "22b002";
liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
parseRowMerged();
this->liveData->params.batModuleTempC[0] = 28;
this->liveData->params.batModuleTempC[1] = 29;
this->liveData->params.batModuleTempC[2] = 28;
this->liveData->params.batModuleTempC[3] = 30;
liveData->params.batModuleTempC[0] = 28;
liveData->params.batModuleTempC[1] = 29;
liveData->params.batModuleTempC[2] = 28;
liveData->params.batModuleTempC[3] = 30;
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
//
this->liveData->params.soc10ced[10] = 2200;
this->liveData->params.soc10cec[10] = 2500;
this->liveData->params.soc10odo[10] = 13000;
this->liveData->params.soc10time[10] = 13000;
this->liveData->params.soc10ced[9] = this->liveData->params.soc10ced[10] + 6.4;
this->liveData->params.soc10cec[9] = this->liveData->params.soc10cec[10] + 0;
this->liveData->params.soc10odo[9] = this->liveData->params.soc10odo[10] + 30;
this->liveData->params.soc10time[9] = this->liveData->params.soc10time[10] + 900;
this->liveData->params.soc10ced[8] = this->liveData->params.soc10ced[9] + 6.8;
this->liveData->params.soc10cec[8] = this->liveData->params.soc10cec[9] + 0;
this->liveData->params.soc10odo[8] = this->liveData->params.soc10odo[9] + 30;
this->liveData->params.soc10time[8] = this->liveData->params.soc10time[9] + 900;
this->liveData->params.soc10ced[7] = this->liveData->params.soc10ced[8] + 7.2;
this->liveData->params.soc10cec[7] = this->liveData->params.soc10cec[8] + 0.6;
this->liveData->params.soc10odo[7] = this->liveData->params.soc10odo[8] + 30;
this->liveData->params.soc10time[7] = this->liveData->params.soc10time[8] + 900;
this->liveData->params.soc10ced[6] = this->liveData->params.soc10ced[7] + 6.7;
this->liveData->params.soc10cec[6] = this->liveData->params.soc10cec[7] + 0;
this->liveData->params.soc10odo[6] = this->liveData->params.soc10odo[7] + 30;
this->liveData->params.soc10time[6] = this->liveData->params.soc10time[7] + 900;
this->liveData->params.soc10ced[5] = this->liveData->params.soc10ced[6] + 6.7;
this->liveData->params.soc10cec[5] = this->liveData->params.soc10cec[6] + 0;
this->liveData->params.soc10odo[5] = this->liveData->params.soc10odo[6] + 30;
this->liveData->params.soc10time[5] = this->liveData->params.soc10time[6] + 900;
this->liveData->params.soc10ced[4] = this->liveData->params.soc10ced[5] + 6.4;
this->liveData->params.soc10cec[4] = this->liveData->params.soc10cec[5] + 0.3;
this->liveData->params.soc10odo[4] = this->liveData->params.soc10odo[5] + 30;
this->liveData->params.soc10time[4] = this->liveData->params.soc10time[5] + 900;
this->liveData->params.soc10ced[3] = this->liveData->params.soc10ced[4] + 6.4;
this->liveData->params.soc10cec[3] = this->liveData->params.soc10cec[4] + 0;
this->liveData->params.soc10odo[3] = this->liveData->params.soc10odo[4] + 30;
this->liveData->params.soc10time[3] = this->liveData->params.soc10time[4] + 900;
this->liveData->params.soc10ced[2] = this->liveData->params.soc10ced[3] + 5.4;
this->liveData->params.soc10cec[2] = this->liveData->params.soc10cec[3] + 0.1;
this->liveData->params.soc10odo[2] = this->liveData->params.soc10odo[3] + 30;
this->liveData->params.soc10time[2] = this->liveData->params.soc10time[3] + 900;
this->liveData->params.soc10ced[1] = this->liveData->params.soc10ced[2] + 6.2;
this->liveData->params.soc10cec[1] = this->liveData->params.soc10cec[2] + 0.1;
this->liveData->params.soc10odo[1] = this->liveData->params.soc10odo[2] + 30;
this->liveData->params.soc10time[1] = this->liveData->params.soc10time[2] + 900;
this->liveData->params.soc10ced[0] = this->liveData->params.soc10ced[1] + 2.9;
this->liveData->params.soc10cec[0] = this->liveData->params.soc10cec[1] + 0.5;
this->liveData->params.soc10odo[0] = this->liveData->params.soc10odo[1] + 15;
this->liveData->params.soc10time[0] = this->liveData->params.soc10time[1] + 900;
liveData->params.soc10ced[10] = 2200;
liveData->params.soc10cec[10] = 2500;
liveData->params.soc10odo[10] = 13000;
liveData->params.soc10time[10] = 13000;
liveData->params.soc10ced[9] = liveData->params.soc10ced[10] + 6.4;
liveData->params.soc10cec[9] = liveData->params.soc10cec[10] + 0;
liveData->params.soc10odo[9] = liveData->params.soc10odo[10] + 30;
liveData->params.soc10time[9] = liveData->params.soc10time[10] + 900;
liveData->params.soc10ced[8] = liveData->params.soc10ced[9] + 6.8;
liveData->params.soc10cec[8] = liveData->params.soc10cec[9] + 0;
liveData->params.soc10odo[8] = liveData->params.soc10odo[9] + 30;
liveData->params.soc10time[8] = liveData->params.soc10time[9] + 900;
liveData->params.soc10ced[7] = liveData->params.soc10ced[8] + 7.2;
liveData->params.soc10cec[7] = liveData->params.soc10cec[8] + 0.6;
liveData->params.soc10odo[7] = liveData->params.soc10odo[8] + 30;
liveData->params.soc10time[7] = liveData->params.soc10time[8] + 900;
liveData->params.soc10ced[6] = liveData->params.soc10ced[7] + 6.7;
liveData->params.soc10cec[6] = liveData->params.soc10cec[7] + 0;
liveData->params.soc10odo[6] = liveData->params.soc10odo[7] + 30;
liveData->params.soc10time[6] = liveData->params.soc10time[7] + 900;
liveData->params.soc10ced[5] = liveData->params.soc10ced[6] + 6.7;
liveData->params.soc10cec[5] = liveData->params.soc10cec[6] + 0;
liveData->params.soc10odo[5] = liveData->params.soc10odo[6] + 30;
liveData->params.soc10time[5] = liveData->params.soc10time[6] + 900;
liveData->params.soc10ced[4] = liveData->params.soc10ced[5] + 6.4;
liveData->params.soc10cec[4] = liveData->params.soc10cec[5] + 0.3;
liveData->params.soc10odo[4] = liveData->params.soc10odo[5] + 30;
liveData->params.soc10time[4] = liveData->params.soc10time[5] + 900;
liveData->params.soc10ced[3] = liveData->params.soc10ced[4] + 6.4;
liveData->params.soc10cec[3] = liveData->params.soc10cec[4] + 0;
liveData->params.soc10odo[3] = liveData->params.soc10odo[4] + 30;
liveData->params.soc10time[3] = liveData->params.soc10time[4] + 900;
liveData->params.soc10ced[2] = liveData->params.soc10ced[3] + 5.4;
liveData->params.soc10cec[2] = liveData->params.soc10cec[3] + 0.1;
liveData->params.soc10odo[2] = liveData->params.soc10odo[3] + 30;
liveData->params.soc10time[2] = liveData->params.soc10time[3] + 900;
liveData->params.soc10ced[1] = liveData->params.soc10ced[2] + 6.2;
liveData->params.soc10cec[1] = liveData->params.soc10cec[2] + 0.1;
liveData->params.soc10odo[1] = liveData->params.soc10odo[2] + 30;
liveData->params.soc10time[1] = liveData->params.soc10time[2] + 900;
liveData->params.soc10ced[0] = liveData->params.soc10ced[1] + 2.9;
liveData->params.soc10cec[0] = liveData->params.soc10cec[1] + 0.5;
liveData->params.soc10odo[0] = liveData->params.soc10odo[1] + 15;
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
}

472
CarKiaEniro.cpp
View File

@@ -84,23 +84,23 @@ void CarKiaEniro::activateCommandQueue() {
};
// 39 or 64 kWh model?
this->liveData->params.batModuleTempCount = 4;
this->liveData->params.batteryTotalAvailableKWh = 64;
liveData->params.batModuleTempCount = 4;
liveData->params.batteryTotalAvailableKWh = 64;
// =(I18*0,615)*(1+(I18*0,0008)) soc to kwh niro ev 2020
if (this->liveData->settings.carType == CAR_KIA_ENIRO_2020_39 || this->liveData->settings.carType == CAR_HYUNDAI_KONA_2020_39) {
this->liveData->params.batteryTotalAvailableKWh = 39.2;
if (liveData->settings.carType == CAR_KIA_ENIRO_2020_39 || liveData->settings.carType == CAR_HYUNDAI_KONA_2020_39) {
liveData->params.batteryTotalAvailableKWh = 39.2;
}
// Empty and fill command queue
for (int i = 0; i < 300; i++) {
this->liveData->commandQueue[i] = "";
liveData->commandQueue[i] = "";
}
for (int i = 0; i < commandQueueCountKiaENiro; i++) {
this->liveData->commandQueue[i] = commandQueueKiaENiro[i];
liveData->commandQueue[i] = commandQueueKiaENiro[i];
}
this->liveData->commandQueueLoopFrom = commandQueueLoopFromKiaENiro;
this->liveData->commandQueueCount = commandQueueCountKiaENiro;
liveData->commandQueueLoopFrom = commandQueueLoopFromKiaENiro;
liveData->commandQueueCount = commandQueueCountKiaENiro;
}
/**
@@ -111,181 +111,181 @@ void CarKiaEniro::parseRowMerged() {
bool tempByte;
// ABS / ESP + AHB 7D1
if (this->liveData->currentAtshRequest.equals("ATSH7D1")) {
if (this->liveData->commandRequest.equals("22C101")) {
uint8_t driveMode = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 1, false);
this->liveData->params.forwardDriveMode = (driveMode == 4);
this->liveData->params.reverseDriveMode = (driveMode == 2);
this->liveData->params.parkModeOrNeutral = (driveMode == 1);
if (liveData->currentAtshRequest.equals("ATSH7D1")) {
if (liveData->commandRequest.equals("22C101")) {
uint8_t driveMode = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 1, false);
liveData->params.forwardDriveMode = (driveMode == 4);
liveData->params.reverseDriveMode = (driveMode == 2);
liveData->params.parkModeOrNeutral = (driveMode == 1);
}
}
// IGPM
if (this->liveData->currentAtshRequest.equals("ATSH770")) {
if (this->liveData->commandRequest.equals("22BC03")) {
tempByte = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false);
this->liveData->params.ignitionOnPrevious = this->liveData->params.ignitionOn;
this->liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1);
if (this->liveData->params.ignitionOnPrevious && !this->liveData->params.ignitionOn)
this->liveData->params.automaticShutdownTimer = this->liveData->params.currentTime;
if (liveData->currentAtshRequest.equals("ATSH770")) {
if (liveData->commandRequest.equals("22BC03")) {
tempByte = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false);
liveData->params.ignitionOnPrevious = liveData->params.ignitionOn;
liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1);
if (liveData->params.ignitionOnPrevious && !liveData->params.ignitionOn)
liveData->params.automaticShutdownTimer = liveData->params.currentTime;
this->liveData->params.lightInfo = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false);
this->liveData->params.headLights = (bitRead(this->liveData->params.lightInfo, 5) == 1);
this->liveData->params.dayLights = (bitRead(this->liveData->params.lightInfo, 3) == 1);
liveData->params.lightInfo = liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false);
liveData->params.headLights = (bitRead(liveData->params.lightInfo, 5) == 1);
liveData->params.dayLights = (bitRead(liveData->params.lightInfo, 3) == 1);
}
if (this->liveData->commandRequest.equals("22BC06")) {
this->liveData->params.brakeLightInfo = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
this->liveData->params.brakeLights = (bitRead(this->liveData->params.brakeLightInfo, 5) == 1);
if (liveData->commandRequest.equals("22BC06")) {
liveData->params.brakeLightInfo = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
liveData->params.brakeLights = (bitRead(liveData->params.brakeLightInfo, 5) == 1);
}
}
// VMCU 7E2
if (this->liveData->currentAtshRequest.equals("ATSH7E2")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.speedKmh = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (this->liveData->params.speedKmh < -99 || this->liveData->params.speedKmh > 200)
this->liveData->params.speedKmh = 0;
if (liveData->currentAtshRequest.equals("ATSH7E2")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.speedKmh = liveData->hexToDec(liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (liveData->params.speedKmh < -99 || liveData->params.speedKmh > 200)
liveData->params.speedKmh = 0;
}
if (this->liveData->commandRequest.equals("2102")) {
this->liveData->params.auxPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
this->liveData->params.auxCurrentAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
if (liveData->commandRequest.equals("2102")) {
liveData->params.auxPerc = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
liveData->params.auxCurrentAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
}
}
// Cluster module 7c6
if (this->liveData->currentAtshRequest.equals("ATSH7C6")) {
if (this->liveData->commandRequest.equals("22B002")) {
this->liveData->params.odoKm = float(strtol(this->liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
if (liveData->currentAtshRequest.equals("ATSH7C6")) {
if (liveData->commandRequest.equals("22B002")) {
liveData->params.odoKm = float(strtol(liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
}
}
// Aircon 7b3
if (this->liveData->currentAtshRequest.equals("ATSH7B3")) {
if (this->liveData->commandRequest.equals("220100")) {
this->liveData->params.indoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
this->liveData->params.outdoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
if (liveData->currentAtshRequest.equals("ATSH7B3")) {
if (liveData->commandRequest.equals("220100")) {
liveData->params.indoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
liveData->params.outdoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
}
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "00") {
this->liveData->params.coolantTemp1C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
this->liveData->params.coolantTemp2C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "00") {
liveData->params.coolantTemp1C = (liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
liveData->params.coolantTemp2C = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
}
}
// BMS 7e4
if (this->liveData->currentAtshRequest.equals("ATSH7E4")) {
if (this->liveData->commandRequest.equals("220101")) {
this->liveData->params.cumulativeEnergyChargedKWh = float(strtol(this->liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyChargedKWhStart == -1)
this->liveData->params.cumulativeEnergyChargedKWhStart = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.cumulativeEnergyDischargedKWh = float(strtol(this->liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyDischargedKWhStart == -1)
this->liveData->params.cumulativeEnergyDischargedKWhStart = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.availableChargePower = float(strtol(this->liveData->responseRowMerged.substring(16, 20).c_str(), 0, 16)) / 100.0;
this->liveData->params.availableDischargePower = float(strtol(this->liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
//this->liveData->params.isolationResistanceKOhm = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
this->liveData->params.batFanStatus = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
this->liveData->params.batFanFeedbackHz = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(62, 64).c_str(), 2, true);
this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
this->liveData->params.batPowerAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(26, 30).c_str(), 2, true) / 10.0;
this->liveData->params.batVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
this->liveData->params.batPowerKw = (this->liveData->params.batPowerAmp * this->liveData->params.batVoltage) / 1000.0;
if (this->liveData->params.batPowerKw < 0) // Reset charging start time
this->liveData->params.chargingStartTime = this->liveData->params.currentTime;
this->liveData->params.batPowerKwh100 = this->liveData->params.batPowerKw / this->liveData->params.speedKmh * 100;
this->liveData->params.batCellMaxV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(52, 54).c_str(), 1, false) / 50.0;
this->liveData->params.batCellMinV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 58).c_str(), 1, false) / 50.0;
this->liveData->params.batModuleTempC[0] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
this->liveData->params.batModuleTempC[1] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
this->liveData->params.batModuleTempC[2] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
this->liveData->params.batModuleTempC[3] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
this->liveData->params.motorRpm = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(112, 116).c_str(), 2, false);
//this->liveData->params.batTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//this->liveData->params.batMaxC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//this->liveData->params.batMinC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
if (liveData->currentAtshRequest.equals("ATSH7E4")) {
if (liveData->commandRequest.equals("220101")) {
liveData->params.cumulativeEnergyChargedKWh = float(strtol(liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyChargedKWhStart == -1)
liveData->params.cumulativeEnergyChargedKWhStart = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.cumulativeEnergyDischargedKWh = float(strtol(liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyDischargedKWhStart == -1)
liveData->params.cumulativeEnergyDischargedKWhStart = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.availableChargePower = float(strtol(liveData->responseRowMerged.substring(16, 20).c_str(), 0, 16)) / 100.0;
liveData->params.availableDischargePower = float(strtol(liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
//liveData->params.isolationResistanceKOhm = liveData->hexToDec(liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
liveData->params.batFanStatus = liveData->hexToDec(liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
liveData->params.batFanFeedbackHz = liveData->hexToDec(liveData->responseRowMerged.substring(62, 64).c_str(), 2, true);
liveData->params.auxVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
liveData->params.batPowerAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(26, 30).c_str(), 2, true) / 10.0;
liveData->params.batVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
liveData->params.batPowerKw = (liveData->params.batPowerAmp * liveData->params.batVoltage) / 1000.0;
if (liveData->params.batPowerKw < 0) // Reset charging start time
liveData->params.chargingStartTime = liveData->params.currentTime;
liveData->params.batPowerKwh100 = liveData->params.batPowerKw / liveData->params.speedKmh * 100;
liveData->params.batCellMaxV = liveData->hexToDec(liveData->responseRowMerged.substring(52, 54).c_str(), 1, false) / 50.0;
liveData->params.batCellMinV = liveData->hexToDec(liveData->responseRowMerged.substring(56, 58).c_str(), 1, false) / 50.0;
liveData->params.batModuleTempC[0] = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
liveData->params.batModuleTempC[1] = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
liveData->params.batModuleTempC[2] = liveData->hexToDec(liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
liveData->params.batModuleTempC[3] = liveData->hexToDec(liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
liveData->params.motorRpm = liveData->hexToDec(liveData->responseRowMerged.substring(112, 116).c_str(), 2, false);
//liveData->params.batTempC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
//liveData->params.batMaxC = liveData->hexToDec(liveData->responseRowMerged.substring(34, 36).c_str(), 1, true);
//liveData->params.batMinC = liveData->hexToDec(liveData->responseRowMerged.substring(36, 38).c_str(), 1, true);
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
this->liveData->params.batInletC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (this->liveData->params.speedKmh < 10 && this->liveData->params.batPowerKw >= 1 && this->liveData->params.socPerc > 0 && this->liveData->params.socPerc <= 100) {
if ( this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] < 0 || this->liveData->params.batPowerKw < this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
if ( this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] < 0 || this->liveData->params.batPowerKw > this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
this->liveData->params.chargingGraphBatMinTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMinC;
this->liveData->params.chargingGraphBatMaxTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMaxC;
this->liveData->params.chargingGraphHeaterTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batHeaterC;
this->liveData->params.chargingGraphWaterCoolantTempC[int(this->liveData->params.socPerc)] = this->liveData->params.coolingWaterTempC;
liveData->params.batInletC = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (liveData->params.speedKmh < 10 && liveData->params.batPowerKw >= 1 && liveData->params.socPerc > 0 && liveData->params.socPerc <= 100) {
if ( liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] < 0 || liveData->params.batPowerKw < liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
if ( liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] < 0 || liveData->params.batPowerKw > liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
liveData->params.chargingGraphBatMinTempC[int(liveData->params.socPerc)] = liveData->params.batMinC;
liveData->params.chargingGraphBatMaxTempC[int(liveData->params.socPerc)] = liveData->params.batMaxC;
liveData->params.chargingGraphHeaterTempC[int(liveData->params.socPerc)] = liveData->params.batHeaterC;
liveData->params.chargingGraphWaterCoolantTempC[int(liveData->params.socPerc)] = liveData->params.coolingWaterTempC;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "FF") {
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "FF") {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220103")) {
if (liveData->commandRequest.equals("220103")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[32 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[32 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220104")) {
if (liveData->commandRequest.equals("220104")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[64 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[64 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220105")) {
this->liveData->params.socPercPrevious = this->liveData->params.socPerc;
this->liveData->params.sohPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
this->liveData->params.socPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
if (liveData->commandRequest.equals("220105")) {
liveData->params.socPercPrevious = liveData->params.socPerc;
liveData->params.sohPerc = liveData->hexToDec(liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
liveData->params.socPerc = liveData->hexToDec(liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
// Soc10ced table, record x0% CEC/CED table (ex. 90%->89%, 80%->79%)
if (this->liveData->params.socPercPrevious - this->liveData->params.socPerc > 0) {
byte index = (int(this->liveData->params.socPerc) == 4) ? 0 : (int)(this->liveData->params.socPerc / 10) + 1;
if ((int(this->liveData->params.socPerc) % 10 == 9 || int(this->liveData->params.socPerc) == 4) && this->liveData->params.soc10ced[index] == -1) {
this->liveData->params.soc10ced[index] = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.soc10cec[index] = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.soc10odo[index] = this->liveData->params.odoKm;
this->liveData->params.soc10time[index] = this->liveData->params.currentTime;
if (liveData->params.socPercPrevious - liveData->params.socPerc > 0) {
byte index = (int(liveData->params.socPerc) == 4) ? 0 : (int)(liveData->params.socPerc / 10) + 1;
if ((int(liveData->params.socPerc) % 10 == 9 || int(liveData->params.socPerc) == 4) && liveData->params.soc10ced[index] == -1) {
liveData->params.soc10ced[index] = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.soc10cec[index] = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.soc10odo[index] = liveData->params.odoKm;
liveData->params.soc10time[index] = liveData->params.currentTime;
}
}
this->liveData->params.bmsUnknownTempA = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
this->liveData->params.batHeaterC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
this->liveData->params.bmsUnknownTempB = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(82, 84).c_str(), 1, true);
liveData->params.bmsUnknownTempA = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
liveData->params.batHeaterC = liveData->hexToDec(liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
liveData->params.bmsUnknownTempB = liveData->hexToDec(liveData->responseRowMerged.substring(82, 84).c_str(), 1, true);
//
for (int i = 30; i < 32; i++) { // ai/aj position
this->liveData->params.cellVoltage[96 - 30 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[96 - 30 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220106")) {
this->liveData->params.coolingWaterTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
this->liveData->params.bmsUnknownTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, true);
this->liveData->params.bmsUnknownTempD = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 48).c_str(), 1, true);
if (liveData->commandRequest.equals("220106")) {
liveData->params.coolingWaterTempC = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
liveData->params.bmsUnknownTempC = liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, true);
liveData->params.bmsUnknownTempD = liveData->hexToDec(liveData->responseRowMerged.substring(46, 48).c_str(), 1, true);
}
}
// TPMS 7a0
if (this->liveData->currentAtshRequest.equals("ATSH7A0")) {
if (this->liveData->commandRequest.equals("22c00b")) {
this->liveData->params.tireFrontLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireFrontRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
if (liveData->currentAtshRequest.equals("ATSH7A0")) {
if (liveData->commandRequest.equals("22c00b")) {
liveData->params.tireFrontLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireFrontRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
}
}
}
@@ -296,150 +296,150 @@ void CarKiaEniro::parseRowMerged() {
void CarKiaEniro::loadTestData() {
// IGPM
this->liveData->currentAtshRequest = "ATSH770";
liveData->currentAtshRequest = "ATSH770";
// 22BC03
this->liveData->commandRequest = "22BC03";
this->liveData->responseRowMerged = "62BC03FDEE7C730A600000AAAA";
this->parseRowMerged();
liveData->commandRequest = "22BC03";
liveData->responseRowMerged = "62BC03FDEE7C730A600000AAAA";
parseRowMerged();
// ABS / ESP + AHB ATSH7D1
this->liveData->currentAtshRequest = "ATSH7D1";
liveData->currentAtshRequest = "ATSH7D1";
// 2101
this->liveData->commandRequest = "22C101";
this->liveData->responseRowMerged = "62C1015FD7E7D0FFFF00FF04D0D400000000FF7EFF0030F5010000FFFF7F6307F207FE05FF00FF3FFFFFAAAAAAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22C101";
liveData->responseRowMerged = "62C1015FD7E7D0FFFF00FF04D0D400000000FF7EFF0030F5010000FFFF7F6307F207FE05FF00FF3FFFFFAAAAAAAAAAAA";
parseRowMerged();
// VMCU ATSH7E2
this->liveData->currentAtshRequest = "ATSH7E2";
liveData->currentAtshRequest = "ATSH7E2";
// 2101
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
this->parseRowMerged();
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
parseRowMerged();
// 2102
this->liveData->commandRequest = "2102";
this->liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
this->liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
this->parseRowMerged();
liveData->commandRequest = "2102";
liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
parseRowMerged();
// "ATSH7DF",
this->liveData->currentAtshRequest = "ATSH7DF";
liveData->currentAtshRequest = "ATSH7DF";
// 2106
this->liveData->commandRequest = "2106";
this->liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
this->parseRowMerged();
liveData->commandRequest = "2106";
liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
parseRowMerged();
// AIRCON / ACU ATSH7B3
this->liveData->currentAtshRequest = "ATSH7B3";
liveData->currentAtshRequest = "ATSH7B3";
// 220100
this->liveData->commandRequest = "220100";
this->liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
this->liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
this->parseRowMerged();
liveData->commandRequest = "220100";
liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
parseRowMerged();
// BMS ATSH7E4
this->liveData->currentAtshRequest = "ATSH7E4";
liveData->currentAtshRequest = "ATSH7E4";
// 220101
this->liveData->commandRequest = "220101";
this->liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
this->liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
this->parseRowMerged();
liveData->commandRequest = "220101";
liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
parseRowMerged();
// 220102
this->liveData->commandRequest = "220102";
this->liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220102";
liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220103
this->liveData->commandRequest = "220103";
this->liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220103";
liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220104
this->liveData->commandRequest = "220104";
this->liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220104";
liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220105
this->liveData->commandRequest = "220105";
this->liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
this->liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
this->parseRowMerged();
liveData->commandRequest = "220105";
liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
parseRowMerged();
// 220106
this->liveData->commandRequest = "220106";
this->liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
this->parseRowMerged();
liveData->commandRequest = "220106";
liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
parseRowMerged();
// BCM / TPMS ATSH7A0
this->liveData->currentAtshRequest = "ATSH7A0";
liveData->currentAtshRequest = "ATSH7A0";
// 22c00b
this->liveData->commandRequest = "22c00b";
this->liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22c00b";
liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
parseRowMerged();
// ATSH7C6
this->liveData->currentAtshRequest = "ATSH7C6";
liveData->currentAtshRequest = "ATSH7C6";
// 22b002
this->liveData->commandRequest = "22b002";
this->liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
this->parseRowMerged();
liveData->commandRequest = "22b002";
liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
parseRowMerged();
this->liveData->params.batModuleTempC[0] = 28;
this->liveData->params.batModuleTempC[1] = 29;
this->liveData->params.batModuleTempC[2] = 28;
this->liveData->params.batModuleTempC[3] = 30;
liveData->params.batModuleTempC[0] = 28;
liveData->params.batModuleTempC[1] = 29;
liveData->params.batModuleTempC[2] = 28;
liveData->params.batModuleTempC[3] = 30;
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
//
this->liveData->params.soc10ced[10] = 2200;
this->liveData->params.soc10cec[10] = 2500;
this->liveData->params.soc10odo[10] = 13000;
this->liveData->params.soc10time[10] = 13000;
this->liveData->params.soc10ced[9] = this->liveData->params.soc10ced[10] + 6.4;
this->liveData->params.soc10cec[9] = this->liveData->params.soc10cec[10] + 0;
this->liveData->params.soc10odo[9] = this->liveData->params.soc10odo[10] + 30;
this->liveData->params.soc10time[9] = this->liveData->params.soc10time[10] + 900;
this->liveData->params.soc10ced[8] = this->liveData->params.soc10ced[9] + 6.8;
this->liveData->params.soc10cec[8] = this->liveData->params.soc10cec[9] + 0;
this->liveData->params.soc10odo[8] = this->liveData->params.soc10odo[9] + 30;
this->liveData->params.soc10time[8] = this->liveData->params.soc10time[9] + 900;
this->liveData->params.soc10ced[7] = this->liveData->params.soc10ced[8] + 7.2;
this->liveData->params.soc10cec[7] = this->liveData->params.soc10cec[8] + 0.6;
this->liveData->params.soc10odo[7] = this->liveData->params.soc10odo[8] + 30;
this->liveData->params.soc10time[7] = this->liveData->params.soc10time[8] + 900;
this->liveData->params.soc10ced[6] = this->liveData->params.soc10ced[7] + 6.7;
this->liveData->params.soc10cec[6] = this->liveData->params.soc10cec[7] + 0;
this->liveData->params.soc10odo[6] = this->liveData->params.soc10odo[7] + 30;
this->liveData->params.soc10time[6] = this->liveData->params.soc10time[7] + 900;
this->liveData->params.soc10ced[5] = this->liveData->params.soc10ced[6] + 6.7;
this->liveData->params.soc10cec[5] = this->liveData->params.soc10cec[6] + 0;
this->liveData->params.soc10odo[5] = this->liveData->params.soc10odo[6] + 30;
this->liveData->params.soc10time[5] = this->liveData->params.soc10time[6] + 900;
this->liveData->params.soc10ced[4] = this->liveData->params.soc10ced[5] + 6.4;
this->liveData->params.soc10cec[4] = this->liveData->params.soc10cec[5] + 0.3;
this->liveData->params.soc10odo[4] = this->liveData->params.soc10odo[5] + 30;
this->liveData->params.soc10time[4] = this->liveData->params.soc10time[5] + 900;
this->liveData->params.soc10ced[3] = this->liveData->params.soc10ced[4] + 6.4;
this->liveData->params.soc10cec[3] = this->liveData->params.soc10cec[4] + 0;
this->liveData->params.soc10odo[3] = this->liveData->params.soc10odo[4] + 30;
this->liveData->params.soc10time[3] = this->liveData->params.soc10time[4] + 900;
this->liveData->params.soc10ced[2] = this->liveData->params.soc10ced[3] + 5.4;
this->liveData->params.soc10cec[2] = this->liveData->params.soc10cec[3] + 0.1;
this->liveData->params.soc10odo[2] = this->liveData->params.soc10odo[3] + 30;
this->liveData->params.soc10time[2] = this->liveData->params.soc10time[3] + 900;
this->liveData->params.soc10ced[1] = this->liveData->params.soc10ced[2] + 6.2;
this->liveData->params.soc10cec[1] = this->liveData->params.soc10cec[2] + 0.1;
this->liveData->params.soc10odo[1] = this->liveData->params.soc10odo[2] + 30;
this->liveData->params.soc10time[1] = this->liveData->params.soc10time[2] + 900;
this->liveData->params.soc10ced[0] = this->liveData->params.soc10ced[1] + 2.9;
this->liveData->params.soc10cec[0] = this->liveData->params.soc10cec[1] + 0.5;
this->liveData->params.soc10odo[0] = this->liveData->params.soc10odo[1] + 15;
this->liveData->params.soc10time[0] = this->liveData->params.soc10time[1] + 900;
liveData->params.soc10ced[10] = 2200;
liveData->params.soc10cec[10] = 2500;
liveData->params.soc10odo[10] = 13000;
liveData->params.soc10time[10] = 13000;
liveData->params.soc10ced[9] = liveData->params.soc10ced[10] + 6.4;
liveData->params.soc10cec[9] = liveData->params.soc10cec[10] + 0;
liveData->params.soc10odo[9] = liveData->params.soc10odo[10] + 30;
liveData->params.soc10time[9] = liveData->params.soc10time[10] + 900;
liveData->params.soc10ced[8] = liveData->params.soc10ced[9] + 6.8;
liveData->params.soc10cec[8] = liveData->params.soc10cec[9] + 0;
liveData->params.soc10odo[8] = liveData->params.soc10odo[9] + 30;
liveData->params.soc10time[8] = liveData->params.soc10time[9] + 900;
liveData->params.soc10ced[7] = liveData->params.soc10ced[8] + 7.2;
liveData->params.soc10cec[7] = liveData->params.soc10cec[8] + 0.6;
liveData->params.soc10odo[7] = liveData->params.soc10odo[8] + 30;
liveData->params.soc10time[7] = liveData->params.soc10time[8] + 900;
liveData->params.soc10ced[6] = liveData->params.soc10ced[7] + 6.7;
liveData->params.soc10cec[6] = liveData->params.soc10cec[7] + 0;
liveData->params.soc10odo[6] = liveData->params.soc10odo[7] + 30;
liveData->params.soc10time[6] = liveData->params.soc10time[7] + 900;
liveData->params.soc10ced[5] = liveData->params.soc10ced[6] + 6.7;
liveData->params.soc10cec[5] = liveData->params.soc10cec[6] + 0;
liveData->params.soc10odo[5] = liveData->params.soc10odo[6] + 30;
liveData->params.soc10time[5] = liveData->params.soc10time[6] + 900;
liveData->params.soc10ced[4] = liveData->params.soc10ced[5] + 6.4;
liveData->params.soc10cec[4] = liveData->params.soc10cec[5] + 0.3;
liveData->params.soc10odo[4] = liveData->params.soc10odo[5] + 30;
liveData->params.soc10time[4] = liveData->params.soc10time[5] + 900;
liveData->params.soc10ced[3] = liveData->params.soc10ced[4] + 6.4;
liveData->params.soc10cec[3] = liveData->params.soc10cec[4] + 0;
liveData->params.soc10odo[3] = liveData->params.soc10odo[4] + 30;
liveData->params.soc10time[3] = liveData->params.soc10time[4] + 900;
liveData->params.soc10ced[2] = liveData->params.soc10ced[3] + 5.4;
liveData->params.soc10cec[2] = liveData->params.soc10cec[3] + 0.1;
liveData->params.soc10odo[2] = liveData->params.soc10odo[3] + 30;
liveData->params.soc10time[2] = liveData->params.soc10time[3] + 900;
liveData->params.soc10ced[1] = liveData->params.soc10ced[2] + 6.2;
liveData->params.soc10cec[1] = liveData->params.soc10cec[2] + 0.1;
liveData->params.soc10odo[1] = liveData->params.soc10odo[2] + 30;
liveData->params.soc10time[1] = liveData->params.soc10time[2] + 900;
liveData->params.soc10ced[0] = liveData->params.soc10ced[1] + 2.9;
liveData->params.soc10cec[0] = liveData->params.soc10cec[1] + 0.5;
liveData->params.soc10odo[0] = liveData->params.soc10odo[1] + 15;
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
}

530
CarRenaultZoe.cpp
View File

@@ -49,19 +49,19 @@ void CarRenaultZoe::activateCommandQueue() {
};
//
this->liveData->params.batModuleTempCount = 12; // 24, 12 is display limit
this->liveData->params.batteryTotalAvailableKWh = 28;
liveData->params.batModuleTempCount = 12; // 24, 12 is display limit
liveData->params.batteryTotalAvailableKWh = 28;
// Empty and fill command queue
for (int i = 0; i < 300; i++) {
this->liveData->commandQueue[i] = "";
liveData->commandQueue[i] = "";
}
for (int i = 0; i < commandQueueCountRenaultZoe; i++) {
this->liveData->commandQueue[i] = commandQueueRenaultZoe[i];
liveData->commandQueue[i] = commandQueueRenaultZoe[i];
}
this->liveData->commandQueueLoopFrom = commandQueueLoopFromRenaultZoe;
this->liveData->commandQueueCount = commandQueueCountRenaultZoe;
liveData->commandQueueLoopFrom = commandQueueLoopFromRenaultZoe;
liveData->commandQueueCount = commandQueueCountRenaultZoe;
}
/**
@@ -72,212 +72,212 @@ void CarRenaultZoe::parseRowMerged() {
bool tempByte;
// LBC 79B
if (this->liveData->currentAtshRequest.equals("ATSH79B")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.batPowerAmp = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(4, 8).c_str(), 2, false) - 5000;
this->liveData->params.batPowerKw = (this->liveData->params.batPowerAmp * this->liveData->params.batVoltage) / 1000.0;
this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 100.0;
this->liveData->params.availableChargePower = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(84, 88).c_str(), 2, false) / 100.0;
this->liveData->params.batCellMinV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 28).c_str(), 2, false) / 100.0;
this->liveData->params.batCellMaxV = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(28, 32).c_str(), 2, false) / 100.0;
if (liveData->currentAtshRequest.equals("ATSH79B")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.batPowerAmp = liveData->hexToDec(liveData->responseRowMerged.substring(4, 8).c_str(), 2, false) - 5000;
liveData->params.batPowerKw = (liveData->params.batPowerAmp * liveData->params.batVoltage) / 1000.0;
liveData->params.auxVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 100.0;
liveData->params.availableChargePower = liveData->hexToDec(liveData->responseRowMerged.substring(84, 88).c_str(), 2, false) / 100.0;
liveData->params.batCellMinV = liveData->hexToDec(liveData->responseRowMerged.substring(24, 28).c_str(), 2, false) / 100.0;
liveData->params.batCellMaxV = liveData->hexToDec(liveData->responseRowMerged.substring(28, 32).c_str(), 2, false) / 100.0;
}
if (this->liveData->commandRequest.equals("2103")) {
this->liveData->params.socPercPrevious = this->liveData->params.socPerc;
this->liveData->params.socPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(48, 52).c_str(), 2, false) / 100.0;
if (liveData->commandRequest.equals("2103")) {
liveData->params.socPercPrevious = liveData->params.socPerc;
liveData->params.socPerc = liveData->hexToDec(liveData->responseRowMerged.substring(48, 52).c_str(), 2, false) / 100.0;
}
if (this->liveData->commandRequest.equals("2104")) {
if (liveData->commandRequest.equals("2104")) {
for (uint16_t i = 0; i < 12; i++) {
this->liveData->params.batModuleTempC[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(8 + ( i * 6), 10 + (i * 6)).c_str(), 1, false) - 40;
liveData->params.batModuleTempC[i] = liveData->hexToDec(liveData->responseRowMerged.substring(8 + ( i * 6), 10 + (i * 6)).c_str(), 1, false) - 40;
}
for (uint16_t i = 12; i < 24; i++) {
this->liveData->params.batModuleTempC[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(80 + ((i - 12) * 6), 82 + ((i - 12) * 6)).c_str(), 1, false) - 40;
liveData->params.batModuleTempC[i] = liveData->hexToDec(liveData->responseRowMerged.substring(80 + ((i - 12) * 6), 82 + ((i - 12) * 6)).c_str(), 1, false) - 40;
}
}
if (this->liveData->commandRequest.equals("2141")) {
if (liveData->commandRequest.equals("2141")) {
for (int i = 0; i < 62; i++) {
this->liveData->params.cellVoltage[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(4 + (i * 4), 8 + (i * 4)).c_str(), 2, false) / 1000;
liveData->params.cellVoltage[i] = liveData->hexToDec(liveData->responseRowMerged.substring(4 + (i * 4), 8 + (i * 4)).c_str(), 2, false) / 1000;
}
}
if (this->liveData->commandRequest.equals("2142")) {
if (liveData->commandRequest.equals("2142")) {
for (int i = 0; i < 34; i++) {
this->liveData->params.cellVoltage[i + 62] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(4 + (i * 4), 8 + (i * 4)).c_str(), 2, false) / 1000;
liveData->params.cellVoltage[i + 62] = liveData->hexToDec(liveData->responseRowMerged.substring(4 + (i * 4), 8 + (i * 4)).c_str(), 2, false) / 1000;
}
}
if (this->liveData->commandRequest.equals("2161")) {
this->liveData->params.sohPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 2, false) / 2.0;
if (liveData->commandRequest.equals("2161")) {
liveData->params.sohPerc = liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 2, false) / 2.0;
}
}
/* niro
// ABS / ESP + AHB 7D1
if (this->liveData->currentAtshRequest.equals("ATSH7D1")) {
if (this->liveData->commandRequest.equals("22C101")) {
uint8_t driveMode = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 1, false);
this->liveData->params.forwardDriveMode = (driveMode == 4);
this->liveData->params.reverseDriveMode = (driveMode == 2);
this->liveData->params.parkModeOrNeutral = (driveMode == 1);
if (liveData->currentAtshRequest.equals("ATSH7D1")) {
if (liveData->commandRequest.equals("22C101")) {
uint8_t driveMode = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 1, false);
liveData->params.forwardDriveMode = (driveMode == 4);
liveData->params.reverseDriveMode = (driveMode == 2);
liveData->params.parkModeOrNeutral = (driveMode == 1);
}
}
// IGPM
if (this->liveData->currentAtshRequest.equals("ATSH770")) {
if (this->liveData->commandRequest.equals("22BC03")) {
tempByte = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false);
this->liveData->params.ignitionOnPrevious = this->liveData->params.ignitionOn;
this->liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1);
if (this->liveData->params.ignitionOnPrevious && !this->liveData->params.ignitionOn)
this->liveData->params.automaticShutdownTimer = this->liveData->params.currentTime;
if (liveData->currentAtshRequest.equals("ATSH770")) {
if (liveData->commandRequest.equals("22BC03")) {
tempByte = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false);
liveData->params.ignitionOnPrevious = liveData->params.ignitionOn;
liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1);
if (liveData->params.ignitionOnPrevious && !liveData->params.ignitionOn)
liveData->params.automaticShutdownTimer = liveData->params.currentTime;
this->liveData->params.lightInfo = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false);
this->liveData->params.headLights = (bitRead(this->liveData->params.lightInfo, 5) == 1);
this->liveData->params.dayLights = (bitRead(this->liveData->params.lightInfo, 3) == 1);
liveData->params.lightInfo = liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false);
liveData->params.headLights = (bitRead(liveData->params.lightInfo, 5) == 1);
liveData->params.dayLights = (bitRead(liveData->params.lightInfo, 3) == 1);
}
if (this->liveData->commandRequest.equals("22BC06")) {
this->liveData->params.brakeLightInfo = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
this->liveData->params.brakeLights = (bitRead(this->liveData->params.brakeLightInfo, 5) == 1);
if (liveData->commandRequest.equals("22BC06")) {
liveData->params.brakeLightInfo = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
liveData->params.brakeLights = (bitRead(liveData->params.brakeLightInfo, 5) == 1);
}
}
// VMCU 7E2
if (this->liveData->currentAtshRequest.equals("ATSH7E2")) {
if (this->liveData->commandRequest.equals("2101")) {
this->liveData->params.speedKmh = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (this->liveData->params.speedKmh < -99 || this->liveData->params.speedKmh > 200)
this->liveData->params.speedKmh = 0;
if (liveData->currentAtshRequest.equals("ATSH7E2")) {
if (liveData->commandRequest.equals("2101")) {
liveData->params.speedKmh = liveData->hexToDec(liveData->responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
if (liveData->params.speedKmh < -99 || liveData->params.speedKmh > 200)
liveData->params.speedKmh = 0;
}
if (this->liveData->commandRequest.equals("2102")) {
this->liveData->params.auxPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
this->liveData->params.auxCurrentAmp = - this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
if (liveData->commandRequest.equals("2102")) {
liveData->params.auxPerc = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, false);
liveData->params.auxCurrentAmp = - liveData->hexToDec(liveData->responseRowMerged.substring(46, 50).c_str(), 2, true) / 1000.0;
}
}
// Cluster module 7c6
if (this->liveData->currentAtshRequest.equals("ATSH7C6")) {
if (this->liveData->commandRequest.equals("22B002")) {
this->liveData->params.odoKm = float(strtol(this->liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
if (liveData->currentAtshRequest.equals("ATSH7C6")) {
if (liveData->commandRequest.equals("22B002")) {
liveData->params.odoKm = float(strtol(liveData->responseRowMerged.substring(18, 24).c_str(), 0, 16));
}
}
// Aircon 7b3
if (this->liveData->currentAtshRequest.equals("ATSH7B3")) {
if (this->liveData->commandRequest.equals("220100")) {
this->liveData->params.indoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
this->liveData->params.outdoorTemperature = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
if (liveData->currentAtshRequest.equals("ATSH7B3")) {
if (liveData->commandRequest.equals("220100")) {
liveData->params.indoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
liveData->params.outdoorTemperature = (liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, false) / 2) - 40;
}
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "00") {
this->liveData->params.coolantTemp1C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
this->liveData->params.coolantTemp2C = (this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "00") {
liveData->params.coolantTemp1C = (liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false) / 2) - 40;
liveData->params.coolantTemp2C = (liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 1, false) / 2) - 40;
}
}
// BMS 7e4
if (this->liveData->currentAtshRequest.equals("ATSH7E4")) {
if (this->liveData->commandRequest.equals("220101")) {
this->liveData->params.cumulativeEnergyChargedKWh = float(strtol(this->liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyChargedKWhStart == -1)
this->liveData->params.cumulativeEnergyChargedKWhStart = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.cumulativeEnergyDischargedKWh = float(strtol(this->liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (this->liveData->params.cumulativeEnergyDischargedKWhStart == -1)
this->liveData->params.cumulativeEnergyDischargedKWhStart = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.availableDischargePower = float(strtol(this->liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
//this->liveData->params.isolationResistanceKOhm = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
this->liveData->params.batFanStatus = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
this->liveData->params.batFanFeedbackHz = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(62, 64).c_str(), 2, true);
this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
this->liveData->params.batVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
if (this->liveData->params.batPowerKw < 0) // Reset charging start time
this->liveData->params.chargingStartTime = this->liveData->params.currentTime;
this->liveData->params.batPowerKwh100 = this->liveData->params.batPowerKw / this->liveData->params.speedKmh * 100;
this->liveData->params.batModuleTempC[0] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
this->liveData->params.batModuleTempC[1] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
this->liveData->params.batModuleTempC[2] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
this->liveData->params.batModuleTempC[3] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
this->liveData->params.motorRpm = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(112, 116).c_str(), 2, false);
if (liveData->currentAtshRequest.equals("ATSH7E4")) {
if (liveData->commandRequest.equals("220101")) {
liveData->params.cumulativeEnergyChargedKWh = float(strtol(liveData->responseRowMerged.substring(82, 90).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyChargedKWhStart == -1)
liveData->params.cumulativeEnergyChargedKWhStart = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.cumulativeEnergyDischargedKWh = float(strtol(liveData->responseRowMerged.substring(90, 98).c_str(), 0, 16)) / 10.0;
if (liveData->params.cumulativeEnergyDischargedKWhStart == -1)
liveData->params.cumulativeEnergyDischargedKWhStart = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.availableDischargePower = float(strtol(liveData->responseRowMerged.substring(20, 24).c_str(), 0, 16)) / 100.0;
//liveData->params.isolationResistanceKOhm = liveData->hexToDec(liveData->responseRowMerged.substring(118, 122).c_str(), 2, true);
liveData->params.batFanStatus = liveData->hexToDec(liveData->responseRowMerged.substring(60, 62).c_str(), 2, true);
liveData->params.batFanFeedbackHz = liveData->hexToDec(liveData->responseRowMerged.substring(62, 64).c_str(), 2, true);
liveData->params.auxVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(64, 66).c_str(), 2, true) / 10.0;
liveData->params.batVoltage = liveData->hexToDec(liveData->responseRowMerged.substring(30, 34).c_str(), 2, false) / 10.0;
if (liveData->params.batPowerKw < 0) // Reset charging start time
liveData->params.chargingStartTime = liveData->params.currentTime;
liveData->params.batPowerKwh100 = liveData->params.batPowerKw / liveData->params.speedKmh * 100;
liveData->params.batModuleTempC[0] = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 1, true);
liveData->params.batModuleTempC[1] = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 1, true);
liveData->params.batModuleTempC[2] = liveData->hexToDec(liveData->responseRowMerged.substring(42, 44).c_str(), 1, true);
liveData->params.batModuleTempC[3] = liveData->hexToDec(liveData->responseRowMerged.substring(44, 46).c_str(), 1, true);
liveData->params.motorRpm = liveData->hexToDec(liveData->responseRowMerged.substring(112, 116).c_str(), 2, false);
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
this->liveData->params.batInletC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (this->liveData->params.speedKmh < 10 && this->liveData->params.batPowerKw >= 1 && this->liveData->params.socPerc > 0 && this->liveData->params.socPerc <= 100) {
if ( this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] < 0 || this->liveData->params.batPowerKw < this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMinKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
if ( this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] < 0 || this->liveData->params.batPowerKw > this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)])
this->liveData->params.chargingGraphMaxKw[int(this->liveData->params.socPerc)] = this->liveData->params.batPowerKw;
this->liveData->params.chargingGraphBatMinTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMinC;
this->liveData->params.chargingGraphBatMaxTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batMaxC;
this->liveData->params.chargingGraphHeaterTempC[int(this->liveData->params.socPerc)] = this->liveData->params.batHeaterC;
this->liveData->params.chargingGraphWaterCoolantTempC[int(this->liveData->params.socPerc)] = this->liveData->params.coolingWaterTempC;
liveData->params.batInletC = liveData->hexToDec(liveData->responseRowMerged.substring(50, 52).c_str(), 1, true);
if (liveData->params.speedKmh < 10 && liveData->params.batPowerKw >= 1 && liveData->params.socPerc > 0 && liveData->params.socPerc <= 100) {
if ( liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] < 0 || liveData->params.batPowerKw < liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMinKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
if ( liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] < 0 || liveData->params.batPowerKw > liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)])
liveData->params.chargingGraphMaxKw[int(liveData->params.socPerc)] = liveData->params.batPowerKw;
liveData->params.chargingGraphBatMinTempC[int(liveData->params.socPerc)] = liveData->params.batMinC;
liveData->params.chargingGraphBatMaxTempC[int(liveData->params.socPerc)] = liveData->params.batMaxC;
liveData->params.chargingGraphHeaterTempC[int(liveData->params.socPerc)] = liveData->params.batHeaterC;
liveData->params.chargingGraphWaterCoolantTempC[int(liveData->params.socPerc)] = liveData->params.coolingWaterTempC;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220102") && this->liveData->responseRowMerged.substring(12, 14) == "FF") {
if (liveData->commandRequest.equals("220102") && liveData->responseRowMerged.substring(12, 14) == "FF") {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220103")) {
if (liveData->commandRequest.equals("220103")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[32 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[32 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220104")) {
if (liveData->commandRequest.equals("220104")) {
for (int i = 0; i < 32; i++) {
this->liveData->params.cellVoltage[64 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[64 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220105")) {
this->liveData->params.socPercPrevious = this->liveData->params.socPerc;
this->liveData->params.sohPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
this->liveData->params.socPerc = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
if (liveData->commandRequest.equals("220105")) {
liveData->params.socPercPrevious = liveData->params.socPerc;
liveData->params.sohPerc = liveData->hexToDec(liveData->responseRowMerged.substring(56, 60).c_str(), 2, false) / 10.0;
liveData->params.socPerc = liveData->hexToDec(liveData->responseRowMerged.substring(68, 70).c_str(), 1, false) / 2.0;
// Soc10ced table, record x0% CEC/CED table (ex. 90%->89%, 80%->79%)
if (this->liveData->params.socPercPrevious - this->liveData->params.socPerc > 0) {
byte index = (int(this->liveData->params.socPerc) == 4) ? 0 : (int)(this->liveData->params.socPerc / 10) + 1;
if ((int(this->liveData->params.socPerc) % 10 == 9 || int(this->liveData->params.socPerc) == 4) && this->liveData->params.soc10ced[index] == -1) {
this->liveData->params.soc10ced[index] = this->liveData->params.cumulativeEnergyDischargedKWh;
this->liveData->params.soc10cec[index] = this->liveData->params.cumulativeEnergyChargedKWh;
this->liveData->params.soc10odo[index] = this->liveData->params.odoKm;
this->liveData->params.soc10time[index] = this->liveData->params.currentTime;
if (liveData->params.socPercPrevious - liveData->params.socPerc > 0) {
byte index = (int(liveData->params.socPerc) == 4) ? 0 : (int)(liveData->params.socPerc / 10) + 1;
if ((int(liveData->params.socPerc) % 10 == 9 || int(liveData->params.socPerc) == 4) && liveData->params.soc10ced[index] == -1) {
liveData->params.soc10ced[index] = liveData->params.cumulativeEnergyDischargedKWh;
liveData->params.soc10cec[index] = liveData->params.cumulativeEnergyChargedKWh;
liveData->params.soc10odo[index] = liveData->params.odoKm;
liveData->params.soc10time[index] = liveData->params.currentTime;
}
}
this->liveData->params.bmsUnknownTempA = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
this->liveData->params.batHeaterC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
this->liveData->params.bmsUnknownTempB = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(82, 84).c_str(), 1, true);
liveData->params.bmsUnknownTempA = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 1, true);
liveData->params.batHeaterC = liveData->hexToDec(liveData->responseRowMerged.substring(52, 54).c_str(), 1, true);
liveData->params.bmsUnknownTempB = liveData->hexToDec(liveData->responseRowMerged.substring(82, 84).c_str(), 1, true);
//
for (int i = 30; i < 32; i++) { // ai/aj position
this->liveData->params.cellVoltage[96 - 30 + i] = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
liveData->params.cellVoltage[96 - 30 + i] = liveData->hexToDec(liveData->responseRowMerged.substring(14 + (i * 2), 14 + (i * 2) + 2).c_str(), 1, false) / 50;
}
}
// BMS 7e4
if (this->liveData->commandRequest.equals("220106")) {
this->liveData->params.coolingWaterTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
this->liveData->params.bmsUnknownTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(18, 20).c_str(), 1, true);
this->liveData->params.bmsUnknownTempD = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(46, 48).c_str(), 1, true);
if (liveData->commandRequest.equals("220106")) {
liveData->params.coolingWaterTempC = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 1, false);
liveData->params.bmsUnknownTempC = liveData->hexToDec(liveData->responseRowMerged.substring(18, 20).c_str(), 1, true);
liveData->params.bmsUnknownTempD = liveData->hexToDec(liveData->responseRowMerged.substring(46, 48).c_str(), 1, true);
}
}
// TPMS 7a0
if (this->liveData->currentAtshRequest.equals("ATSH7A0")) {
if (this->liveData->commandRequest.equals("22c00b")) {
this->liveData->params.tireFrontLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearRightPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireRearLeftPressureBar = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
this->liveData->params.tireFrontLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireFrontRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearRightTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
this->liveData->params.tireRearLeftTempC = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
if (liveData->currentAtshRequest.equals("ATSH7A0")) {
if (liveData->commandRequest.equals("22c00b")) {
liveData->params.tireFrontLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(14, 16).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(22, 24).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearRightPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(30, 32).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireRearLeftPressureBar = liveData->hexToDec(liveData->responseRowMerged.substring(38, 40).c_str(), 2, false) / 72.51886900361; // === OK Valid *0.2 / 14.503773800722
liveData->params.tireFrontLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(16, 18).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireFrontRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(24, 26).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearRightTempC = liveData->hexToDec(liveData->responseRowMerged.substring(32, 34).c_str(), 2, false) - 50; // === OK Valid
liveData->params.tireRearLeftTempC = liveData->hexToDec(liveData->responseRowMerged.substring(40, 42).c_str(), 2, false) - 50; // === OK Valid
}
}
*/
@@ -289,174 +289,174 @@ void CarRenaultZoe::parseRowMerged() {
void CarRenaultZoe::loadTestData() {
/// LBC 79B
this->liveData->currentAtshRequest = "ATSH79B";
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101134D138600000000000000000000000009980D610FB120D0000005420000000000000004ECB20000074B2927100000000000000000";
this->parseRowMerged();
this->liveData->commandRequest = "2103";
this->liveData->responseRowMerged = "610301770D010D740000000001750174000000FFFF07D0050D410000030000000000";
this->parseRowMerged();
this->liveData->commandRequest = "2104";
this->liveData->responseRowMerged = "61040B9D290B9F290B9D290B99290B9E290B98290B8A2A0B842A0BA0290B9B290B9A290B9629FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF29292A000000000000";
this->parseRowMerged();
this->liveData->commandRequest = "2141";
this->liveData->responseRowMerged = "61410E930E950E900E930E930E950E950E930E970E940E970E970E950E940E940E930E970E920E930E8F0E900E8E0E8C0E920E970E920E940E940E930E950E950E940E970E970E950E970E940E950E950E990E940E9A0E8E0E900E990E950E900E990E980E950E940E970E970E950E940E980E970E920E920E940E950E93000000000000";
this->parseRowMerged();
this->liveData->commandRequest = "2142";
this->liveData->responseRowMerged = "61420E920E940E970E930E920E970E940E950E950E980E920E900E8F0E8F0E920E900E920E940E9B0E980E950E940E950E930E970E980E980E950E950E930E970E950E950E978BFA8C200000";
this->parseRowMerged();
this->liveData->commandRequest = "2161";
this->liveData->responseRowMerged = "6161000AA820C8C8C8C2C2000153B400004669FF";
this->parseRowMerged();
liveData->currentAtshRequest = "ATSH79B";
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101134D138600000000000000000000000009980D610FB120D0000005420000000000000004ECB20000074B2927100000000000000000";
parseRowMerged();
liveData->commandRequest = "2103";
liveData->responseRowMerged = "610301770D010D740000000001750174000000FFFF07D0050D410000030000000000";
parseRowMerged();
liveData->commandRequest = "2104";
liveData->responseRowMerged = "61040B9D290B9F290B9D290B99290B9E290B98290B8A2A0B842A0BA0290B9B290B9A290B9629FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF29292A000000000000";
parseRowMerged();
liveData->commandRequest = "2141";
liveData->responseRowMerged = "61410E930E950E900E930E930E950E950E930E970E940E970E970E950E940E940E930E970E920E930E8F0E900E8E0E8C0E920E970E920E940E940E930E950E950E940E970E970E950E970E940E950E950E990E940E9A0E8E0E900E990E950E900E990E980E950E940E970E970E950E940E980E970E920E920E940E950E93000000000000";
parseRowMerged();
liveData->commandRequest = "2142";
liveData->responseRowMerged = "61420E920E940E970E930E920E970E940E950E950E980E920E900E8F0E8F0E920E900E920E940E9B0E980E950E940E950E930E970E980E980E950E950E930E970E950E950E978BFA8C200000";
parseRowMerged();
liveData->commandRequest = "2161";
liveData->responseRowMerged = "6161000AA820C8C8C8C2C2000153B400004669FF";
parseRowMerged();
/*
niro
/// IGPM
this->liveData->currentAtshRequest = "ATSH770";
liveData->currentAtshRequest = "ATSH770";
// 22BC03
this->liveData->commandRequest = "22BC03";
this->liveData->responseRowMerged = "62BC03FDEE7C730A600000AAAA";
this->parseRowMerged();
liveData->commandRequest = "22BC03";
liveData->responseRowMerged = "62BC03FDEE7C730A600000AAAA";
parseRowMerged();
// ABS / ESP + AHB ATSH7D1
this->liveData->currentAtshRequest = "ATSH7D1";
liveData->currentAtshRequest = "ATSH7D1";
// 2101
this->liveData->commandRequest = "22C101";
this->liveData->responseRowMerged = "62C1015FD7E7D0FFFF00FF04D0D400000000FF7EFF0030F5010000FFFF7F6307F207FE05FF00FF3FFFFFAAAAAAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22C101";
liveData->responseRowMerged = "62C1015FD7E7D0FFFF00FF04D0D400000000FF7EFF0030F5010000FFFF7F6307F207FE05FF00FF3FFFFFAAAAAAAAAAAA";
parseRowMerged();
// VMCU ATSH7E2
this->liveData->currentAtshRequest = "ATSH7E2";
liveData->currentAtshRequest = "ATSH7E2";
// 2101
this->liveData->commandRequest = "2101";
this->liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
this->parseRowMerged();
liveData->commandRequest = "2101";
liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000";
parseRowMerged();
// 2102
this->liveData->commandRequest = "2102";
this->liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
this->liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
this->parseRowMerged();
liveData->commandRequest = "2102";
liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000";
liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000";
parseRowMerged();
// "ATSH7DF",
this->liveData->currentAtshRequest = "ATSH7DF";
liveData->currentAtshRequest = "ATSH7DF";
// 2106
this->liveData->commandRequest = "2106";
this->liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
this->parseRowMerged();
liveData->commandRequest = "2106";
liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00";
parseRowMerged();
// AIRCON / ACU ATSH7B3
this->liveData->currentAtshRequest = "ATSH7B3";
liveData->currentAtshRequest = "ATSH7B3";
// 220100
this->liveData->commandRequest = "220100";
this->liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
this->liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
this->parseRowMerged();
liveData->commandRequest = "220100";
liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000";
liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000";
parseRowMerged();
// BMS ATSH7E4
this->liveData->currentAtshRequest = "ATSH7E4";
liveData->currentAtshRequest = "ATSH7E4";
// 220101
this->liveData->commandRequest = "220101";
this->liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
this->liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
this->parseRowMerged();
liveData->commandRequest = "220101";
liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8";
liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8";
parseRowMerged();
// 220102
this->liveData->commandRequest = "220102";
this->liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220102";
liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220103
this->liveData->commandRequest = "220103";
this->liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220103";
liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220104
this->liveData->commandRequest = "220104";
this->liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
this->parseRowMerged();
liveData->commandRequest = "220104";
liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA";
parseRowMerged();
// 220105
this->liveData->commandRequest = "220105";
this->liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
this->liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
this->parseRowMerged();
liveData->commandRequest = "220105";
liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA";
liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA";
parseRowMerged();
// 220106
this->liveData->commandRequest = "220106";
this->liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
this->parseRowMerged();
liveData->commandRequest = "220106";
liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00";
parseRowMerged();
// BCM / TPMS ATSH7A0
this->liveData->currentAtshRequest = "ATSH7A0";
liveData->currentAtshRequest = "ATSH7A0";
// 22c00b
this->liveData->commandRequest = "22c00b";
this->liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
this->parseRowMerged();
liveData->commandRequest = "22c00b";
liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA";
parseRowMerged();
// ATSH7C6
this->liveData->currentAtshRequest = "ATSH7C6";
liveData->currentAtshRequest = "ATSH7C6";
// 22b002
this->liveData->commandRequest = "22b002";
this->liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
this->parseRowMerged();
liveData->commandRequest = "22b002";
liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000";
parseRowMerged();
this->liveData->params.batModuleTempC[0] = 28;
this->liveData->params.batModuleTempC[1] = 29;
this->liveData->params.batModuleTempC[2] = 28;
this->liveData->params.batModuleTempC[3] = 30;
liveData->params.batModuleTempC[0] = 28;
liveData->params.batModuleTempC[1] = 29;
liveData->params.batModuleTempC[2] = 28;
liveData->params.batModuleTempC[3] = 30;
// This is more accurate than min/max from BMS. It's required to detect kona/eniro cold gates (min 15C is needed > 43kW charging, min 25C is needed > 58kW charging)
this->liveData->params.batMinC = this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < this->liveData->params.batModuleTempCount; i++) {
if (this->liveData->params.batModuleTempC[i] < this->liveData->params.batMinC)
this->liveData->params.batMinC = this->liveData->params.batModuleTempC[i];
if (this->liveData->params.batModuleTempC[i] > this->liveData->params.batMaxC)
this->liveData->params.batMaxC = this->liveData->params.batModuleTempC[i];
liveData->params.batMinC = liveData->params.batMaxC = liveData->params.batModuleTempC[0];
for (uint16_t i = 1; i < liveData->params.batModuleTempCount; i++) {
if (liveData->params.batModuleTempC[i] < liveData->params.batMinC)
liveData->params.batMinC = liveData->params.batModuleTempC[i];
if (liveData->params.batModuleTempC[i] > liveData->params.batMaxC)
liveData->params.batMaxC = liveData->params.batModuleTempC[i];
}
this->liveData->params.batTempC = this->liveData->params.batMinC;
liveData->params.batTempC = liveData->params.batMinC;
//
this->liveData->params.soc10ced[10] = 2200;
this->liveData->params.soc10cec[10] = 2500;
this->liveData->params.soc10odo[10] = 13000;
this->liveData->params.soc10time[10] = 13000;
this->liveData->params.soc10ced[9] = this->liveData->params.soc10ced[10] + 6.4;
this->liveData->params.soc10cec[9] = this->liveData->params.soc10cec[10] + 0;
this->liveData->params.soc10odo[9] = this->liveData->params.soc10odo[10] + 30;
this->liveData->params.soc10time[9] = this->liveData->params.soc10time[10] + 900;
this->liveData->params.soc10ced[8] = this->liveData->params.soc10ced[9] + 6.8;
this->liveData->params.soc10cec[8] = this->liveData->params.soc10cec[9] + 0;
this->liveData->params.soc10odo[8] = this->liveData->params.soc10odo[9] + 30;
this->liveData->params.soc10time[8] = this->liveData->params.soc10time[9] + 900;
this->liveData->params.soc10ced[7] = this->liveData->params.soc10ced[8] + 7.2;
this->liveData->params.soc10cec[7] = this->liveData->params.soc10cec[8] + 0.6;
this->liveData->params.soc10odo[7] = this->liveData->params.soc10odo[8] + 30;
this->liveData->params.soc10time[7] = this->liveData->params.soc10time[8] + 900;
this->liveData->params.soc10ced[6] = this->liveData->params.soc10ced[7] + 6.7;
this->liveData->params.soc10cec[6] = this->liveData->params.soc10cec[7] + 0;
this->liveData->params.soc10odo[6] = this->liveData->params.soc10odo[7] + 30;
this->liveData->params.soc10time[6] = this->liveData->params.soc10time[7] + 900;
this->liveData->params.soc10ced[5] = this->liveData->params.soc10ced[6] + 6.7;
this->liveData->params.soc10cec[5] = this->liveData->params.soc10cec[6] + 0;
this->liveData->params.soc10odo[5] = this->liveData->params.soc10odo[6] + 30;
this->liveData->params.soc10time[5] = this->liveData->params.soc10time[6] + 900;
this->liveData->params.soc10ced[4] = this->liveData->params.soc10ced[5] + 6.4;
this->liveData->params.soc10cec[4] = this->liveData->params.soc10cec[5] + 0.3;
this->liveData->params.soc10odo[4] = this->liveData->params.soc10odo[5] + 30;
this->liveData->params.soc10time[4] = this->liveData->params.soc10time[5] + 900;
this->liveData->params.soc10ced[3] = this->liveData->params.soc10ced[4] + 6.4;
this->liveData->params.soc10cec[3] = this->liveData->params.soc10cec[4] + 0;
this->liveData->params.soc10odo[3] = this->liveData->params.soc10odo[4] + 30;
this->liveData->params.soc10time[3] = this->liveData->params.soc10time[4] + 900;
this->liveData->params.soc10ced[2] = this->liveData->params.soc10ced[3] + 5.4;
this->liveData->params.soc10cec[2] = this->liveData->params.soc10cec[3] + 0.1;
this->liveData->params.soc10odo[2] = this->liveData->params.soc10odo[3] + 30;
this->liveData->params.soc10time[2] = this->liveData->params.soc10time[3] + 900;
this->liveData->params.soc10ced[1] = this->liveData->params.soc10ced[2] + 6.2;
this->liveData->params.soc10cec[1] = this->liveData->params.soc10cec[2] + 0.1;
this->liveData->params.soc10odo[1] = this->liveData->params.soc10odo[2] + 30;
this->liveData->params.soc10time[1] = this->liveData->params.soc10time[2] + 900;
this->liveData->params.soc10ced[0] = this->liveData->params.soc10ced[1] + 2.9;
this->liveData->params.soc10cec[0] = this->liveData->params.soc10cec[1] + 0.5;
this->liveData->params.soc10odo[0] = this->liveData->params.soc10odo[1] + 15;
this->liveData->params.soc10time[0] = this->liveData->params.soc10time[1] + 900;
liveData->params.soc10ced[10] = 2200;
liveData->params.soc10cec[10] = 2500;
liveData->params.soc10odo[10] = 13000;
liveData->params.soc10time[10] = 13000;
liveData->params.soc10ced[9] = liveData->params.soc10ced[10] + 6.4;
liveData->params.soc10cec[9] = liveData->params.soc10cec[10] + 0;
liveData->params.soc10odo[9] = liveData->params.soc10odo[10] + 30;
liveData->params.soc10time[9] = liveData->params.soc10time[10] + 900;
liveData->params.soc10ced[8] = liveData->params.soc10ced[9] + 6.8;
liveData->params.soc10cec[8] = liveData->params.soc10cec[9] + 0;
liveData->params.soc10odo[8] = liveData->params.soc10odo[9] + 30;
liveData->params.soc10time[8] = liveData->params.soc10time[9] + 900;
liveData->params.soc10ced[7] = liveData->params.soc10ced[8] + 7.2;
liveData->params.soc10cec[7] = liveData->params.soc10cec[8] + 0.6;
liveData->params.soc10odo[7] = liveData->params.soc10odo[8] + 30;
liveData->params.soc10time[7] = liveData->params.soc10time[8] + 900;
liveData->params.soc10ced[6] = liveData->params.soc10ced[7] + 6.7;
liveData->params.soc10cec[6] = liveData->params.soc10cec[7] + 0;
liveData->params.soc10odo[6] = liveData->params.soc10odo[7] + 30;
liveData->params.soc10time[6] = liveData->params.soc10time[7] + 900;
liveData->params.soc10ced[5] = liveData->params.soc10ced[6] + 6.7;
liveData->params.soc10cec[5] = liveData->params.soc10cec[6] + 0;
liveData->params.soc10odo[5] = liveData->params.soc10odo[6] + 30;
liveData->params.soc10time[5] = liveData->params.soc10time[6] + 900;
liveData->params.soc10ced[4] = liveData->params.soc10ced[5] + 6.4;
liveData->params.soc10cec[4] = liveData->params.soc10cec[5] + 0.3;
liveData->params.soc10odo[4] = liveData->params.soc10odo[5] + 30;
liveData->params.soc10time[4] = liveData->params.soc10time[5] + 900;
liveData->params.soc10ced[3] = liveData->params.soc10ced[4] + 6.4;
liveData->params.soc10cec[3] = liveData->params.soc10cec[4] + 0;
liveData->params.soc10odo[3] = liveData->params.soc10odo[4] + 30;
liveData->params.soc10time[3] = liveData->params.soc10time[4] + 900;
liveData->params.soc10ced[2] = liveData->params.soc10ced[3] + 5.4;
liveData->params.soc10cec[2] = liveData->params.soc10cec[3] + 0.1;
liveData->params.soc10odo[2] = liveData->params.soc10odo[3] + 30;
liveData->params.soc10time[2] = liveData->params.soc10time[3] + 900;
liveData->params.soc10ced[1] = liveData->params.soc10ced[2] + 6.2;
liveData->params.soc10cec[1] = liveData->params.soc10cec[2] + 0.1;
liveData->params.soc10odo[1] = liveData->params.soc10odo[2] + 30;
liveData->params.soc10time[1] = liveData->params.soc10time[2] + 900;
liveData->params.soc10ced[0] = liveData->params.soc10ced[1] + 2.9;
liveData->params.soc10cec[0] = liveData->params.soc10cec[1] + 0.5;
liveData->params.soc10odo[0] = liveData->params.soc10odo[1] + 15;
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
*/
}

160
LiveData.cpp
View File

@@ -10,95 +10,95 @@
*/
void LiveData::initParams() {
this->params.automaticShutdownTimer = 0;
params.automaticShutdownTimer = 0;
#ifdef SIM800L_ENABLED
this->params.lastDataSent = 0;
this->params.sim800l_enabled = false;
params.lastDataSent = 0;
params.sim800l_enabled = false;
#endif //SIM800L_ENABLED
this->params.ignitionOn = false;
this->params.ignitionOnPrevious = false;
this->params.chargingStartTime = this->params.currentTime = 0;
this->params.lightInfo = 0;
this->params.headLights = false;
this->params.dayLights = false;
this->params.brakeLights = false;
this->params.brakeLightInfo = 0;
this->params.forwardDriveMode = false;
this->params.reverseDriveMode = false;
this->params.parkModeOrNeutral = false;
this->params.espState = 0;
this->params.speedKmh = -1;
this->params.motorRpm = -1;
this->params.odoKm = -1;
this->params.socPerc = -1;
this->params.socPercPrevious = -1;
this->params.sohPerc = -1;
this->params.cumulativeEnergyChargedKWh = -1;
this->params.cumulativeEnergyChargedKWhStart = -1;
this->params.cumulativeEnergyDischargedKWh = -1;
this->params.cumulativeEnergyDischargedKWhStart = -1;
this->params.availableChargePower = -1;
this->params.availableDischargePower = -1;
this->params.isolationResistanceKOhm = -1;
this->params.batPowerAmp = -1;
this->params.batPowerKw = -1;
this->params.batPowerKwh100 = -1;
this->params.batVoltage = -1;
this->params.batCellMinV = -1;
this->params.batCellMaxV = -1;
this->params.batTempC = -1;
this->params.batHeaterC = -1;
this->params.batInletC = -1;
this->params.batFanStatus = -1;
this->params.batFanFeedbackHz = -1;
this->params.batMinC = -1;
this->params.batMaxC = -1;
params.ignitionOn = false;
params.ignitionOnPrevious = false;
params.chargingStartTime = params.currentTime = 0;
params.lightInfo = 0;
params.headLights = false;
params.dayLights = false;
params.brakeLights = false;
params.brakeLightInfo = 0;
params.forwardDriveMode = false;
params.reverseDriveMode = false;
params.parkModeOrNeutral = false;
params.espState = 0;
params.speedKmh = -1;
params.motorRpm = -1;
params.odoKm = -1;
params.socPerc = -1;
params.socPercPrevious = -1;
params.sohPerc = -1;
params.cumulativeEnergyChargedKWh = -1;
params.cumulativeEnergyChargedKWhStart = -1;
params.cumulativeEnergyDischargedKWh = -1;
params.cumulativeEnergyDischargedKWhStart = -1;
params.availableChargePower = -1;
params.availableDischargePower = -1;
params.isolationResistanceKOhm = -1;
params.batPowerAmp = -1;
params.batPowerKw = -1;
params.batPowerKwh100 = -1;
params.batVoltage = -1;
params.batCellMinV = -1;
params.batCellMaxV = -1;
params.batTempC = -1;
params.batHeaterC = -1;
params.batInletC = -1;
params.batFanStatus = -1;
params.batFanFeedbackHz = -1;
params.batMinC = -1;
params.batMaxC = -1;
for (int i = 0; i < 12; i++) {
this->params.batModuleTempC[i] = 0;
params.batModuleTempC[i] = 0;
}
this->params.batModuleTempC[0] = -1;
this->params.batModuleTempC[1] = -1;
this->params.batModuleTempC[2] = -1;
this->params.batModuleTempC[3] = -1;
this->params.coolingWaterTempC = -1;
this->params.coolantTemp1C = -1;
this->params.coolantTemp2C = -1;
this->params.bmsUnknownTempA = -1;
this->params.bmsUnknownTempB = -1;
this->params.bmsUnknownTempC = -1;
this->params.bmsUnknownTempD = -1;
this->params.auxPerc = -1;
this->params.auxCurrentAmp = -1;
this->params.auxVoltage = -1;
this->params.indoorTemperature = -1;
this->params.outdoorTemperature = -1;
this->params.tireFrontLeftTempC = -1;
this->params.tireFrontLeftPressureBar = -1;
this->params.tireFrontRightTempC = -1;
this->params.tireFrontRightPressureBar = -1;
this->params.tireRearLeftTempC = -1;
this->params.tireRearLeftPressureBar = -1;
this->params.tireRearRightTempC = -1;
this->params.tireRearRightPressureBar = -1;
params.batModuleTempC[0] = -1;
params.batModuleTempC[1] = -1;
params.batModuleTempC[2] = -1;
params.batModuleTempC[3] = -1;
params.coolingWaterTempC = -1;
params.coolantTemp1C = -1;
params.coolantTemp2C = -1;
params.bmsUnknownTempA = -1;
params.bmsUnknownTempB = -1;
params.bmsUnknownTempC = -1;
params.bmsUnknownTempD = -1;
params.auxPerc = -1;
params.auxCurrentAmp = -1;
params.auxVoltage = -1;
params.indoorTemperature = -1;
params.outdoorTemperature = -1;
params.tireFrontLeftTempC = -1;
params.tireFrontLeftPressureBar = -1;
params.tireFrontRightTempC = -1;
params.tireFrontRightPressureBar = -1;
params.tireRearLeftTempC = -1;
params.tireRearLeftPressureBar = -1;
params.tireRearRightTempC = -1;
params.tireRearRightPressureBar = -1;
for (int i = 0; i <= 10; i++) {
this->params.soc10ced[i] = this->params.soc10cec[i] = this->params.soc10odo[i] = -1;
this->params.soc10time[i] = 0;
params.soc10ced[i] = params.soc10cec[i] = params.soc10odo[i] = -1;
params.soc10time[i] = 0;
}
for (int i = 0; i < 98; i++) {
this->params.cellVoltage[i] = 0;
params.cellVoltage[i] = 0;
}
this->params.cellCount = 0;
params.cellCount = 0;
for (int i = 0; i <= 100; i++) {
this->params.chargingGraphMinKw[i] = -1;
this->params.chargingGraphMaxKw[i] = -1;
this->params.chargingGraphBatMinTempC[i] = -100;
this->params.chargingGraphBatMaxTempC[i] = -100;
this->params.chargingGraphHeaterTempC[i] = -100;
this->params.chargingGraphWaterCoolantTempC[i] = -100;
params.chargingGraphMinKw[i] = -1;
params.chargingGraphMaxKw[i] = -1;
params.chargingGraphBatMinTempC[i] = -100;
params.chargingGraphBatMaxTempC[i] = -100;
params.chargingGraphHeaterTempC[i] = -100;
params.chargingGraphWaterCoolantTempC[i] = -100;
}
// Menu
this->menuItems = menuItemsSource;
menuItems = menuItemsSource;
}
/**
@@ -134,21 +134,21 @@ float LiveData::hexToDec(String hexString, byte bytes, bool signedNum) {
Convert km to km or miles
*/
float LiveData::km2distance(float inKm) {
return (this->settings.distanceUnit == 'k') ? inKm : inKm / 1.609344;
return (settings.distanceUnit == 'k') ? inKm : inKm / 1.609344;
}
/**
Convert celsius to celsius or farenheit
*/
float LiveData::celsius2temperature(float inCelsius) {
return (this->settings.temperatureUnit == 'c') ? inCelsius : (inCelsius * 1.8) + 32;
return (settings.temperatureUnit == 'c') ? inCelsius : (inCelsius * 1.8) + 32;
}
/**
Convert bar to bar or psi
*/
float LiveData::bar2pressure(float inBar) {
return (this->settings.pressureUnit == 'b') ? inBar : inBar * 14.503773800722;
return (settings.pressureUnit == 'b') ? inBar : inBar * 14.503773800722;
}