aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-09-01 15:08:58 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-09-01 15:08:58 +0300
commitf8588504c5953ff39b36c113c7443c4dedbd4d1e (patch)
tree9cd5d3b11a3eea40194220c3c58342a1a6391ca8 /Software/Embedded_SW/Embedded/Modules/Control
parent792398dba924c634e7a2a7c258f34466988a5f1e (diff)
downloadTango-f8588504c5953ff39b36c113c7443c4dedbd4d1e.tar.gz
Tango-f8588504c5953ff39b36c113c7443c4dedbd4d1e.zip
shinko reading and display changes
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c5
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h2
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;