Skip to content

Commit 660c59e

Browse files
author
Guhan Iyer
committed
Requested changes
1 parent 1144343 commit 660c59e

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

obc/app/drivers/rm46/obc_gio_ctrl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "alarm_handler.h"
66
#include "obc_board_config.h"
77
#include "tpl5010.h"
8-
#include "obc_logging.h"
98

109
void gioNotification(gioPORT_t *port, uint32 bit) {
1110
if (port == gioPORTA) {

obc/app/drivers/rm46/obc_i2c_io.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ obc_error_code_t i2cReceiveFrom(uint8_t sAddr, uint16_t size, uint8_t *buf, Tick
103103

104104
if (xSemaphoreTake(i2cTransferComplete, transferTimeoutTicks) != pdTRUE) {
105105
errCode = OBC_ERR_CODE_I2C_TRANSFER_TIMEOUT;
106+
LOG_ERROR_CODE("Semaphore cannot be given or was already given.");
106107
i2cSetStop(I2C_REG);
107108
} else {
108109
errCode = OBC_ERR_CODE_SUCCESS;

obc/app/modules/alarm_mgr/alarm_handler.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,8 @@ 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.");
227+
if (xQueueSendToFrontFromISR(alarmHandlerQueueHandle, (void *)&event, &xHigherPriorityTaskWoken) != pdTRUE) {
228+
LOG_ERROR_CODE("Alarm callback failed.");
231229
}
232230

233231
if (xHigherPriorityTaskWoken) {

obc/app/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-
LOG_ERROR_FROM_ISR("TX FIFO below spec.");
391+
LOG_ERROR_CODE("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-
LOG_ERROR_FROM_ISR("RX FIFO above threshold.");
403+
LOG_ERROR_CODE(OBC_ERR_CODE_QUEUE_FULL);
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-
LOG_ERROR_FROM_ISR("TX FIFO is empty.");
415+
LOG_ERROR_CODE(OBC_ERR_CODE_QUEUE_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-
LOG_ERROR_FROM_ISR("Sync word receieved.");
427+
LOG_ERROR_CODE("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)