Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 22 insertions, 19 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 99f29d22b..24d97407e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -47,6 +47,7 @@
 #include "modules/Diagnostics/Diagnostics.h"
 #include "Modules/General/MachineStatus.h"
 
+#include "drivers/Flash_Memory/Flash_Memory.h"
 #include "drivers/Flash_Memory/fatfs/ff.h"
 #include "drivers/Flash_ram/FlashProgram.h"
 
@@ -653,24 +654,6 @@ uint32_t MillisecLowLoop(uint32_t tick)
     if (m20msecTick)
     {
         ADC0SS0Handler();
-        /*if ((WHS_Type == WHS_TYPE_NEW)&&(Shinko_Read == true))
-        {
-            if(ShinkoTempDeg.Read_Setup == 0x00)//didn't read it yet
-            {
-                WHS_Shinko_Communication(R_SETUP);
-            }
-            else*/
-            /*if(0)//TBD - need stop condition to write only once (all the steps) , Read_Setup != setup, Read_Setup != 0, Read_Setup != Prev_Read_Setup
-            {
-                // option to wrte + read setup and stop when read = write
-               WHS_Shinko_Communication(W_SETUP);
-            }
-            else*/
-            /*{
-                //finish reading the setup before start reading the value
-                WHS_Shinko_Communication(R_Value); // Reading every fourth cycle (Set HW, Request, Set HW, Response)
-            }
-        }*/
     }
     if(Fifty_msTick)
     {
@@ -756,6 +739,26 @@ uint32_t MillisecLowLoop(uint32_t tick)
             if (isMotorConfigured(Motor_i))
                 MotorGetStatusFromFPGA(Motor_i);
         }
+#ifdef USE_SHINKO_AUTO_COMM
+        if ((WHS_Type == WHS_TYPE_NEW)&&(Shinko_Read == true))
+        {
+            if(ShinkoTempDeg.Read_Setup == 0x00)//didn't read it yet
+            {
+                WHS_Shinko_Communication(R_SETUP);
+            }
+            else
+            /*if(0)//TBD - need stop condition to write only once (all the steps) , Read_Setup != setup, Read_Setup != 0, Read_Setup != Prev_Read_Setup
+            {
+                // option to wrte + read setup and stop when read = write
+               WHS_Shinko_Communication(W_SETUP);
+            }
+            else*/
+            {
+                //finish reading the setup before start reading the value
+                WHS_Shinko_Communication(R_Value); // Reading every fourth cycle (Set HW, Request, Set HW, Response)
+            }
+        }
+#endif
     }
     if ((O500Millisecond_Tick)&&(RapidPressureRead == false))
     {
@@ -843,6 +846,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         }
     #endif
 
+        Shinko_Read = true;//start cycle of R/W setup or value every 10Sec
     }
     if (OneMinute_Tick)
     {
@@ -866,7 +870,6 @@ uint32_t MillisecLowLoop(uint32_t tick)
 #ifdef CONTROL_DEBUG
         ResetControlTime();
 #endif
-        Shinko_Read = true;//start cycle of R/W setup or value every 10Sec
     }
     if (TenMinutes_Tick)
     {