shinko reading and display changes

5 files changed, 10 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.c
index 365275b2d..1d7d180f7 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.c
@@ -23,6 +23,7 @@
 #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
 #include "drivers/Uart_Comm/WHS_Controller_Comm/Shinko/ACS-13AC5E3.h"
 #include "drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h"
+#include "Modules/Control/MillisecTask.h"
 #include <DataDef.h>
 
 //uint8_t Uart3_Tx_Buff[100];
@@ -342,9 +343,11 @@ uint8_t WHS_Shinko_Communication(SHINKO_RW_OPTIONS_ENUM RWOption) //reading ever
                 }
 
                 Shinko_Comm_Stage = Stage_0;
+                Shinko_Read = false;
             break;
         default:
                 Shinko_Comm_Stage = Stage_0;
+                Shinko_Read = false;
             break;
     }
 
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;
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 30ff55f36..9977c5305 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -418,7 +418,7 @@ void LoadChillerState(HeaterType HeaterType,HeaterState *HeaterState)
     HeaterState->has_heatertype = true;
     HeaterState->heatertype = HeaterType;
     HeaterState->has_setpoint = true;
-    HeaterState->setpoint = Shinko_Sv;
+    HeaterState->setpoint = ShinkoTempDeg.Read_Setup;
     HeaterState->has_currentvalue = true;
     HeaterState->currentvalue = ShinkoTempDeg.Read_value;//Shinko_Temperature;//MillisecGetTemperatures(HeaterId2PT100Id[HeaterId])/100;
     return;
@@ -1276,7 +1276,7 @@ void SendDiagnostics(void)
         LoadHeaterState(HEATER_TYPE__HeaterZone11,&HeaterInfo[i++]);
         LoadHeaterState(HEATER_TYPE__HeaterZone12,&HeaterInfo[i++]);
     }
-    if ((Head_Type == HEAD_TYPE_FLAT)||(Head_Type == HEAD_TYPE_ARC))
+    if (Head_Type == HEAD_TYPE_ARC)
     //if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
     {
         LoadHeaterState(HEATER_TYPE__HeadCoverHeater1,&HeaterInfo[i++]);
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index da2e416b8..e16909c45 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -963,7 +963,7 @@ void JobRequestFunc(MessageContainer* requestContainer)
                 Report("Job Request ",__FILE__,__LINE__,Ticket->processparameters->dyeingspeed,RpWarning,n_segments, Ticket->intersegmentlength);
                 memcpy(&Configured,&JobConfigured,sizeof(JobConfigured));
                 if (Ticket->threadparameters)
-                    memcpy(&SavedThreadParameters,&Ticket->threadparameters,sizeof(SavedThreadParameters));
+                    memcpy(&SavedThreadParameters,Ticket->threadparameters,sizeof(SavedThreadParameters));
                 else
                     Report("Job Request empty thread parameters ",__FILE__,__LINE__,Ticket->processparameters->dyeingspeed,RpWarning,n_segments, Ticket->intersegmentlength);
                 StartJob(CurrentJob);