diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:37 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:37 +0200 |
| commit | ef6dc2511590085b7aed10b0a37631ce93a3fa00 (patch) | |
| tree | b1683631405a870b194a4659bd56f8a39ce8bce7 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 737ff8b9f3cb72220bce50a44013a5aedd58efd1 (diff) | |
| parent | cacee21679368330dfbdbeb973fe9cec9e0aae8e (diff) | |
| download | Tango-ef6dc2511590085b7aed10b0a37631ce93a3fa00.tar.gz Tango-ef6dc2511590085b7aed10b0a37631ce93a3fa00.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index d31ea3c05..ab605bccb 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -767,8 +767,8 @@ uint32_t MillisecLowLoop(uint32_t tick) MotorGetStatusFromFPGA(Motor_i); }*/ midtankDisplay = 1-midtankDisplay; - if (WHS_Type == WHS_TYPE_UNKNOWN) - Gas_PPM_Info = Calculate_Gas_Power_Consumption(); + /*if (WHS_Type == WHS_TYPE_UNKNOWN) + Gas_PPM_Info = Calculate_Gas_Power_Consumption();*/ //Trigger_WHS_MAX11614_Read_allADC(); #ifdef CONTROL_DEBUG ResetControlTime(); |