update
This commit is contained in:
@@ -48,7 +48,7 @@ Screen list
|
|||||||
|
|
||||||
### v1.7.1 2020-09-16
|
### v1.7.1 2020-09-16
|
||||||
- added new screen 1 - auto mode
|
- added new screen 1 - auto mode
|
||||||
- automatically shows screen 3 - speed when speed is >20kph
|
- automatically shows screen 3 - speed when speed is >5kph
|
||||||
- screen 5 chargin graph when power kw > 1kW
|
- screen 5 chargin graph when power kw > 1kW
|
||||||
- added bat.fan status and fan feedback in Hz for Ioniq
|
- added bat.fan status and fan feedback in Hz for Ioniq
|
||||||
|
|
||||||
|
|||||||
@@ -240,6 +240,8 @@ bool parseRowMergedDebugObd2Kia() {
|
|||||||
if (currentAtshRequest.equals("ATSH7E2")) {
|
if (currentAtshRequest.equals("ATSH7E2")) {
|
||||||
if (commandRequest.equals("2101")) {
|
if (commandRequest.equals("2101")) {
|
||||||
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
||||||
|
if (params.speedKmh < -99 || params.speedKmh > 200)
|
||||||
|
params.speedKmh = 0;
|
||||||
}
|
}
|
||||||
if (commandRequest.equals("2102")) {
|
if (commandRequest.equals("2102")) {
|
||||||
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
||||||
|
|||||||
@@ -83,6 +83,8 @@ bool parseRowMergedHyundaiIoniq() {
|
|||||||
if (currentAtshRequest.equals("ATSH7E2")) {
|
if (currentAtshRequest.equals("ATSH7E2")) {
|
||||||
if (commandRequest.equals("2101")) {
|
if (commandRequest.equals("2101")) {
|
||||||
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
||||||
|
if (params.speedKmh < -99 || params.speedKmh > 200)
|
||||||
|
params.speedKmh = 0;
|
||||||
}
|
}
|
||||||
if (commandRequest.equals("2102")) {
|
if (commandRequest.equals("2102")) {
|
||||||
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
||||||
|
|||||||
@@ -85,6 +85,8 @@ bool parseRowMergedKiaENiro() {
|
|||||||
if (currentAtshRequest.equals("ATSH7E2")) {
|
if (currentAtshRequest.equals("ATSH7E2")) {
|
||||||
if (commandRequest.equals("2101")) {
|
if (commandRequest.equals("2101")) {
|
||||||
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
params.speedKmh = hexToDec(responseRowMerged.substring(32, 36).c_str(), 2, false) * 0.0155; // / 100.0 *1.609 = real to gps is 1.750
|
||||||
|
if (params.speedKmh < -99 || params.speedKmh > 200)
|
||||||
|
params.speedKmh = 0;
|
||||||
}
|
}
|
||||||
if (commandRequest.equals("2102")) {
|
if (commandRequest.equals("2102")) {
|
||||||
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);
|
||||||
|
|||||||
BIN
dist/enirodashboard.ino.bin
vendored
BIN
dist/enirodashboard.ino.bin
vendored
Binary file not shown.
@@ -83,6 +83,7 @@ char tmpStr4[20];
|
|||||||
// Screens, buttons
|
// Screens, buttons
|
||||||
#define displayScreenCount 6
|
#define displayScreenCount 6
|
||||||
byte displayScreen = 1; // 0 - blank screen, 1 - automatic mode, 2 - dash board (default), 3 - big speed + kwh/100, 4 - battery cells, 5 - charging graph, 6 - soc10% CED table
|
byte displayScreen = 1; // 0 - blank screen, 1 - automatic mode, 2 - dash board (default), 3 - big speed + kwh/100, 4 - battery cells, 5 - charging graph, 6 - soc10% CED table
|
||||||
|
byte displayScreenAutoMode = 0;
|
||||||
bool btnLeftPressed = true;
|
bool btnLeftPressed = true;
|
||||||
bool btnMiddlePressed = true;
|
bool btnMiddlePressed = true;
|
||||||
bool btnRightPressed = true;
|
bool btnRightPressed = true;
|
||||||
@@ -1125,13 +1126,25 @@ bool redrawScreen(bool force) {
|
|||||||
tft.fillScreen(TFT_BLACK);
|
tft.fillScreen(TFT_BLACK);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Auto mode = >20kpm Screen 3 - speed, other wise basic Screen2 - Main screen, if charging then Screen 5 Graph
|
// 1. Auto mode = >5kpm Screen 3 - speed, other wise basic Screen2 - Main screen, if charging then Screen 5 Graph
|
||||||
if (displayScreen == 1) {
|
if (displayScreen == 1) {
|
||||||
if (params.speedKmh > 20) {
|
if (params.speedKmh > 5) {
|
||||||
|
if (displayScreenAutoMode != 3) {
|
||||||
|
tft.fillScreen(TFT_BLACK);
|
||||||
|
displayScreenAutoMode = 3;
|
||||||
|
}
|
||||||
drawSceneSpeed(force);
|
drawSceneSpeed(force);
|
||||||
} else if (params.batPowerKw > 1) {
|
} else if (params.batPowerKw > 1) {
|
||||||
|
if (displayScreenAutoMode != 5) {
|
||||||
|
tft.fillScreen(TFT_BLACK);
|
||||||
|
displayScreenAutoMode = 5;
|
||||||
|
}
|
||||||
drawSceneChargingGraph(force);
|
drawSceneChargingGraph(force);
|
||||||
} else {
|
} else {
|
||||||
|
if (displayScreenAutoMode != 2) {
|
||||||
|
tft.fillScreen(TFT_BLACK);
|
||||||
|
displayScreenAutoMode = 2;
|
||||||
|
}
|
||||||
drawSceneMain(force);
|
drawSceneMain(force);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user