From 39cf804612a97dfb848ac308a1b40bafc3780783 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Thu, 17 Dec 2020 16:22:27 +0200
Subject: some small changes

---
 .../Embedded/Common/SWUpdate/FileSystem.c            | 14 +++-----------
 .../Embedded_SW/Embedded/Common/report/reportInit.c  |  5 +++--
 .../WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c       |  2 +-
 .../Embedded/Modules/AlarmHandling/AlarmHandling.c   |  6 +++---
 .../Embedded/Modules/Heaters/Heaters_Blowers.c       | 14 ++++++++++----
 .../Embedded/Modules/Heaters/Heaters_print.c         |  2 ++
 Software/Embedded_SW/Embedded/Modules/IDS/IDS.h      |  2 ++
 .../Embedded_SW/Embedded/Modules/IDS/IDS_maint.c     | 20 ++++++++++++++++----
 .../Embedded_SW/Embedded/Modules/IDS/IDS_print.c     |  9 ++++++---
 .../Embedded/Modules/Thread/Thread_print.c           |  6 +++++-
 .../StateMachines/Initialization/InitSequence.c      | 12 +++++++-----
 .../Embedded/StateMachines/Printing/PrintingSTM.c    |  4 ++--
 12 files changed, 60 insertions(+), 36 deletions(-)

(limited to 'Software/Embedded_SW')

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index a59a14dcf..17c1f164b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -566,20 +566,12 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
     //int NumOfFiles = 0;
     FRESULT Fresult = FR_OK;
 
-    if (1)//(Semaphore_pend(FFS_Sem, BIOS_NO_WAIT))
-    {
-        Fresult = f_unlink(request->path);
-        Semaphore_post(FFS_Sem);
-    }
-    else
-    {
-        Fresult = FR_DENIED;
-        Report("Semaphore_pend failed", __FILE__, __LINE__, 4, RpWarning,   (int)0, 0);
-    }
+    Fresult = f_unlink(request->path);
+    Semaphore_post(FFS_Sem);
 
     REPORT_MSG(Fresult, "File Delete");
     responseContainer = createContainer(MESSAGE_TYPE__DeleteResponse,  requestContainer->token, false, &response, &delete_response__pack, &delete_response__get_packed_size);
-    if (Fresult!= OK)
+    if ((Fresult!= FR_OK)&&(Fresult!= FR_NO_FILE))
     {
         //usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
         responseContainer.has_error = true;
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 2850f666e..8292cdeda 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -97,7 +97,10 @@ uint32_t OpenLogFile(void)
             if (LogFileHandle->fsize < 100000)
                 f_lseek(LogFileHandle, LogFileHandle->fsize);
             else
+            {
                 f_lseek(LogFileHandle, 0);
+                f_truncate (LogFileHandle);
+            }
             len = usnprintf(RepMessage, 80, "\r\n*******\r\nLog File start %s %s",__DATE__, __TIME__);
             LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
             ReportResetReason();
@@ -142,8 +145,6 @@ uint32_t LogToFile(char *message,       /* The formatted message
 
     len = usnprintf(RepMessage, 300, "\r\nfile %s\t  line %d\t code %d\t sev %d,\tparam %d,\t %s",FileName, LineNumber,errorCode, Severity, parameter,message);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
-    if (LogFileHandle->fsize > 100000)
-        f_lseek(LogFileHandle, 0);
 
     return LogFresult;
 #endif	
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
index a3ae5bba1..854153218 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
@@ -566,7 +566,7 @@ bool waste_seq_cont()
         WasteCounter = 0;
         waste_level_ml = avg/8;
 
-        Report("------------ Avg waste level in ml  -----------------", __FILE__, WasteAverageIndex, avg, RpMessage, (int)(waste_level_ml), 0);
+        Report("------------ Avg waste level in ml  -----------------", __FILE__, WasteAverageIndex, (int)avg, RpMessage, (int)(waste_level_ml), 0);
     }
     if (FirstInSequence == false)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index db4535e06..07ebfa747 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -638,10 +638,10 @@ JobEndReasonEnum getEndReason(uint32_t AlarmId)
                 return JOB_TEMPERATURE_ALARM;
             }
         case ALARM_SOURCE_TYPE__LimitSwitchAlarm:
-            usnprintf(AlarmReasonStr, 100, "Dispenser %d empty",AlarmItem[AlarmId].DeviceId);
+            usnprintf(AlarmReasonStr, 100, "Dispenser %d empty",AlarmItem[AlarmId].DeviceId+1);
             return JOB_OUT_OF_DYE;
         case ALARM_SOURCE_TYPE__PressureAlarm:
-            usnprintf(AlarmReasonStr, 100, "Over pressure in dispenser %d",AlarmItem[AlarmId].DeviceId);
+            usnprintf(AlarmReasonStr, 100, "Over pressure in dispenser %d",AlarmItem[AlarmId].DeviceId+1);
             return JOB_PRESSURE_ALARM;
         case ALARM_SOURCE_TYPE__CurrentAlarm:
             usnprintf(AlarmReasonStr, 100, "over/under current (%d) in %d",AlarmId,AlarmItem[AlarmId].DeviceId);
@@ -653,7 +653,7 @@ JobEndReasonEnum getEndReason(uint32_t AlarmId)
             usnprintf(AlarmReasonStr, 100, "Machine door %d removed during a run",AlarmItem[AlarmId].DeviceId);
             return JOB_TAMPER_ALARM;
         case ALARM_SOURCE_TYPE__HardLimitAlarm:
-            usnprintf(AlarmReasonStr, 100, "Dispenser %d hit the hard limit",AlarmItem[AlarmId].DeviceId);
+            usnprintf(AlarmReasonStr, 100, "Dispenser %d hit the hard limit",AlarmItem[AlarmId].DeviceId+1);
             return JOB_LS_ALARM;
         case ALARM_SOURCE_TYPE__DoNotPollAlarm:
             if (AlarmItem[AlarmId].Severity == DEBUG_LOG_CATEGORY__Critical)
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 1ee5302ab..76c679d80 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -555,9 +555,15 @@ uint32_t HeadBlowersV0Init(void)
 
 void Set_Head_Blowers_Parameters(float cp,float b)
 {
-    PressureSensor_CP = cp;
-    PressureSensor_B = b;
-    Report("Head Blowers CP Coefficient", __FILE__, __LINE__, (int)(PressureSensor_CP * 1000), RpMessage, 0, 0);
-    Report("Head Blowers B Coefficient", __FILE__, __LINE__, (int)(PressureSensor_B * 1000), RpMessage, 0, 0);
+    if (cp)
+    {
+        PressureSensor_CP = cp;
+        Report("Head Blowers CP Coefficient", __FILE__, __LINE__, (int)(PressureSensor_CP * 1000), RpMessage, 0, 0);
+    }
+    if (b)
+    {
+        PressureSensor_B = b;
+        Report("Head Blowers B Coefficient", __FILE__, __LINE__, (int)(PressureSensor_B * 1000), RpMessage, 0, 0);
+    }
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index f396d78d9..db7261090 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -1012,6 +1012,8 @@ void HeaterPrepareFailureCheck(void)
         HeaterPrepareFailureCheckCounter = 0;
         return;
     }
+    if (HeaterPrepareFailureCheckCounter%60 == 0)
+        ReportWithPackageFilter(HeatersFilter,"HeaterPrepareFailureCheck",__FILE__,HeaterPrepareFailureCheckCounter,GetHeatersPrepareWaiting(),RpWarning,HeaterCheckReady(), 0);
     if ((HeaterPrepareFailureCheckCounter>=300)&&(HeaterPrepareFailureCheckCounter%60 == 0))
     {
         for (i = 0; i<HEATER_TYPE_MAX_HEATERS; i++)
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS.h b/Software/Embedded_SW/Embedded/Modules/IDS/IDS.h
index 0f8108dad..e570a27f6 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS.h
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS.h
@@ -30,6 +30,8 @@ extern uint32_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS];
 extern bool HomingActive[MAX_SYSTEM_DISPENSERS];
 extern bool PrimingActive[MAX_SYSTEM_DISPENSERS];
 
+extern  uint32_t DispenserPreSegmentControlId;
+
 extern uint32_t LeftRockerSpeed;
 extern uint32_t RightRockerSpeed;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
index 400eab33e..a1aa37c07 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
@@ -540,10 +540,22 @@ uint32_t IDS_Check_Pressure_Callback(uint32_t DispenserId, uint32_t ReadValue)
     TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[DispenserId];
     if (JobIsActive())
     {
-        if (DispenserUsedInJob[DispenserId] == true)
-        {
-            return ERROR;
-        }
+#ifndef LIGHT_COLORS
+            if ((DispenserId == CLEANER_DISPENSER)&&(DispenserPreSegmentControlId != 0xFF)) //not in presegment
+            {
+                return ERROR;
+            }
+            else if ((DispenserUsedInJob[DispenserId] == true)&&(DispenserId != CLEANER_DISPENSER))
+            {
+                return ERROR;
+            }
+
+#else
+            if (DispenserUsedInJob[DispenserId] == true)
+            {
+                return ERROR;
+            }
+#endif
     }
     if (Check_Pressure_Bypass == true)
         return OK;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index c196ea031..559ffdecc 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -966,9 +966,12 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
              }
          }
 #ifndef LIGHT_COLORS
-         TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[CLEANER_DISPENSER];
-         MotorSetSpeed((TimerMotors_t)HW_Motor_Id,INITIAL_CLEANER_SPEED ); //set the dispenser to the
-         CurrentDispenserSpeed[CLEANER_DISPENSER] = INITIAL_CLEANER_SPEED;
+         if (GetDispenserPressure(CLEANER_DISPENSER) < 0.01)
+         {
+             TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[CLEANER_DISPENSER];
+             MotorSetSpeed((TimerMotors_t)HW_Motor_Id,INITIAL_CLEANER_SPEED ); //set the dispenser to the
+             CurrentDispenserSpeed[CLEANER_DISPENSER] = INITIAL_CLEANER_SPEED;
+         }
          ReportWithPackageFilter(IDSFilter,"IDS start cleaner",__FILE__,CLEANER_DISPENSER,(int)(GetDispenserPressure(CLEANER_DISPENSER)*100),RpWarning,(int)CurrentDispenserSpeed[CLEANER_DISPENSER] ,0);
 #endif
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index c3fb17460..8b72c1a30 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -629,6 +629,10 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
 			//pooler dancer is right sided: data is opposite
             TranslatedReadValue = (-1*TranslatedReadValue);
         }
+#ifdef BTSR_ROTATED_WINDER_TFU
+        if (index == WINDER_MOTOR)
+                TranslatedReadValue = (-1*TranslatedReadValue);
+#endif
 #ifdef FOUR_WINDERS
         if (index == WINDER_MOTOR)
         {
@@ -653,7 +657,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
             TranslatedReadValue = (-1*TranslatedReadValue);
         }*/
 #endif
-        if (index == POOLER_MOTOR)
+        if (index == WINDER_MOTOR)
         {
             //pooler dancer is right sided: data is opposite
             JobCounter++;
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index d7a49dfe0..0da78dc9c 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -30,6 +30,7 @@
 #include "modules/General/process.h"
 
 #include "StateMachines/Printing/PrintingSTM.h"
+#include "StateMachines/Initialization/PowerIdle.h"
 #include "InitSequence.h"
 
 #include "drivers/I2C_Communication/DAC/Blower.h"
@@ -605,7 +606,7 @@ uint32_t InitSequenceStartHeatingCallBackFunction(uint32_t IfIndex, uint32_t Bus
 bool InitialHeating = false;
 void InitSequenceSetStartHeating(bool StartHeating)
 {
-    REPORT_MSG(StartHeating,"InitSequenceStateMachine InitialHeating set");
+    REPORT_MSG(StartHeating,"InitSequence StateMachine InitialHeating set");
     InitialHeating = StartHeating;
 }
 uint32_t InitSequenceStartHeating(void)
@@ -635,12 +636,12 @@ uint32_t InitSequenceStartHeating(void)
         {
             SetMachineState(MACHINE_STATE_NO_PROCESS_PARAMS);
 		    SetMachineStatus(MACHINE_STATE__Ready);
-	        REPORT_MSG(MachineStateDetail,"InitSequenceStateMachine no process parameters file");
+	        REPORT_MSG(MachineStateDetail,"InitSequence StateMachine no process parameters file");
         }
     }
     else
     {
-        REPORT_MSG(InitialHeating,"InitSequenceStateMachine InitialHeating is OFF");
+        REPORT_MSG(InitialHeating,"InitSequence StateMachine InitialHeating is OFF");
         SetMachineStatus(MACHINE_STATE__Ready);
         SetMachineState(MACHINE_STATE_MACHINE_READY_TO_DYE);
         InitStages++;
@@ -780,8 +781,9 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage)
         case MACHINE_STATE_BUILT_IN_TEST:
             response.state = POWER_UP_STATE__BuiltInTest;
             response.progresspercentage = 15.0;
-            response.message = "Built In Test failed";
-            Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED;
+            response.message = "Built In Test";
+            //response.message = "Built In Test failed";
+            //Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED;
             break;
         case MACHINE_STATE_INITIAL_BLOWER_ACTIVATION:
             response.state = POWER_UP_STATE__InitialBlowerActivation;
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index cb0703f27..d6262119c 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -125,7 +125,7 @@ FRESULT OpenJobFile()
         {
             readbBytes = 0;
         }
-        REPORT_MSG(bBytes,"OpenJobFile");
+        Report("OpenJobFile",__FILE__,__LINE__,(int)Fresult,RpMessage,(int)bBytes,0);
     }
     return Fresult;
 }
@@ -146,6 +146,7 @@ FRESULT RewindJobFile()
 FRESULT CloseJobFile()
 {
     Fresult = f_close(JobRequestFileHandle);
+    Report("CloseJobFile",__FILE__,__LINE__,(int)Fresult,RpMessage,(int)JobRequestFileHandle,0);
 
     readbBytes = 0;
     ImmediateRead = 0;
@@ -163,7 +164,6 @@ FRESULT CloseJobFile()
         my_free(SegmentPtr);
         SegmentPtr = NULL;
     }
-    REPORT_MSG(Fresult,"CloseJobFile");
 
     return Fresult;
 }
-- 
cgit v1.3.1


From 631fd1917ab3809b4b8d7e0066c49572f76688da Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Sun, 20 Dec 2020 08:40:14 +0200
Subject: comment removed

---
 Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Software/Embedded_SW')

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 4ced1e5fe..8b72c1a30 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -714,10 +714,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         {
             NormalizedError = (-1*NormalizedError);
         }
-/*#ifdef BTSR_ROTATED_WINDER_TFU
-        if (index == WINDER_MOTOR)
-                TranslatedReadValue = (-1*TranslatedReadValue);
-#endif*/
 
         MotorControlConfig[index].m_mesuredParam = NormalizedError;
         DancerError[DancerId] = NormalizedError;
-- 
cgit v1.3.1