diff --git a/Board320_240.cpp b/Board320_240.cpp index 0efce0b..5804dc3 100644 --- a/Board320_240.cpp +++ b/Board320_240.cpp @@ -1220,7 +1220,7 @@ void Board320_240::redrawScreen() { spr.fillRect(320 - 20, 20, 20, 98, TFT_YELLOW); if (liveData->params.rightRearDoorOpen) spr.fillRect(320 - 20, 122, 20, 98, TFT_YELLOW); - if (liveData->params.hoodOpen) + if (liveData->params.hoodDoorOpen) spr.fillRect(20, 240 - 20, 320 - 40, 20, TFT_YELLOW); // BLE not connected diff --git a/CarKiaEniro.cpp b/CarKiaEniro.cpp index 8f51af2..b557146 100644 --- a/CarKiaEniro.cpp +++ b/CarKiaEniro.cpp @@ -125,15 +125,15 @@ void CarKiaEniro::parseRowMerged() { if (liveData->commandRequest.equals("22BC03")) { // tempByte = liveData->hexToDecFromResponse(14, 16, 1, false); - liveData->params.trunkDoorOpen = (bitRead(tempByte, 7) == 1); + liveData->params.hoodDoorOpen = (bitRead(tempByte, 7) == 1); liveData->params.leftFrontDoorOpen = (bitRead(tempByte, 5) == 1); - liveData->params.rightFrontDoorOpen = (bitRead(tempByte, 4) == 1); + liveData->params.rightFrontDoorOpen = (bitRead(tempByte, 0) == 1); + liveData->params.leftRearDoorOpen = (bitRead(tempByte, 4) == 1); liveData->params.rightRearDoorOpen = (bitRead(tempByte, 2) == 1); - liveData->params.leftRearDoorOpen = (bitRead(tempByte, 0) == 1); // tempByte = liveData->hexToDecFromResponse(16, 18, 1, false); liveData->params.ignitionOn = (bitRead(tempByte, 5) == 1); - liveData->params.hoodOpen = (bitRead(tempByte, 0) == 1); + liveData->params.trunkDoorOpen = (bitRead(tempByte, 0) == 1); if (liveData->params.ignitionOn) { liveData->params.lastIgnitionOnTime = liveData->params.currentTime; } diff --git a/LiveData.cpp b/LiveData.cpp index 8ec4580..a30570e 100644 --- a/LiveData.cpp +++ b/LiveData.cpp @@ -36,7 +36,7 @@ void LiveData::initParams() { params.rightFrontDoorOpen = false; params.leftRearDoorOpen = false; params.rightRearDoorOpen = false; - params.hoodOpen = false; + params.hoodDoorOpen = false; params.forwardDriveMode = false; params.reverseDriveMode = false; params.parkModeOrNeutral = false; diff --git a/LiveData.h b/LiveData.h index 8162c2a..9b3fd57 100644 --- a/LiveData.h +++ b/LiveData.h @@ -73,7 +73,7 @@ typedef struct { bool rightFrontDoorOpen; bool leftRearDoorOpen; bool rightRearDoorOpen; - bool hoodOpen; + bool hoodDoorOpen; /* uint8_t lightInfo; uint8_t brakeLightInfo; uint8_t espState;*/