lib: fix buzzer melody task destruction

and3rson · Mar 11, 2024 · b39a2f2 · b39a2f2
1 parent 8c3fe35
commit b39a2f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/sdk/lib/lilka/src/lilka/buzzer.cpp b/sdk/lib/lilka/src/lilka/buzzer.cpp
@@ -91,24 +91,12 @@ void Buzzer::melodyTask(void* arg) {
         xSemaphoreGive(buzzer->buzzerMutex);
         vTaskDelay(duration / portTICK_PERIOD_MS);
     }
-    // Start another lambda task to delete the melody task & release mutex
     xSemaphoreTake(buzzer->buzzerMutex, portMAX_DELAY);
     noTone(LILKA_BUZZER);
-    if (xTaskCreate(buzzer->melodyTaskCleanup, "melodyTaskCleanup", 2048, buzzer, 1, NULL) != pdPASS) {
-        serial_err("Failed to create melody task cleanup task (not enough memory?)");
-        // Failsafe: release the mutex & delete task.
-        // This is NOT thread-safe, but it's better than a deadlock.
-        xSemaphoreGive(buzzer->buzzerMutex);
-        vTaskDelete(NULL);
-        noTone(LILKA_BUZZER);
-    }
-}
-
-void Buzzer::melodyTaskCleanup(void* arg) {
-    Buzzer* buzzer = static_cast<Buzzer*>(arg);
-    vTaskDelete(buzzer->melodyTaskHandle);
+    // Release the mutex & delete task.
     buzzer->melodyTaskHandle = NULL;
     xSemaphoreGive(buzzer->buzzerMutex);
+    vTaskDelete(NULL);
 }
 
 void Buzzer::stop() {

diff --git a/sdk/lib/lilka/src/lilka/buzzer.h b/sdk/lib/lilka/src/lilka/buzzer.h
@@ -91,8 +91,6 @@ class Buzzer {
 private:
     // cppcheck-suppress unusedPrivateFunction
     void _stop();
-    // cppcheck-suppress unusedPrivateFunction
-    static void melodyTaskCleanup(void* arg);
 
     SemaphoreHandle_t buzzerMutex;
     TaskHandle_t melodyTaskHandle;