tylen/SHOH-Innovation-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56 from vas-dav/balance-tasks

Browse Source 
Balance tasks
This commit is contained in:
RedHawk 2023-05-29 11:36:08 +03:00 committed by GitHub
commit 70f0c7d8ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/shoh/src/threads/logging/Log.h
View File

@ -117,6 +117,10 @@ static void create_log_line_nots(const char * _status,
#define LOG_DEBUG(fmt, ...) \ #define LOG_DEBUG(fmt, ...) \
create_log_line(global_clock->getTimeFromStart(), C_DEBUG, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); create_log_line(global_clock->getTimeFromStart(), C_DEBUG, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__);
/*
* Even though it doesn't call timer, it still can cause a softlock on the UART transaction.
* Left only for short-term debugging purposes.
*/
#define LOG_DEBUG_ISR(fmt, ...) \ #define LOG_DEBUG_ISR(fmt, ...) \
create_log_line_nots(C_DEBUG_ISR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); create_log_line_nots(C_DEBUG_ISR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__);
#else #else

6
source/shoh/src/threads/manager/Menu.cpp
View File

@ -22,13 +22,13 @@ enum
static const char * interface_messages [] = static const char * interface_messages [] =
{ {
"CURRENT %3d ", "CURRENT %3d ",
"DESIRED %3d ", "DESIRED %2d ",
"DESIRED[%3d] ", "DESIRED [%2d] ",
" Loading... " " Loading... "
}; };
Menu::Menu(ThreadCommon::QueueManager* qm): _qm(qm), Menu::Menu(ThreadCommon::QueueManager* qm): _qm(qm),
current(&Menu::sInitView), ext_temp(-99, 99, 1), set_point(-99, 99, 1) current(&Menu::sInitView), ext_temp(-99, 99, 1), set_point(10, 99, 1)
{ {
LOG_DEBUG("Creating Menu"); LOG_DEBUG("Creating Menu");
this->SetState(&Menu::sInitView); this->SetState(&Menu::sInitView);

10
source/shoh/src/threads/master/Master.cpp
View File

@ -105,16 +105,16 @@ void thread_master(void* pvParams) {
LOG_INFO("Master Started"); LOG_INFO("Master Started");
Master m(manager->qm); Master m(manager->qm);
LOG_INFO("Master is creating queues"); LOG_INFO("Master is creating queues");
manager->qm->createQueue(100, manager->qm->createQueue(60,
sizeof(Event), sizeof(Event),
ThreadCommon::QueueManager::master_event_all); ThreadCommon::QueueManager::master_event_all);
manager->qm->createQueue(20, manager->qm->createQueue(12,
sizeof(Event), sizeof(Event),
ThreadCommon::QueueManager::manager_event_master); ThreadCommon::QueueManager::manager_event_master);
manager->qm->createQueue(20, manager->qm->createQueue(12,
sizeof(UserInterface::InterfaceWithData), sizeof(UserInterface::InterfaceWithData),
ThreadCommon::QueueManager::ui_event_manager); ThreadCommon::QueueManager::ui_event_manager);
manager->qm->createQueue(10, manager->qm->createQueue(5,
sizeof(Event), sizeof(Event),
ThreadCommon::QueueManager::relay_event_master); ThreadCommon::QueueManager::relay_event_master);
LOG_INFO("Master created queues"); LOG_INFO("Master created queues");
@ -122,7 +122,7 @@ void thread_master(void* pvParams) {
LOG_INFO("Master is creating tasks"); LOG_INFO("Master is creating tasks");
manager->tm->createTask(thread_manager, "manager", manager->tm->createTask(thread_manager, "manager",
configMINIMAL_STACK_SIZE * 13,tskIDLE_PRIORITY + 1UL, configMINIMAL_STACK_SIZE * 15,tskIDLE_PRIORITY + 1UL,
static_cast<void*>(manager)); static_cast<void*>(manager));
manager->tm->createTask(thread_rotary, "rotary", manager->tm->createTask(thread_rotary, "rotary",
configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL, configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL,

2
source/shoh/src/threads/relay/Relay.cpp
View File

@ -39,7 +39,7 @@ void inline RelayDevice::RelayOff()
Relay::Relay(ThreadCommon::QueueManager* qm): Relay::Relay(ThreadCommon::QueueManager* qm):
_qm(qm), ext_temp(0x7f), setpoint(0) _qm(qm), setpoint(0), ext_temp(0x7f)
{ {
LOG_DEBUG("Creating Relay"); LOG_DEBUG("Creating Relay");
} }

12
source/shoh/src/threads/rotary/Rotary.cpp
View File

@ -21,10 +21,6 @@ extern "C"
portBASE_TYPE xHigherPriorityWoken = pdFALSE; portBASE_TYPE xHigherPriorityWoken = pdFALSE;
uint8_t data = ThreadCommon::RotaryAction::Right; uint8_t data = ThreadCommon::RotaryAction::Right;
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken)
{
LOG_DEBUG_ISR("[PIN_INT0_IRQn] portEND_SWITCHING_ISR called with False value");
}
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
@ -35,10 +31,6 @@ extern "C"
portBASE_TYPE xHigherPriorityWoken = pdFALSE; portBASE_TYPE xHigherPriorityWoken = pdFALSE;
uint8_t data = ThreadCommon::RotaryAction::Left; uint8_t data = ThreadCommon::RotaryAction::Left;
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken)
{
LOG_DEBUG_ISR("[PIN_INT1_IRQn] portEND_SWITCHING_ISR called with False value");
}
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
@ -49,10 +41,6 @@ extern "C"
portBASE_TYPE xHigherPriorityWoken = pdFALSE; portBASE_TYPE xHigherPriorityWoken = pdFALSE;
uint8_t data = ThreadCommon::RotaryAction::Press; uint8_t data = ThreadCommon::RotaryAction::Press;
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken)
{
LOG_DEBUG_ISR("[PIN_INT2_IRQn] portEND_SWITCHING_ISR called with False value");
}
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
} }