ALPAKA/TACOS
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/TACOS.git synced 2025-09-29 02:57:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed registerThread to accept shared_ptrs to fix some issues with polymorphism.

Browse Source
This commit is contained in:
dario
2023-09-29 15:12:44 +02:00
parent 54b2e4e9cd
commit 1a9a96503e
8 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Tacos/src/manager.cpp
View File

@@ -14,7 +14,7 @@ namespace sta
{
namespace tacos
{
void Manager::registerThread(TacosThread thread, std::list<uint16_t> states)
void Manager::registerThread(std::shared_ptr<TacosThread> thread, std::list<uint16_t> states)
{
for (uint16_t state : states)
{
@@ -28,11 +28,11 @@ namespace sta
{
STA_ASSERT(state < STA_TACOS_NUM_STATES);
for (TacosThread thread : threads_[state])
for (std::shared_ptr<TacosThread> thread : threads_[state])
{
if (!thread.isRunning())
if (!thread->isRunning())
{
thread.start();
thread->start();
}
}
}
@@ -48,13 +48,13 @@ namespace sta
continue;
}
for (TacosThread thread : threads_[state])
for (std::shared_ptr<TacosThread> thread : threads_[state])
{
// If the thread is currently running but not part of the set of threads that should be running...
if (thread.isRunning() && threads_[currentState].count(thread) == 0)
if (thread->isRunning() && threads_[currentState].count(thread) == 0)
{
// ...politely request termination.
thread.requestTermination();
thread->requestTermination();
}
}
}
@@ -70,20 +70,11 @@ namespace sta
void Manager::init()
{
STA_DEBUG_PRINTLN("INITIALIZING MANAGER!");
startThreads(Statemachine::instance()->getCurrentState());
}
void Manager::func()
{
if (true)
{
// STA_DEBUG_PRINTLN("LOOPY LOOP IN MANAGER TASK");
osDelay(1000);
}
// Wait for either the termination request or the state change flag.
uint32_t flags = osEventFlagsWait(getInstance(), STA_RTOS_THREAD_FLAG_TERMINATE, osFlagsWaitAny, osWaitForever);

3
Tacos/src/statemachine.cpp
View File

@@ -35,10 +35,7 @@ namespace sta
void Statemachine::func()
{
STA_DEBUG_PRINTLN("LOOPY LOOP IN STATEMACHINE.");
STA_DEBUG_PRINTLN(lockoutTimer_.isRunning() ? "LOCKOUT RUNNING!" : "LOCKOUT STOPPED!");
osDelay(500);
}
uint16_t Statemachine::getCurrentState() const

5
Tacos/src/thread.cpp
View File

@@ -8,6 +8,7 @@
#include <sta/tacos/thread.hpp>
#include <sta/debug/assert.hpp>
#include <sta/debug/debug.hpp>
#include <functional>
#include <cstring>
@@ -87,10 +88,6 @@ namespace sta
return std::strcmp(this->getName(), other.getName()) < 0;
}
void TacosThread::init(){}
void TacosThread::func(){}
TacosThread::~TacosThread(){}
} // namespace tacos