diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-09-01 15:45:43 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-09-01 15:45:43 +0300 |
| commit | ec6c0c9a6af3d65956e6974e515c35aeee5045cc (patch) | |
| tree | 3db65989596a8b88ffa63713b1390beee8bf0b9b /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | d20e512124158edf23d97d17ddb66881e73baabf (diff) | |
| parent | f8588504c5953ff39b36c113c7443c4dedbd4d1e (diff) | |
| download | Tango-ec6c0c9a6af3d65956e6974e515c35aeee5045cc.tar.gz Tango-ec6c0c9a6af3d65956e6974e515c35aeee5045cc.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 | 5 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 8117c4d81..c2b4f5298 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -593,7 +593,7 @@ void setRapidPressureRead(bool value) if (GetDiagnosticMode() == Diagnostic_Extreme_Mode) RapidPressureRead = true; } - +bool Shinko_Read = true; uint16_t PumpCounter = 0; uint16_t realtimetest[101]; uint32_t MillisecLowLoop(uint32_t tick) @@ -720,7 +720,7 @@ uint32_t MillisecLowLoop(uint32_t tick) if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); } - if (WHS_Type == WHS_TYPE_NEW) + if ((WHS_Type == WHS_TYPE_NEW)&&(Shinko_Read == true)) { if(ShinkoTempDeg.Read_Setup == 0x00)//didn't read it yet { @@ -838,6 +838,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { waste_seq_step1();// include 1Sec delay <- to open !!!! }*/ + Shinko_Read = true; } if (OneHourTick) { diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index 226d0d57a..f7351d0b1 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -50,7 +50,7 @@ void MillisecLogClose(void); #endif - +extern bool Shinko_Read; extern bool watchdogCriticalAlarm; extern Task_Handle Millisecond_Task_Handle; |