diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-04-28 12:27:25 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-04-28 12:27:25 +0300 |
| commit | 064aaf993d9c38a64f75ea0abf79ced58bdb0741 (patch) | |
| tree | 9ed65b86a9660ce1b1f5609467fa98e4bc29b26b /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 806af0415d6ef60a88e6a488ff1972562cbb3842 (diff) | |
| parent | ef6dc2511590085b7aed10b0a37631ce93a3fa00 (diff) | |
| download | Tango-064aaf993d9c38a64f75ea0abf79ced58bdb0741.tar.gz Tango-064aaf993d9c38a64f75ea0abf79ced58bdb0741.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_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(); |