-
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 branch 'dev_firmware' into spi_mutex_feature
- Loading branch information
Showing
3 changed files
with
8 additions
and
6 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 |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| * | ||
| * \author Gabriel Mariano Marcelino <[email protected]> | ||
| * | ||
| * \version 0.10.7 | ||
| * \version 0.10.16 | ||
| * | ||
| * \date 2020/01/12 | ||
| * | ||
|
|
@@ -42,9 +42,11 @@ xTaskHandle xTaskSystemResetHandle; | |
|
|
||
| void vTaskSystemReset(void) | ||
| { | ||
| TickType_t reset_period_ticks = pdMS_TO_TICKS_64((TickType_t) TASK_SYSTEM_RESET_PERIOD_MS); | ||
|
|
||
| while(1) | ||
| { | ||
| vTaskDelay(pdMS_TO_TICKS_64(TASK_SYSTEM_RESET_PERIOD_MS)); | ||
| vTaskDelay(reset_period_ticks); | ||
|
|
||
| sys_log_print_event_from_module(SYS_LOG_INFO, TASK_SYSTEM_RESET_NAME, "Restarting the system..."); | ||
| sys_log_new_line(); | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| * | ||
| * \author Gabriel Mariano Marcelino <[email protected]> | ||
| * | ||
| * \version 0.10.7 | ||
| * \version 0.10.16 | ||
| * | ||
| * \date 2020/01/12 | ||
| * | ||
|
|
@@ -45,7 +45,7 @@ | |
| #define TASK_SYSTEM_RESET_PRIORITY 2 /**< Task priority. */ | ||
| #define TASK_SYSTEM_RESET_PERIOD_MS (1000UL*60U*60U*10U) /**< Task period in milliseconds. */ | ||
|
|
||
| #define pdMS_TO_TICKS_64( xTimeInMs ) ( ( TickType_t ) ( ( ( TickType_t ) ( xTimeInMs ) * ( TickType_t ) configTICK_RATE_HZ ) / ( TickType_t ) 1000 ) ) | ||
| #define pdMS_TO_TICKS_64( xTimeInMs ) ( ( TickType_t ) ( ( ( uint64_t ) ( xTimeInMs ) * ( uint64_t ) configTICK_RATE_HZ ) / ( TickType_t ) 1000 ) ) | ||
|
|
||
| /** | ||
| * \brief Periodic system reset handle. | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| * | ||
| * \author Gabriel Mariano Marcelino <[email protected]> | ||
| * | ||
| * \version 0.10.14 | ||
| * \version 0.10.16 | ||
| * | ||
| * \date 2019/10/25 | ||
| * | ||
|
|
@@ -36,7 +36,7 @@ | |
| #ifndef VERSION_H_ | ||
| #define VERSION_H_ | ||
|
|
||
| #define FIRMWARE_VERSION "0.10.14" | ||
| #define FIRMWARE_VERSION "0.10.16" | ||
|
|
||
| #define FIRMWARE_STATUS "Development" | ||
|
|
||
|
|
||