From f0d3a27dd997f0746ed48da967771cee7dbebb48 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 12 Oct 2023 09:02:19 +1100
Subject: [PATCH] Ensure StaticTask_t allocs are internal

---
 src/tasks/tasks.cpp | 6 ++++--
 src/tasks/tasks.hpp | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/tasks/tasks.cpp b/src/tasks/tasks.cpp
index 7bab93f9..ca93336f 100644
--- a/src/tasks/tasks.cpp
+++ b/src/tasks/tasks.cpp
@@ -172,14 +172,16 @@ Worker::Worker(const std::pmr::string& name,
     : stack_(stack.data()),
       queue_(xQueueCreate(queue_size, sizeof(WorkItem))),
       is_task_running_(true),
-      task_buffer_(),
+      task_buffer_(static_cast<StaticTask_t*>(
+          heap_caps_malloc(sizeof(StaticTask_t),
+                           MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT))),
       task_(xTaskCreateStatic(&Main,
                               name.c_str(),
                               stack.size(),
                               this,
                               priority,
                               stack_,
-                              &task_buffer_)) {}
+                              task_buffer_)) {}
 
 Worker::~Worker() {
   WorkItem item{
diff --git a/src/tasks/tasks.hpp b/src/tasks/tasks.hpp
index 1b6a108f..2f008120 100644
--- a/src/tasks/tasks.hpp
+++ b/src/tasks/tasks.hpp
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 
+#include "esp_heap_caps.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/portmacro.h"
 #include "freertos/projdefs.h"
@@ -54,7 +55,8 @@ auto PersistentMain(void* fn) -> void;
 
 template <Type t>
 auto StartPersistent(const std::function<void(void)>& fn) -> void {
-  StaticTask_t* task_buffer = new StaticTask_t;
+  StaticTask_t* task_buffer = static_cast<StaticTask_t*>(heap_caps_malloc(
+      sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT));
   cpp::span<StackType_t> stack = AllocateStack<t>();
   xTaskCreateStatic(&PersistentMain, Name<t>().c_str(), stack.size(),
                     new std::function<void(void)>(fn), Priority<t>(),
@@ -64,7 +66,8 @@ auto StartPersistent(const std::function<void(void)>& fn) -> void {
 template <Type t>
 auto StartPersistent(BaseType_t core, const std::function<void(void)>& fn)
     -> void {
-  StaticTask_t* task_buffer = new StaticTask_t;
+  StaticTask_t* task_buffer = static_cast<StaticTask_t*>(heap_caps_malloc(
+      sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT));
   cpp::span<StackType_t> stack = AllocateStack<t>();
   xTaskCreateStaticPinnedToCore(&PersistentMain, Name<t>().c_str(),
                                 stack.size(), new std::function<void(void)>(fn),
@@ -81,7 +84,7 @@ class Worker {
   StackType_t* stack_;
   QueueHandle_t queue_;
   std::atomic<bool> is_task_running_;
-  StaticTask_t task_buffer_;
+  StaticTask_t *task_buffer_;
   TaskHandle_t task_;
 
   struct WorkItem {