Refactor WashingTask dependencies and

initialization
aleemont1 · Dec 5, 2023 · 404563f · 404563f
1 parent a7abd1e
commit 404563f
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/smart_bridge/src/tasks/WashingTask.cpp b/smart_bridge/src/tasks/WashingTask.cpp
@@ -16,33 +16,40 @@ WashingTask::WashingTask(BlinkTask *blinkTask,
     this->blinkTask->setActive(false); // TODO: Check if this is necessary
     this->countDownTask = countDownTask;
     this->temperatureTask = temperatureTask;
-    this->init(1000);
+    this->countDownTask->setActive(false);
+    this->temperatureTask->setActive(false);
+    this->init();
     this->setState(START_WASHING);
 }
 
 void WashingTask::tick()
 {
-    if (this->DependantTask::getDependency(0)->isCompleted())
+    if (this->getDependency(0) != nullptr)
     {
-        switch (this->getState())
+        if (this->DependantTask::getDependency(0)->isCompleted())
         {
-        case START_WASHING:
-            handleStartWashing();
-            break;
+            switch (this->getState())
+            {
+            case START_WASHING:
+                handleStartWashing();
+                break;
 
-        case STARTS_COUNTDOWN:
-            handleStartsCountdown();
-            break;
+            case STARTS_COUNTDOWN:
+                handleStartsCountdown();
+                break;
 
-        case ENDS_COUNTDOWN:
-            handleEndsCountdown();
-            break;
+            case ENDS_COUNTDOWN:
+                handleEndsCountdown();
+                break;
 
-        case ERROR:
-            handleError();
-            break;
+            case ERROR:
+                handleError();
+                break;
+            }
         }
     }
+    else
+        Serial.println("WashingTask::tick()::getDependency(0) is nullptr");
 }
 
 void WashingTask::printWashingCompletedMessage()