diff --git a/source/shoh/src/threads/logging/Log.h b/source/shoh/src/threads/logging/Log.h index 3bf6975..2e274e5 100644 --- a/source/shoh/src/threads/logging/Log.h +++ b/source/shoh/src/threads/logging/Log.h @@ -16,7 +16,7 @@ extern QueueHandle_t logging_queue; /* ================= Settings ================== */ #define LOG_COLORED_OUTPUT #define HIGH_PRIORITY_DEBUG -#define LOG_DEBUG_MESSAGES 1 +#define LOG_DEBUG_MESSAGES 0 /* ================= Settings ================== */ // internal debug defines diff --git a/source/shoh/src/threads/master/Master.cpp b/source/shoh/src/threads/master/Master.cpp index f834b94..09d3ded 100644 --- a/source/shoh/src/threads/master/Master.cpp +++ b/source/shoh/src/threads/master/Master.cpp @@ -50,7 +50,7 @@ void Master::HandleEventType(Event* e) //Comes from rotary, goes to manager send = _qm->send(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()); - 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; case Event::InternalTemp: // TODO remove (deprecated) diff --git a/source/shoh/src/threads/rotary/Rotary.h b/source/shoh/src/threads/rotary/Rotary.h index b99965f..e1a1659 100644 --- a/source/shoh/src/threads/rotary/Rotary.h +++ b/source/shoh/src/threads/rotary/Rotary.h @@ -24,11 +24,11 @@ private: ThreadCommon::PIN_ROTARY_SIG_A, true, true, false, true, PIN_INT0_IRQn}, { ThreadCommon::PORT_ROTARY_SIG_B, - ThreadCommon::PIN_ROTARY_SIG_A, + ThreadCommon::PIN_ROTARY_SIG_B, true, true, false}, { ThreadCommon::PORT_ROTARY_PRESS, - ThreadCommon::PIN_ROTARY_SIG_A, - true, true, false, true, PIN_INT1_IRQn} }; + ThreadCommon::PIN_ROTARY_PRESS, + true, true, false, true, PIN_INT1_IRQn} }; }; void thread_rotary(void* pvParams); diff --git a/source/shoh/src/threads/temperature/Temperature.cpp b/source/shoh/src/threads/temperature/Temperature.cpp index 45efd81..132ad24 100644 --- a/source/shoh/src/threads/temperature/Temperature.cpp +++ b/source/shoh/src/threads/temperature/Temperature.cpp @@ -20,7 +20,7 @@ void Temperature::taskFunction() SensorTempSHT20 ext_temp_sensor(this->_pi2c); Event t (Event::ExternalTemp, -128); int8_t temp_value = -128; - _qm->send(ThreadCommon::QueueManager::master_event_all, &t, 0); + while(ext_temp_sensor.is_up() != true); for (;;) { if (ext_temp_sensor.is_up())