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

main: working version 0.2

Browse Source
This commit is contained in:
Vasily Davydov 2023-07-07 17:03:36 +03:00
parent 9be6c99e2c
commit 486b4a40b2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ extern QueueHandle_t logging_queue;
/* ================= Settings ================== */ /* ================= Settings ================== */
#define LOG_COLORED_OUTPUT #define LOG_COLORED_OUTPUT
#define HIGH_PRIORITY_DEBUG #define HIGH_PRIORITY_DEBUG
#define LOG_DEBUG_MESSAGES 1 #define LOG_DEBUG_MESSAGES 0
/* ================= Settings ================== */ /* ================= Settings ================== */
// internal debug defines // internal debug defines

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

@ -50,7 +50,7 @@ void Master::HandleEventType(Event* e)
//Comes from rotary, goes to manager //Comes from rotary, goes to manager
send = _qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, e, 0); send = _qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, e, 0);
//LOG_WARNING("Timestamp: %zus, Clock: %zu, Chip freq: %zu", LPC_SCT1->COUNT_U / Chip_Clock_GetMainClockRate(), LPC_SCT1->COUNT_U, Chip_Clock_GetMainClockRate()); //LOG_WARNING("Timestamp: %zus, Clock: %zu, Chip freq: %zu", LPC_SCT1->COUNT_U / Chip_Clock_GetMainClockRate(), LPC_SCT1->COUNT_U, Chip_Clock_GetMainClockRate());
if (send) LOG_DEBUG("Rotary: %s has been forwarded to manager", rotary_direction[rd]); if (send) LOG_INFO("Rotary: %s has been forwarded to manager", rotary_direction[rd]);
break; break;
case Event::InternalTemp: case Event::InternalTemp:
// TODO remove (deprecated) // TODO remove (deprecated)

6
source/shoh/src/threads/rotary/Rotary.h
View File

@ -24,11 +24,11 @@ private:
ThreadCommon::PIN_ROTARY_SIG_A, ThreadCommon::PIN_ROTARY_SIG_A,
true, true, false, true, PIN_INT0_IRQn}, true, true, false, true, PIN_INT0_IRQn},
{ ThreadCommon::PORT_ROTARY_SIG_B, { ThreadCommon::PORT_ROTARY_SIG_B,
ThreadCommon::PIN_ROTARY_SIG_A, ThreadCommon::PIN_ROTARY_SIG_B,
true, true, false}, true, true, false},
{ ThreadCommon::PORT_ROTARY_PRESS, { ThreadCommon::PORT_ROTARY_PRESS,
ThreadCommon::PIN_ROTARY_SIG_A, ThreadCommon::PIN_ROTARY_PRESS,
true, true, false, true, PIN_INT1_IRQn} }; true, true, false, true, PIN_INT1_IRQn} };
}; };
void thread_rotary(void* pvParams); void thread_rotary(void* pvParams);

2
source/shoh/src/threads/temperature/Temperature.cpp
View File

@ -20,7 +20,7 @@ void Temperature::taskFunction()
SensorTempSHT20 ext_temp_sensor(this->_pi2c); SensorTempSHT20 ext_temp_sensor(this->_pi2c);
Event t (Event::ExternalTemp, -128); Event t (Event::ExternalTemp, -128);
int8_t temp_value = -128; int8_t temp_value = -128;
_qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &t, 0); while(ext_temp_sensor.is_up() != true);
for (;;) for (;;)
{ {
if (ext_temp_sensor.is_up()) if (ext_temp_sensor.is_up())