ALPAKA/TACOS
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/TACOS.git synced 2025-06-10 16:45:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crashing timers by increasing the default task's stack

Browse Source
This commit is contained in:
dario 2023-10-10 11:31:27 +02:00
parent 1a9a96503e
commit cb41fb56e2
6 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App/Inc/sta/config.hpp
View File

@ -30,6 +30,7 @@
// Settings for TACOS
#define STA_TACOS_MANAGER_PRIORITY osPriorityNormal
#define STA_TACOS_STATEMACHINE_PRIORITY osPriorityNormal
#define STA_TACOS_NUM_STATES 4
#define STA_TACOS_INITIAL_STATE 0

7
App/Src/startup.cpp
View File

@ -28,9 +28,10 @@ namespace sta
{
STA_DEBUG_PRINTLN("Starting manager task!");
Manager::instance()->registerThread(std::make_unique<demo::DummyTask>("A"), {0, 1});
Manager::instance()->registerThread(std::make_unique<demo::DummyTask>("B"), {0, 2});
Manager::instance()->registerThread(std::make_unique<demo::DummyTask>("C"), {0, 3});
Manager::instance()->registerThread(std::make_shared<demo::DummyTask>("A"), {0, 1});
Manager::instance()->registerThread(std::make_shared<demo::DummyTask>("B"), {0, 2});
Manager::instance()->registerThread(std::make_shared<demo::DummyTask>("C"), {0, 1});
Manager::instance()->registerThread(std::make_shared<demo::DummyTask>("D"), {0, 2});
}
} // namespace tacos
} // namespace sta

2
Core/Src/freertos.c
View File

@ -52,7 +52,7 @@ typedef StaticSemaphore_t osStaticMutexDef_t;
osThreadId_t defaultTaskHandle;
const osThreadAttr_t defaultTask_attributes = {
.name = "defaultTask",
.stack_size = 128 * 4,
.stack_size = 256 * 4,
.priority = (osPriority_t) osPriorityNormal,
};
/* Definitions for uartMutex */

2
TACOS-Demo.ioc
View File

@ -5,7 +5,7 @@ CAD.provider=
FREERTOS.FootprintOK=true
FREERTOS.IPParameters=Tasks01,configUSE_NEWLIB_REENTRANT,configRECORD_STACK_HIGH_ADDRESS,configCHECK_FOR_STACK_OVERFLOW,Mutexes01,FootprintOK,configTIMER_TASK_PRIORITY
FREERTOS.Mutexes01=uartMutex,Static,uartMutex_cb
FREERTOS.Tasks01=defaultTask,24,128,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL
FREERTOS.Tasks01=defaultTask,24,256,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL
FREERTOS.configCHECK_FOR_STACK_OVERFLOW=1
FREERTOS.configRECORD_STACK_HIGH_ADDRESS=1
FREERTOS.configTIMER_TASK_PRIORITY=48

15
Tacos/include/sta/tacos/statemachine.hpp
View File

@ -10,11 +10,6 @@
#include <sta/config.hpp>
#include <sta/tacos/thread.hpp>
#include <sta/rtos/timer.hpp>
#include <sta/debug/assert.hpp>
#ifndef STA_TACOS_NUM_STATES
# error "Number of states wasn't defined in config.hpp"
@ -26,6 +21,13 @@
#endif
#include <sta/tacos/thread.hpp>
#include <sta/rtos/timer.hpp>
#include <sta/debug/assert.hpp>
#include <functional>
namespace sta
{
namespace tacos
@ -52,6 +54,8 @@ namespace sta
uint16_t getCurrentState() const;
void setStateTransitionFunction(uint16_t (*function)(uint16_t));
private:
static Statemachine * _instance;
@ -81,6 +85,7 @@ namespace sta
uint16_t currentState_;
RtosTimer lockoutTimer_;
RtosTimer failsafeTimer_;
std::function<uint16_t(uint16_t)> transitionFunc_;
};
} // namespace tacos
} // namespace sta

30
Tacos/src/statemachine.cpp
View File

@ -15,7 +15,8 @@ namespace sta
namespace tacos
{
Statemachine::Statemachine()
: currentState_{STA_TACOS_INITIAL_STATE},
: TacosThread{"Statemachine", STA_TACOS_STATEMACHINE_PRIORITY},
currentState_{STA_TACOS_INITIAL_STATE},
lockoutTimer_{[](void *){}, nullptr},
failsafeTimer_{[](void *){}, nullptr}
{
@ -24,18 +25,30 @@ namespace sta
void Statemachine::init()
{
STA_DEBUG_PRINTLN("INITIALIZING STATEMACHINE");
lockoutTimer_.setCallback([](void *) { STA_DEBUG_PRINTLN("[LOCKOUT TIMEOUT]"); }, nullptr);
lockoutTimer_.setCallback([](void *) { }, nullptr);
lockoutTimer_.start(5000);
failsafeTimer_.setCallback([](void * arg) { STA_DEBUG_PRINTLN("[FAILSAFE TIMEOUT]"); }, nullptr);
STA_DEBUG_PRINTLN("INITIALIZING STATEMACHINE");
failsafeTimer_.setCallback([](void * arg) { }, nullptr);
failsafeTimer_.start(10000);
}
void Statemachine::func()
{
/*
uint16_t next = transitionFunc_(currentState_);
STA_ASSERT(next < STA_TACOS_NUM_STATES);
if (next != currentState_)
{
currentState_ = next;
// TODO: Emit state transition event.
}*/
STA_DEBUG_PRINTLN(lockoutTimer_.isRunning() ? "[RUNNING]" : "[STOPPED]");
osDelay(1000);
}
uint16_t Statemachine::getCurrentState() const
@ -43,6 +56,13 @@ namespace sta
return currentState_;
}
void Statemachine::setStateTransitionFunction(uint16_t (*function)(uint16_t))
{
STA_ASSERT(function != nullptr);
transitionFunc_ = function;
}
Statemachine* Statemachine::_instance = nullptr;
} // namespace tacos