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

update

Browse Source
This commit is contained in:
Lubos Petrovic
2020-10-18 12:14:03 +02:00
parent ac44cc0aba
commit 3cb1788f15
6 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -48,7 +48,7 @@ Screen list
### v1.7.1 2020-09-16
- 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
- added bat.fan status and fan feedback in Hz for Ioniq

2
car_debug_obd2_kia.h
View File

@@ -240,6 +240,8 @@ bool parseRowMergedDebugObd2Kia() {
if (currentAtshRequest.equals("ATSH7E2")) {
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
if (params.speedKmh < -99 || params.speedKmh > 200)
params.speedKmh = 0;
}
if (commandRequest.equals("2102")) {
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);

2
car_hyundai_ioniq.h
View File

@@ -83,6 +83,8 @@ bool parseRowMergedHyundaiIoniq() {
if (currentAtshRequest.equals("ATSH7E2")) {
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
if (params.speedKmh < -99 || params.speedKmh > 200)
params.speedKmh = 0;
}
if (commandRequest.equals("2102")) {
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);

2
car_kia_eniro.h
View File

@@ -85,6 +85,8 @@ bool parseRowMergedKiaENiro() {
if (currentAtshRequest.equals("ATSH7E2")) {
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
if (params.speedKmh < -99 || params.speedKmh > 200)
params.speedKmh = 0;
}
if (commandRequest.equals("2102")) {
params.auxPerc = hexToDec(responseRowMerged.substring(50, 52).c_str(), 1, false);

BIN
dist/enirodashboard.ino.bin vendored
View File

Binary file not shown.

17
enirodashboard.ino
View File

@@ -83,6 +83,7 @@ char tmpStr4[20];
// Screens, buttons
#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 displayScreenAutoMode = 0;
bool btnLeftPressed = true;
bool btnMiddlePressed = true;
bool btnRightPressed = true;
@@ -1125,13 +1126,25 @@ bool redrawScreen(bool force) {
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 (params.speedKmh > 20) {
if (params.speedKmh > 5) {
if (displayScreenAutoMode != 3) {
tft.fillScreen(TFT_BLACK);
displayScreenAutoMode = 3;
}
drawSceneSpeed(force);
} else if (params.batPowerKw > 1) {
if (displayScreenAutoMode != 5) {
tft.fillScreen(TFT_BLACK);
displayScreenAutoMode = 5;
}
drawSceneChargingGraph(force);
} else {
if (displayScreenAutoMode != 2) {
tft.fillScreen(TFT_BLACK);
displayScreenAutoMode = 2;
}
drawSceneMain(force);
}
}