-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #333 from spacelab-ufsc/antenna_bug_fix
Merge pull request from antenna_bug_fix
- Loading branch information
Showing
4 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * 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 <[email protected]> | ||
| * | ||
| * \version 0.8.10 | ||
| * \version 0.10.2 | ||
| * | ||
| * \date 2019/11/01 | ||
| * | ||
|
|
@@ -67,7 +67,7 @@ int antenna_init(void) | |
| else | ||
| { | ||
| #if defined(CONFIG_DRV_ISIS_ANTENNA_ENABLED) && (CONFIG_DRV_ISIS_ANTENNA_ENABLED == 1) | ||
| sys_log_print_event_from_module(SYS_LOG_INFO, ANTENNA_MODULE_NAME, "Initializing..."); | ||
| sys_log_print_event_from_module(SYS_LOG_INFO, ANTENNA_MODULE_NAME, "Initializing the antenna..."); | ||
| sys_log_new_line(); | ||
|
|
||
| if (isis_antenna_init() == 0) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * isis_antenna_i2c.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 <[email protected]> | ||
| * | ||
| * \version 0.8.8 | ||
| * \version 0.10.2 | ||
| * | ||
| * \date 2021/10/10 | ||
| * | ||
|
|
@@ -60,7 +60,7 @@ int isis_antenna_i2c_init(void) | |
| ants_config.en_pin = ISIS_ANTENNA_I2C_EN_PIN; | ||
| ants_config.ready_pin = ISIS_ANTENNA_I2C_RDY_PIN; | ||
|
|
||
| if (tca4311a_init(ants_config, false) == TCA4311A_NOT_READY) | ||
| if (tca4311a_init(ants_config, false) == TCA4311A_READY) | ||
| { | ||
| err = 0; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * tca4311a.h | ||
| * | ||
| * Copyright (C) 2020, SpaceLab. | ||
| * Copyright The OBDH 2.0 Contributors. | ||
| * | ||
| * This file is part of OBDH 2.0. | ||
| * | ||
|
|
@@ -25,7 +25,7 @@ | |
| * | ||
| * \author Gabriel Mariano Marcelino <[email protected]> | ||
| * | ||
| * \version 0.3.9 | ||
| * \version 0.10.2 | ||
| * | ||
| * \date 01/02/2020 | ||
| * | ||
|
|
@@ -62,8 +62,8 @@ typedef struct | |
| typedef enum | ||
| { | ||
| TCA4311A_ERROR=-1, /**< Error during initialization. */ | ||
| TCA4311A_READY, /**< The chip is not ready. */ | ||
| TCA4311A_NOT_READY /**< The chip is ready. */ | ||
| TCA4311A_READY, /**< The chip is ready. */ | ||
| TCA4311A_NOT_READY /**< The chip is not ready. */ | ||
| } tca4311a_status_e; | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /* | ||
| * isis_antenna_test.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 <[email protected]> | ||
| * | ||
| * \version 0.8.2 | ||
| * \version 0.10.2 | ||
| * | ||
| * \date 2021/09/01 | ||
| * | ||
|
|
@@ -68,7 +68,7 @@ static void isis_antenna_init_test(void **state) | |
|
|
||
| expect_value(__wrap_tca4311a_init, en, false); | ||
|
|
||
| will_return(__wrap_tca4311a_init, 1); | ||
| will_return(__wrap_tca4311a_init, 0); | ||
|
|
||
| assert_return_code(isis_antenna_init(), 0); | ||
| } | ||
|
|
||