Wait for self test done flag

flxkrmr · Feb 21, 2023 · 8ccd9f8 · 8ccd9f8
1 parent a47b772
commit 8ccd9f8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 84 deletions.
diff --git a/lib/fault_code/fault_code_util.c b/lib/fault_code/fault_code_util.c
diff --git a/lib/fault_code/fault_code_util.h b/lib/fault_code/fault_code_util.h
diff --git a/src/Cart.cpp b/src/Cart.cpp
@@ -172,6 +172,9 @@ void Cart::handleStatusSlot() {
         case CURRENT_DIAGNOSTIC_MODE:
             currentDiagnosticMode = wordBuffer[0];
             break;
+        case NEXT_DIAGNOSTIC_MODE:
+            nextDiagnosticMode = wordBuffer[0];
+            break;
         case DCL_ERROR_FLAG_LOW:
             memcpy(&dclErrorFlagLow, wordBuffer, 1);
             break;

diff --git a/src/Cart.h b/src/Cart.h
@@ -9,6 +9,7 @@
 class Cart {
 
     public:
+
         struct IdSlot {
             unsigned int rpm : 8;
             unsigned int frameNumber : 4;
@@ -46,6 +47,7 @@ class Cart {
         bool diagnosticParameterSendingDone = false;
 
         uint8_t currentDiagnosticMode = 0;
+        uint8_t nextDiagnosticMode = 0;
 
         void setBaudrate(long baudrate);
         void sendStartMessage();

diff --git a/src/EecIv.cpp b/src/EecIv.cpp
@@ -48,6 +48,7 @@ void EecIv::mainLoop() {
       break;
     case WAIT_FOR_SYNC_9600:
       if (cart->isSynced) {
+        debugPrint("Synced with default baud");
         startMessageCounter = 0;
         currentState = REQUEST_BAUD_RATE_CHANGE;
       } else {
@@ -79,6 +80,7 @@ void EecIv::mainLoop() {
       break;
     case WAIT_FOR_SYNC_2400:
       if (cart->isSynced) {
+        debugPrint("Synced with 2400");
         currentState = REQUEST_CLEAR_DCL_ERRORS;
       } else {
           if(exceededTimeout()) {
@@ -121,19 +123,22 @@ void EecIv::mainLoop() {
       break;
     }
     case WAIT_REQUEST_CONT_SELF_TEST_CODES:
-      if (cart->currentDiagnosticMode == 0x26) {
+      if (cart->nextDiagnosticMode == 0x26) {
         currentState = READ_CONT_SELF_TEST_CODES;
         cart->hasData = false;
       }
       break;
     case READ_CONT_SELF_TEST_CODES:
       if (cart->hasData) {
+        Serial.println("Has Data");
         uint8_t data[2];
         cart->getData(data);
-        char readable[4];
-        sprintf(readable, "%01X%02X", data[1] & 0xF, data[0]);
-        onFaultCodeFinished(readable);
-
+        onKoeoReadCode(data);
+      }
+      if (cart->dclErrorFlagHigh.selfTestComplete) {
+        Serial.println("Self Test complete");
+
+        onKoeoFinished();
         cart->enableDiagnosticParameterSending = false;
         currentState = IDLE;
       }
@@ -166,7 +171,8 @@ void EecIv::mainLoop() {
         if (cart->frameDone || koeoCounter >= 12) {
           onKoeoFinished();
           currentState = IDLE;
-          cart->enableDiagnosticParameterSending = false;
+          // TODO test 
+          // cart->enableDiagnosticParameterSending = false;
         }
 
         uint8_t data[2];

diff --git a/src/EecIvReader.cpp b/src/EecIvReader.cpp
@@ -6,7 +6,6 @@
 #include "VoltageReader.h"
 
 extern "C" {
-  #include "fault_code_util.h"
   #include "version.h"
 }