diff --git a/firmware/app/tasks/read_antenna.c b/firmware/app/tasks/read_antenna.c index d43ece29..b1b14264 100644 --- a/firmware/app/tasks/read_antenna.c +++ b/firmware/app/tasks/read_antenna.c @@ -1,7 +1,7 @@ /* * read_antenna.c * - * Copyright (C) 2021, SpaceLab. + * Copyright The OBDH 2.0 Contributors. * * This file is part of OBDH 2.0. * @@ -25,7 +25,7 @@ * * \author Gabriel Mariano Marcelino * - * \version 0.8.6 + * \version 0.10.9 * * \date 2021/10/13 * @@ -61,6 +61,15 @@ void vTaskReadAntenna(void) if (antenna_get_data(&sat_data_buf.antenna.data) == 0) { sat_data_buf.antenna.timestamp = system_get_time(); + + sys_log_print_event_from_module(SYS_LOG_INFO, TASK_READ_ANTENNA_NAME, "Temperature: "); + sys_log_print_uint(sat_data_buf.antenna.data.temperature); + sys_log_print_msg(" K"); + sys_log_new_line(); + + sys_log_print_event_from_module(SYS_LOG_INFO, TASK_READ_ANTENNA_NAME, "Status: "); + sys_log_print_hex(sat_data_buf.antenna.data.status.code); + sys_log_new_line(); } else { diff --git a/firmware/drivers/isis_antenna/isis_antenna.c b/firmware/drivers/isis_antenna/isis_antenna.c index ff9ae2de..bdc32c94 100644 --- a/firmware/drivers/isis_antenna/isis_antenna.c +++ b/firmware/drivers/isis_antenna/isis_antenna.c @@ -25,7 +25,7 @@ * * \author Gabriel Mariano Marcelino * - * \version 0.10.8 + * \version 0.10.9 * * \date 2020/02/01 * @@ -268,7 +268,7 @@ int isis_antenna_read_deployment_status_code(uint16_t *status) if (isis_antenna_i2c_read(status_bytes, 2) == 0) { - status_code = ((uint16_t)status_bytes[0] << 8) | (uint16_t)status_bytes[1]; + status_code = ((uint16_t)status_bytes[1] << 8) | (uint16_t)status_bytes[0]; *status = status_code; diff --git a/firmware/tests/drivers/README.md b/firmware/tests/drivers/README.md index e52c66ab..7d8b034d 100644 --- a/firmware/tests/drivers/README.md +++ b/firmware/tests/drivers/README.md @@ -5,6 +5,7 @@ * TCA4311A * EDC * ISIS Antenna +* Payload-X * SpaceLab EPS 2.0 * MT25Q * SpaceLab TTC 2.0 diff --git a/firmware/tests/drivers/isis_antenna_test.c b/firmware/tests/drivers/isis_antenna_test.c index 9deeadfd..fabae848 100644 --- a/firmware/tests/drivers/isis_antenna_test.c +++ b/firmware/tests/drivers/isis_antenna_test.c @@ -25,7 +25,7 @@ * * \author Gabriel Mariano Marcelino * - * \version 0.10.8 + * \version 0.10.9 * * \date 2021/09/01 * @@ -83,7 +83,7 @@ static void isis_antenna_arm_test(void **state) write_test(&cmd, 1); - uint8_t ans[2] = {0x00, 0x01}; + uint8_t ans[2] = {0x01, 0x00}; read_test(ans, 2); @@ -161,8 +161,8 @@ static void isis_antenna_read_deployment_status_code_test(void **state) uint8_t ans[2] = {0}; - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -183,8 +183,8 @@ static void isis_antenna_read_deployment_status_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -221,8 +221,8 @@ static void isis_antenna_get_data_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -296,8 +296,8 @@ static void isis_antenna_get_antenna_status_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -349,8 +349,8 @@ static void isis_antenna_get_antenna_timeout_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -402,8 +402,8 @@ static void isis_antenna_get_burning_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2); @@ -439,8 +439,8 @@ static void isis_antenna_get_arming_status_test(void **state) uint16_t raw_status = generate_random(0, UINT16_MAX); - ans[0] = raw_status >> 8; - ans[1] = raw_status & 0xFF; + ans[0] = raw_status & 0xFF; + ans[1] = raw_status >> 8; read_test(ans, 2);