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

Merge branch 'master' of https://github.com/nickn17/evDash

Browse Source
This commit is contained in:
Ján Mátik
2020-12-28 09:36:23 +01:00
parent a38c047391 fe79609660
commit 1c1ce907a1
15 changed files with 443 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CarBmwI3.cpp
View File

@@ -87,15 +87,15 @@ void CarBmwI3::activateCommandQueue() {
void CarBmwI3::parseRowMerged()
{
// Serial.println("--Parsing row merged: ");
// Serial.print("--responseRowMerged: "); Serial.println(liveData->responseRowMerged);
// Serial.print("--currentAtshRequest: "); Serial.println(liveData->currentAtshRequest);
// Serial.print("--commandRequest: "); Serial.println(liveData->commandRequest);
// Serial.print("--mergedLength: "); Serial.println(liveData->responseRowMerged.length());
Serial.print("--mergedVectorLength: "); Serial.println(liveData->vResponseRowMerged.size());
// syslog->println("--Parsing row merged: ");
// syslog->print("--responseRowMerged: "); syslog->println(liveData->responseRowMerged);
// syslog->print("--currentAtshRequest: "); syslog->println(liveData->currentAtshRequest);
// syslog->print("--commandRequest: "); syslog->println(liveData->commandRequest);
// syslog->print("--mergedLength: "); syslog->println(liveData->responseRowMerged.length());
syslog->print("--mergedVectorLength: "); syslog->println(liveData->vResponseRowMerged.size());
if (liveData->responseRowMerged.length() <= 6) {
Serial.println("--too short data, skiping processing");
syslog->println("--too short data, skiping processing");
}
struct Header_t
@@ -116,8 +116,8 @@ void CarBmwI3::parseRowMerged()
std::vector<uint8_t> payloadReversed(pHeader->pData, pHeader->pData + payloadLength);
std::reverse(payloadReversed.begin(), payloadReversed.end());
//Serial.print("--extracted PID: "); Serial.println(pHeader->getPid());
//Serial.print("--payload length: "); Serial.println(payloadLength);
//syslog->print("--extracted PID: "); syslog->println(pHeader->getPid());
//syslog->print("--payload length: "); syslog->println(payloadLength);
// BMS
@@ -301,9 +301,9 @@ void CarBmwI3::parseRowMerged()
liveData->params.batTempC = ptr->tempAvg / 100.0;
liveData->params.batMaxC = ptr->tempMax / 100.0;
Serial.print("----batMinC: "); Serial.println(liveData->params.batMinC);
Serial.print("----batTemp: "); Serial.println(liveData->params.batTempC);
Serial.print("----batMaxC: "); Serial.println(liveData->params.batMaxC);
syslog->print("----batMinC: "); syslog->println(liveData->params.batMinC);
syslog->print("----batTemp: "); syslog->println(liveData->params.batTempC);
syslog->print("----batMaxC: "); syslog->println(liveData->params.batMaxC);
}
}
break;