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

ignt

Browse Source
This commit is contained in:
Lubos Petrovic
2020-12-23 10:04:29 +01:00
parent 77f5b71257
commit 57dc0c5d49
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CarKiaEniro.cpp
View File

@@ -124,11 +124,13 @@ void CarKiaEniro::parseRowMerged() {
if (liveData->currentAtshRequest.equals("ATSH770")) { if (liveData->currentAtshRequest.equals("ATSH770")) {
if (liveData->commandRequest.equals("22BC03")) { if (liveData->commandRequest.equals("22BC03")) {
tempByte = liveData->hexToDecFromResponse(16, 18, 1, false); tempByte = liveData->hexToDecFromResponse(16, 18, 1, false);
liveData->params.ignitionOnPrevious = liveData->params.ignitionOn;
liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1); liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1);
if (liveData->params.ignitionOnPrevious && !liveData->params.ignitionOn) if (liveData->params.ignitionOn) {
liveData->params.lastIgnitionOnTime = liveData->params.currentTime;
}
int32_t secDiff = liveData->params.currentTime - liveData->params.currentTime;
if (secDiff > 30 && secDiff < MONTH_SEC && !liveData->params.ignitionOn)
liveData->params.automaticShutdownTimer = liveData->params.currentTime; liveData->params.automaticShutdownTimer = liveData->params.currentTime;
liveData->params.lightInfo = liveData->hexToDecFromResponse(18, 20, 1, false); liveData->params.lightInfo = liveData->hexToDecFromResponse(18, 20, 1, false);
liveData->params.headLights = (bitRead(liveData->params.lightInfo, 5) == 1); liveData->params.headLights = (bitRead(liveData->params.lightInfo, 5) == 1);
liveData->params.dayLights = (bitRead(liveData->params.lightInfo, 3) == 1); liveData->params.dayLights = (bitRead(liveData->params.lightInfo, 3) == 1);

3
LiveData.cpp
View File

@@ -24,7 +24,7 @@ void LiveData::initParams() {
params.gpsAlt = -1; params.gpsAlt = -1;
// Car data // Car data
params.ignitionOn = false; params.ignitionOn = false;
params.ignitionOnPrevious = false; params.lastIgnitionOnTime = 0;
params.operationTimeSec = 0; params.operationTimeSec = 0;
params.chargingStartTime = params.currentTime = 0; params.chargingStartTime = params.currentTime = 0;
params.lightInfo = 0; params.lightInfo = 0;
@@ -181,4 +181,3 @@ float LiveData::celsius2temperature(float inCelsius) {
float LiveData::bar2pressure(float inBar) { float LiveData::bar2pressure(float inBar) {
return (settings.pressureUnit == 'b') ? inBar : inBar * 14.503773800722; return (settings.pressureUnit == 'b') ? inBar : inBar * 14.503773800722;
} }

5
LiveData.h
View File

@@ -33,6 +33,9 @@
#define SCREEN_CHARGING 5 #define SCREEN_CHARGING 5
#define SCREEN_SOC10 6 #define SCREEN_SOC10 6
//
#define MONTH_SEC 2678400
// Structure with realtime values // Structure with realtime values
typedef struct { typedef struct {
// System // System
@@ -54,7 +57,7 @@ typedef struct {
char sdcardFilename[32]; char sdcardFilename[32];
// Car params // Car params
bool ignitionOn; bool ignitionOn;
bool ignitionOnPrevious; time_t lastIgnitionOnTime;
uint64_t operationTimeSec; uint64_t operationTimeSec;
bool sdcardCanNotify; bool sdcardCanNotify;
bool forwardDriveMode; bool forwardDriveMode;