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

rotary: [#62] Changed interrupts behaviour.

Browse Source 
* Button on the rotary is still inactive. Demands further investigation
  with logic analizer.
This commit is contained in:
RedHawk 2023-06-11 13:48:24 +03:00
parent 2b785e5b0c
commit 38b24f5998
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@
static QueueHandle_t * p_rotary_isr_q; static QueueHandle_t * p_rotary_isr_q;
static DigitalIoPin * p_sigB;
extern "C" extern "C"
{ {
void void
@ -19,11 +21,17 @@ extern "C"
{ {
Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT0_IRQn)); Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT0_IRQn));
portBASE_TYPE xHigherPriorityWoken = pdFALSE; portBASE_TYPE xHigherPriorityWoken = pdFALSE;
uint8_t data = ThreadCommon::RotaryAction::Right; uint8_t data;
if (p_sigB->read())
data = ThreadCommon::RotaryAction::Left;
else
data = ThreadCommon::RotaryAction::Right;
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
/*
void void
PIN_INT1_IRQHandler (void) PIN_INT1_IRQHandler (void)
{ {
@ -33,11 +41,11 @@ extern "C"
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
*/
void void
PIN_INT2_IRQHandler (void) PIN_INT1_IRQHandler (void)
{ {
Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT2_IRQn)); Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT1_IRQn));
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);
@ -48,6 +56,7 @@ extern "C"
Rotary::Rotary(ThreadCommon::QueueManager* qm) : _qm(qm) Rotary::Rotary(ThreadCommon::QueueManager* qm) : _qm(qm)
{ {
LOG_DEBUG("Creating Rotary"); LOG_DEBUG("Creating Rotary");
p_sigB = &(this->signal[1]);
} }
Rotary::~Rotary() Rotary::~Rotary()

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

@ -20,9 +20,9 @@ public:
private: private:
Event* message; Event* message;
ThreadCommon::QueueManager* _qm; ThreadCommon::QueueManager* _qm;
DigitalIoPin signal[3] = { { 1, 18, true, true, false, true, PIN_INT0_IRQn}, //SW1 //Right //0 1 DigitalIoPin signal[3] = { { 1, 18, true, true, false, true, PIN_INT0_IRQn}, //sigA
{ 2, 12, true, true, false, true, PIN_INT1_IRQn}, //SW2 //Left //0 16 { 2, 12, true, true, false}, //sigB
{ 2, 11, true, false, false, true, PIN_INT2_IRQn} }; //Press //1 8 { 0, 1, true, true, false, true, PIN_INT1_IRQn} }; //Press, sw //2 11
}; };
void thread_rotary(void* pvParams); void thread_rotary(void* pvParams);

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

@ -27,6 +27,7 @@ void Temperature::taskFunction()
if(temp_value == -128) if(temp_value == -128)
{ {
LOG_ERROR("Failed to get temperature."); LOG_ERROR("Failed to get temperature.");
vTaskDelay(10000);
continue; continue;
} }