From 82bdaefa2d88f2d2104bec336f12e7869432bf48 Mon Sep 17 00:00:00 2001 From: Lubos Petrovic Date: Wed, 2 Dec 2020 13:23:59 +0100 Subject: [PATCH] Zoe, SOH/SOC/AUX V --- Board320_240.cpp | 1 + CarRenaultZoe.cpp | 436 ++++++++++++++++++++++++++++++++++++++++++++++ CarRenaultZoe.h | 16 ++ LiveData.h | 2 +- evDash.ino | 7 +- menu.h | 4 +- 6 files changed, 461 insertions(+), 5 deletions(-) create mode 100644 CarRenaultZoe.cpp create mode 100644 CarRenaultZoe.h diff --git a/Board320_240.cpp b/Board320_240.cpp index c837e2c..a9b2d87 100644 --- a/Board320_240.cpp +++ b/Board320_240.cpp @@ -959,6 +959,7 @@ void Board320_240::menuItemClick() { case 103: this->liveData->settings.carType = CAR_HYUNDAI_IONIQ_2018; break; case 104: this->liveData->settings.carType = CAR_KIA_ENIRO_2020_39; break; case 105: this->liveData->settings.carType = CAR_HYUNDAI_KONA_2020_39; break; + case 106: this->liveData->settings.carType = CAR_RENAULT_ZOE; break; case 107: this->liveData->settings.carType = CAR_DEBUG_OBD2_KIA; break; // Screen orientation case 3011: this->liveData->settings.displayRotation = 1; this->tft.setRotation(this->liveData->settings.displayRotation); break; diff --git a/CarRenaultZoe.cpp b/CarRenaultZoe.cpp new file mode 100644 index 0000000..7e940f3 --- /dev/null +++ b/CarRenaultZoe.cpp @@ -0,0 +1,436 @@ +#ifndef CARRENAULTZOE_CPP +#define CARRENAULTZOE_CPP + +#include +#include +#include +#include +#include +#include "LiveData.h" +#include "CarRenaultZoe.h" + +#define commandQueueCountRenaultZoe 15 +#define commandQueueLoopFromRenaultZoe 11 + +/** + activateCommandQueue +*/ +void CarRenaultZoe::activateCommandQueue() { + + String commandQueueRenaultZoe[commandQueueCountRenaultZoe] = { + "AT Z", // Reset all + "AT I", // Print the version ID + "AT S0", // Printing of spaces on + "AT E0", // Echo off + "AT L0", // Linefeeds off + "AT SP 6", // Select protocol to ISO 15765-4 CAN (11 bit ID, 500 kbit/s) + //"AT AL", // Allow Long (>7 byte) messages + //"AT AR", // Automatically receive + //"AT H1", // Headers on (debug only) + //"AT D1", // Display of the DLC on + //"AT CAF0", // Automatic formatting off + ////"AT AT0", // disabled adaptive timing + "AT DP", + "AT ST16", // reduced timeout to 1, orig.16 + "atfcsd300010", + "atfcsm1", // Allow long messages + + // Loop from (RENAULT ZOE) + + // LBC Lithium battery controller + "ATSH79B", + "ATFCSH79B", + "2101", + "2103", + "2161", + }; + + // + this->liveData->params.batModuleTempCount = 4; // ??? + this->liveData->params.batteryTotalAvailableKWh = 28; + + // Empty and fill command queue + for (int i = 0; i < 300; i++) { + this->liveData->commandQueue[i] = ""; + } + for (int i = 0; i < commandQueueCountRenaultZoe; i++) { + this->liveData->commandQueue[i] = commandQueueRenaultZoe[i]; + } + + this->liveData->commandQueueLoopFrom = commandQueueLoopFromRenaultZoe; + this->liveData->commandQueueCount = commandQueueCountRenaultZoe; +} + +/** + parseRowMerged +*/ +void CarRenaultZoe::parseRowMerged() { + + bool tempByte; + + // LBC 79B + if (this->liveData->currentAtshRequest.equals("ATSH79B")) { + if (this->liveData->commandRequest.equals("2101")) { + this->liveData->params.auxVoltage = this->liveData->hexToDec(this->liveData->responseRowMerged.substring(56, 60).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 (this->liveData->commandRequest.equals("2161")) { + this->liveData->params.sohPerc = this->liveData->hexToDec(this->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); + } + } + + // 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; + + 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); + } + 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); + } + } + + // 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 (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; + } + } + + // 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)); + } + } + + // 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 (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; + } + } + + // 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); + + // 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]; + } + this->liveData->params.batTempC = this->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; + } + } + // BMS 7e4 + if (this->liveData->commandRequest.equals("220102") && this->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; + } + } + // BMS 7e4 + if (this->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; + } + } + // BMS 7e4 + if (this->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; + } + } + // 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; + + // 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; + } + } + 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); + // + 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; + } + } + // 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); + } + } + + // 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 + } + } + */ +} + +/** + loadTestData +*/ +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 = "2161"; + this->liveData->responseRowMerged = "6161000AA820C8C8C8C2C2000153B400004669FF"; + this->parseRowMerged(); + + + /* + niro + /// IGPM + this->liveData->currentAtshRequest = "ATSH770"; + // 22BC03 + this->liveData->commandRequest = "22BC03"; + this->liveData->responseRowMerged = "62BC03FDEE7C730A600000AAAA"; + this->parseRowMerged(); + + // ABS / ESP + AHB ATSH7D1 + this->liveData->currentAtshRequest = "ATSH7D1"; + // 2101 + this->liveData->commandRequest = "22C101"; + this->liveData->responseRowMerged = "62C1015FD7E7D0FFFF00FF04D0D400000000FF7EFF0030F5010000FFFF7F6307F207FE05FF00FF3FFFFFAAAAAAAAAAAA"; + this->parseRowMerged(); + + // VMCU ATSH7E2 + this->liveData->currentAtshRequest = "ATSH7E2"; + // 2101 + this->liveData->commandRequest = "2101"; + this->liveData->responseRowMerged = "6101FFF8000009285A3B0648030000B4179D763404080805000000"; + this->parseRowMerged(); + // 2102 + this->liveData->commandRequest = "2102"; + this->liveData->responseRowMerged = "6102F8FFFC000101000000840FBF83BD33270680953033757F59291C76000001010100000007000000"; + this->liveData->responseRowMerged = "6102F8FFFC000101000000931CC77F4C39040BE09BA7385D8158832175000001010100000007000000"; + this->parseRowMerged(); + + // "ATSH7DF", + this->liveData->currentAtshRequest = "ATSH7DF"; + // 2106 + this->liveData->commandRequest = "2106"; + this->liveData->responseRowMerged = "6106FFFF800000000000000200001B001C001C000600060006000E000000010000000000000000013D013D013E013E00"; + this->parseRowMerged(); + + // AIRCON / ACU ATSH7B3 + this->liveData->currentAtshRequest = "ATSH7B3"; + // 220100 + this->liveData->commandRequest = "220100"; + this->liveData->responseRowMerged = "6201007E5027C8FF7F765D05B95AFFFF5AFF11FFFFFFFFFFFF6AFFFF2DF0757630FFFF00FFFF000000"; + this->liveData->responseRowMerged = "6201007E5027C8FF867C58121010FFFF10FF8EFFFFFFFFFFFF10FFFF0DF0617900FFFF01FFFF000000"; + this->parseRowMerged(); + + // BMS ATSH7E4 + this->liveData->currentAtshRequest = "ATSH7E4"; + // 220101 + this->liveData->commandRequest = "220101"; + this->liveData->responseRowMerged = "620101FFF7E7FF99000000000300B10EFE120F11100F12000018C438C30B00008400003864000035850000153A00001374000647010D017F0BDA0BDA03E8"; + this->liveData->responseRowMerged = "620101FFF7E7FFB3000000000300120F9B111011101011000014CC38CB3B00009100003A510000367C000015FB000013D3000690250D018E0000000003E8"; + this->parseRowMerged(); + // 220102 + this->liveData->commandRequest = "220102"; + this->liveData->responseRowMerged = "620102FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA"; + this->parseRowMerged(); + // 220103 + this->liveData->commandRequest = "220103"; + this->liveData->responseRowMerged = "620103FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCACBCACACFCCCBCBCBCBCBCBCBCBAAAA"; + this->parseRowMerged(); + // 220104 + this->liveData->commandRequest = "220104"; + this->liveData->responseRowMerged = "620104FFFFFFFFCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBAAAA"; + this->parseRowMerged(); + // 220105 + this->liveData->commandRequest = "220105"; + this->liveData->responseRowMerged = "620105003fff9000000000000000000F8A86012B4946500101500DAC03E800000000AC0000C7C701000F00000000AAAA"; + this->liveData->responseRowMerged = "620105003FFF90000000000000000014918E012927465000015013BB03E800000000BB0000CBCB01001300000000AAAA"; + this->parseRowMerged(); + // 220106 + this->liveData->commandRequest = "220106"; + this->liveData->responseRowMerged = "620106FFFFFFFF14001A00240000003A7C86B4B30000000928EA00"; + this->parseRowMerged(); + + // BCM / TPMS ATSH7A0 + this->liveData->currentAtshRequest = "ATSH7A0"; + // 22c00b + this->liveData->commandRequest = "22c00b"; + this->liveData->responseRowMerged = "62C00BFFFF0000B93D0100B43E0100B43D0100BB3C0100AAAAAAAA"; + this->parseRowMerged(); + + // ATSH7C6 + this->liveData->currentAtshRequest = "ATSH7C6"; + // 22b002 + this->liveData->commandRequest = "22b002"; + this->liveData->responseRowMerged = "62B002E0000000FFB400330B0000000000000000"; + this->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; + + // 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]; + } + this->liveData->params.batTempC = this->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; + */ +} + +#endif // CARRENAULTZOE_CPP diff --git a/CarRenaultZoe.h b/CarRenaultZoe.h new file mode 100644 index 0000000..307924c --- /dev/null +++ b/CarRenaultZoe.h @@ -0,0 +1,16 @@ +#ifndef CARRENAULTZOE_H +#define CARRENAULTZOE_H + +#include "CarInterface.h" + +class CarRenaultZoe : public CarInterface { + + private: + + public: + void activateCommandQueue() override; + void parseRowMerged() override; + void loadTestData() override; +}; + +#endif // CARRENAULTZOE_H diff --git a/LiveData.h b/LiveData.h index 77f9a30..cd7290e 100644 --- a/LiveData.h +++ b/LiveData.h @@ -165,7 +165,7 @@ class LiveData { String currentAtshRequest = ""; // Menu bool menuVisible = false; - uint8_t menuItemsCount = 78; + uint8_t menuItemsCount = 79; uint16_t menuCurrent = 0; uint8_t menuItemSelected = 0; uint8_t menuItemOffset = 0; diff --git a/evDash.ino b/evDash.ino index 5aa9176..ca5d318 100644 --- a/evDash.ino +++ b/evDash.ino @@ -20,8 +20,8 @@ //////////////////////////////////////////////////////////// // Boards -#define BOARD_TTGO_T4 -//#define BOARD_M5STACK_CORE +//#define BOARD_TTGO_T4 +#define BOARD_M5STACK_CORE //#define SIM800L_ENABLED //#define SD_ENABLED @@ -51,6 +51,7 @@ #include "CarInterface.h" #include "CarKiaEniro.h" #include "CarHyundaiIoniq.h" +#include "CarRenaultZoe.h" #include "CarKiaDebugObd2.h" #ifdef SIM800L_ENABLED @@ -536,6 +537,8 @@ void setup(void) { car = new CarKiaEniro(); } else if (liveData->settings.carType == CAR_HYUNDAI_IONIQ_2018) { car = new CarHyundaiIoniq(); + } else if (liveData->settings.carType == CAR_RENAULT_ZOE) { + car = new CarRenaultZoe(); } else { // if (liveData->settings.carType == CAR_DEBUG_OBD2_KIA) car = new CarKiaDebugObd2(); diff --git a/menu.h b/menu.h index 7340014..6203b8a 100644 --- a/menu.h +++ b/menu.h @@ -2,7 +2,7 @@ #include "config.h"; -MENU_ITEM menuItemsSource[78] = { +MENU_ITEM menuItemsSource[79] = { {0, 0, 0, "<- exit menu"}, {1, 0, -1, "Vehicle type"}, @@ -20,7 +20,7 @@ MENU_ITEM menuItemsSource[78] = { {103, 1, -1, "Hyundai Ioniq 2018 28kWh"}, {104, 1, -1, "Kia eNiro 2020 39kWh"}, {105, 1, -1, "Hyundai Kona 2020 39kWh"}, - //{106, 1, -1, "Renault Zoe 22kWh (DEV)"}, + {106, 1, -1, "Renault Zoe 22kWh (DEV)"}, {107, 1, -1, "Debug OBD2 Kia"}, {300, 3, 0, "<- parent menu"},