From f9a1066cd81468dfa8f5ad24fc27bbd24d6181f9 Mon Sep 17 00:00:00 2001 From: RedHawk Date: Fri, 19 May 2023 01:33:04 +0300 Subject: [PATCH] Master: [#5] Shift queue and task sizes. *Relay: mitigate warning. --- source/shoh/src/threads/master/Master.cpp | 10 +++++----- source/shoh/src/threads/relay/Relay.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/shoh/src/threads/master/Master.cpp b/source/shoh/src/threads/master/Master.cpp index ea1d38f..f834b94 100644 --- a/source/shoh/src/threads/master/Master.cpp +++ b/source/shoh/src/threads/master/Master.cpp @@ -105,16 +105,16 @@ void thread_master(void* pvParams) { LOG_INFO("Master Started"); Master m(manager->qm); LOG_INFO("Master is creating queues"); - manager->qm->createQueue(100, + manager->qm->createQueue(60, sizeof(Event), ThreadCommon::QueueManager::master_event_all); - manager->qm->createQueue(20, + manager->qm->createQueue(12, sizeof(Event), ThreadCommon::QueueManager::manager_event_master); - manager->qm->createQueue(20, + manager->qm->createQueue(12, sizeof(UserInterface::InterfaceWithData), ThreadCommon::QueueManager::ui_event_manager); - manager->qm->createQueue(10, + manager->qm->createQueue(5, sizeof(Event), ThreadCommon::QueueManager::relay_event_master); LOG_INFO("Master created queues"); @@ -122,7 +122,7 @@ void thread_master(void* pvParams) { LOG_INFO("Master is creating tasks"); manager->tm->createTask(thread_manager, "manager", - configMINIMAL_STACK_SIZE * 13,tskIDLE_PRIORITY + 1UL, + configMINIMAL_STACK_SIZE * 15,tskIDLE_PRIORITY + 1UL, static_cast(manager)); manager->tm->createTask(thread_rotary, "rotary", configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL, diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp index d548802..310b41b 100644 --- a/source/shoh/src/threads/relay/Relay.cpp +++ b/source/shoh/src/threads/relay/Relay.cpp @@ -39,7 +39,7 @@ void inline RelayDevice::RelayOff() Relay::Relay(ThreadCommon::QueueManager* qm): - _qm(qm), ext_temp(0x7f), setpoint(0) + _qm(qm), setpoint(0), ext_temp(0x7f) { LOG_DEBUG("Creating Relay"); }