Version 14.6.36 initial: block Dyeing head move on safety. some important logs

7 files changed, 15 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 650d9be24..cc8ae5be8 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1325,6 +1325,10 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                     {
                         Status = false;
                     }
+                    else if (AlarmItem[Alarm_i].DeviceId == HARDWARE_MOTOR_TYPE__MOTO_SCREW)
+                    {
+                        Status = false;
+                    }
                     else
                     {
                         switch (AlarmItem[Alarm_i].AlarmValue)
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 1e828c74f..e9d9a4e9b 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -424,8 +424,8 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
     EmbeddedParametersInit();
 
     PrintingHWConfiguration(request);
-    if (request->n_winders == 1)
-        status += InternalWinderConfigMessage(request->winders);
+    //if (request->n_winders == 1)
+    //    status += InternalWinderConfigMessage(request->winders);
 
 
     status += MotorsInit();
@@ -494,7 +494,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
             DispenserId = request->dispensers[Dispenser_i]->index;
             Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF );   //Atm_MidTank_OFF/ON
             Valve_Set(IDS_Id_to_CartrideValve[DispenserId], Atm_MidTank_OFF );   //Atm_MidTank_OFF/ON
-            status += DispenserConfigMessage(request->dispensers[Dispenser_i]);
+            //status += DispenserConfigMessage(request->dispensers[Dispenser_i]);
             if (Check_Dispenser_Type(DispenserId) == LS_STATUS_ERROR)
             {
                 LOG_ERROR (DispenserId, "Dispenser identification failed");
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index 470bf974e..8f1de2c1c 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -17,7 +17,7 @@
 
 #define MAX_CONTROL_SAMPLES 10
 
-HardwareDispenser DispensersCfg[ MAX_SYSTEM_DISPENSERS];
+//HardwareDispenser DispensersCfg[ MAX_SYSTEM_DISPENSERS];
 
 TimerMotors_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS] = {HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_3,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_4,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_5,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_6,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_7,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_8};
 
@@ -37,7 +37,7 @@ bool isDispenserInConfig(int DispenserId)
 }
 
 
-uint32_t DispenserConfigMessage(HardwareDispenser * request)
+/*uint32_t DispenserConfigMessage(HardwareDispenser * request)
 {
     uint32_t status = PASSED;
     int Dispenser_i;
@@ -50,7 +50,7 @@ uint32_t DispenserConfigMessage(HardwareDispenser * request)
     }
     else return Dispenser_i;
 
-}
+}*/
 void IDS_ModuleInit(void)
 {
     Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index ac9bd0deb..8682d648a 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -651,7 +651,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
                                        "WFCF Dispenser %d nl/sec %d nl/pulse %d Pulse/sec %d speed %d",
                                        DispenserId,
                                        (int) Dispensers[Dispenser_i]->nanolitterpersecond,
-                                       (int) Dispensers[Dispenser_i]->nanoliterperpulse,
+                                       (int) (Dispensers[Dispenser_i]->nanoliterperpulse*100),
                                        (int) Dispensers[Dispenser_i]->pulsepersecond*1000,
                                        (int) segmentfirst_speed*1000);
                              //REPORT_MSG(segmentfirst_speed,IdsMessage);
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index bfea7b13b..6b6b85f2f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1125,7 +1125,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
     uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     free(responseContainer.data.data);
-    //writeLine("Progress Completed!");
+    progress_request__free_unpacked(request,NULL);
     SendChars((char*)container_buffer, container_size);
     //free(container_buffer);
     if (RestartNeeded == true)
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 92b953db5..420141d5b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -89,14 +89,14 @@ void SetWinderBackToBaseTime(uint32_t value)
     ReportWithPackageFilter(ThreadFilter,"Set WinderBackToBaseTime",__FILE__,__LINE__,WinderBackToBaseTime,RpWarning,KeepWindingCone, 0);
 }
 
-uint32_t InternalWinderConfigMessage(HardwareWinder* request)
+/*uint32_t InternalWinderConfigMessage(HardwareWinder* request)
 {
     uint32_t status = PASSED;
 
     InternalWinderCfg.milimetersperrotation = request->millimeterperrotation;
 
     return status;
-}
+}*/
 char ScrewStr[150];
 
 uint32_t InternalWindingConfigMessage(JobSpool* request)
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 1c52a9b68..c67619e20 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -963,7 +963,7 @@ uint32_t ThreadPrepare_Tension (int DancerId, double tension)
     }
     usnprintf(Lenstr, 100, "ThreadPrepare_Tension Dancer %d Request: %d Current %d movement %d dir %d motor %d address %d",
               DancerId,request,current,movement,direction,HW_Motor_Id,address);
-    ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,address,HARDWARE_MOTOR_TYPE__MOTO_DH_LID,RpWarning,PrepareWaitCount,0);
+    ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,address,current,RpWarning,request,0);
 
     return status;
 }