diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
| commit | 111684728db118e40f05efc01287ea91ea295502 (patch) | |
| tree | 10f619288f346b713a31e3231253cd5b68bae481 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | d045a47ad7363e62b763013fa6afcdb1762a7ce3 (diff) | |
| parent | 7a914abc9e34c12acec0234ab748e17a21833af7 (diff) | |
| download | Tango-111684728db118e40f05efc01287ea91ea295502.tar.gz Tango-111684728db118e40f05efc01287ea91ea295502.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 063d7c823..f5ac6cf92 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -39,6 +39,7 @@ #include "modules/thread/thread_ex.h" #include "modules/ids/ids_ex.h" +#include "modules/Diagnostics/Diagnostics.h" #include "drivers/Flash_Memory/Flash_Memory.h" #include "drivers/Flash_Memory/fatfs/ff.h" @@ -613,6 +614,7 @@ uint32_t MillisecLowLoop(uint32_t tick) if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); }*/ + midtankDisplay = 1-midtankDisplay; } if (OneHourTick) { |