Skip to content

Commit 11122ce

Browse files
committed
Pulled from main. added required changes.
1 parent c16cf07 commit 11122ce

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

obc/drivers/rm46/obc_gio_ctrl.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ void gioNotification(gioPORT_t *port, uint32 bit) {
1212
switch (bit) {
1313
case DS3232_INT_PIN:
1414
alarmInterruptCallback();
15-
LOG_DEBUG_FROM_ISR("Alarm handler called.");
1615
break;
1716
// See section 3.4.1.1
1817
// Triggered on falling edge so TX FIFO can be written to once the signal that RTX FIFO is above
@@ -33,7 +32,6 @@ void gioNotification(gioPORT_t *port, uint32 bit) {
3332
// is asserted to avoid a FIFO overflow
3433
case CC1120_RX_THR_PKT_gioPORTB_PIN:
3534
rxFifoReadyCallback();
36-
LOG_DEBUG_FROM_ISR("RX FIFO above threshold.");
3735
break;
3836

3937
#ifdef OBC_REVISION_2

obc/drivers/rm46/obc_i2c_io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ void i2cNotification(i2cBASE_t *i2c, uint32 flags) {
155155
xSemaphoreGiveFromISR(i2cTransferComplete, &xHigherPriorityTaskWoken);
156156

157157
if (xSemaphoreGiveFromISR(i2cTransferComplete, &xHigherPriorityTaskWoken) == pdTRUE) {
158-
LOG_DEBUG_FROM_ISR("Semaphore successfully given.");
158+
LOG_ERROR_FROM_ISR("Semaphore successfully given.");
159159
} else {
160-
LOG_DEBUG_FROM_ISR("Semaphore cannot be given or was already given.");
160+
LOG_ERROR_FROM_ISR("Semaphore cannot be given or was already given.");
161161
}
162162
}
163163

obc/modules/alarm_mgr/alarm_handler.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,11 @@ void alarmInterruptCallback(void) {
224224

225225
alarm_handler_event_t event = {.id = ALARM_HANDLER_ALARM_TRIGGERED};
226226
xQueueSendToFrontFromISR(alarmHandlerQueueHandle, (void *)&event, &xHigherPriorityTaskWoken);
227+
if (xQueueSendToFrontFromISR(alarmHandlerQueueHandle, (void *)&event, &xHigherPriorityTaskWoken) == pdTRUE) {
228+
LOG_DEBUG_FROM_ISR("Alarm callback called; data sent to front of queue.");
229+
} else {
230+
LOG_ERROR_FROM_ISR("Alarm callback failed.");
231+
}
227232

228233
if (xHigherPriorityTaskWoken) {
229234
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);

obc/modules/comms_link_mgr/cc1120_txrx.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ void txFifoReadyCallback(void) {
388388
// give semaphore and set xHigherPriorityTaskAwoken to pdTRUE if this unblocks a higher priority task than the current
389389
// one
390390
if (xSemaphoreGiveFromISR(txSemaphore, &xHigherPriorityTaskAwoken) != pdPASS) {
391-
/* TODO: figure out how to log from ISR */
391+
LOG_ERROR_FROM_ISR("TX FIFO below spec.");
392392
}
393393
// if xHigherPriorityTaskAwoken == pdTRUE then request a context switch since this means a higher priority task has
394394
// been unblocked
@@ -400,7 +400,7 @@ void rxFifoReadyCallback(void) {
400400
// give semaphore and set xHigherPriorityTaskAwoken to pdTRUE if this unblocks a higher priority task than the current
401401
// one
402402
if (xSemaphoreGiveFromISR(rxSemaphore, &xHigherPriorityTaskAwoken) != pdPASS) {
403-
/* TODO: figure out how to log from ISR */
403+
LOG_ERROR_FROM_ISR("RX FIFO above threshold.");
404404
}
405405
// if xHigherPriorityTaskAwoken == pdTRUE then request a context switch since this means a higher priority task has
406406
// been unblocked
@@ -412,7 +412,7 @@ void txFifoEmptyCallback(void) {
412412
// give semaphore and set xHigherPriorityTaskAwoken to pdTRUE if this unblocks a higher priority task than the current
413413
// one
414414
if (xSemaphoreGiveFromISR(txFifoEmptySemaphore, &xHigherPriorityTaskAwoken) != pdPASS) {
415-
/* TODO: figure out how to log from ISR */
415+
LOG_ERROR_FROM_ISR("TX FIFO is empty.");
416416
}
417417
// if xHigherPriorityTaskAwoken == pdTRUE then request a context switch since this means a higher priority task has
418418
// been unblocked
@@ -424,7 +424,7 @@ void syncEventCallback(void) {
424424
// give semaphore and set xHigherPriorityTaskAwoken to pdTRUE if this unblocks a higher priority task than the current
425425
// one
426426
if (xSemaphoreGiveFromISR(syncReceivedSemaphore, &xHigherPriorityTaskAwoken) != pdPASS) {
427-
/* TODO: figure out how to log from ISR */
427+
LOG_ERROR_FROM_ISR("Sync word receieved.");
428428
}
429429
// if xHigherPriorityTaskAwoken == pdTRUE then request a context switch since this means a higher priority task has
430430
// been unblocked

0 commit comments

Comments
 (0)