From 9ff852a933908935c8f83dddc2722af9f283cdbc Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 12 Aug 2020 15:08:59 +0300
Subject: Version 1.4.6.41 - urgent fix for thread loading sw crash. also FSE
 studio procedures update.

---
 Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c     | 5 +++--
 .../Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c    | 6 +++---
 Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c               | 6 ++++--
 Software/Embedded_SW/Embedded/Modules/IFS/ifs.c                     | 1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules')

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 7963a9290..c000ad85f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -856,8 +856,8 @@ void DiagnosticOneSecCollection(void)
     if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD) //rapid/pp machines
     {
         AcVoltage = ReadVAC();
-        DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
-        DiagnosticsMonitor.n_whsblower2voltage = 1;
+        //DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
+        //DiagnosticsMonitor.n_whsblower2voltage = 1;
         DiagnosticsMonitor.incomingvoltage = &AcVoltage;
         DiagnosticsMonitor.n_incomingvoltage = 1;
     }
@@ -880,6 +880,7 @@ void DiagnosticOneSecCollection(void)
         if ((GetMachineState()<MACHINE_STATE_NO_PROCESS_PARAMS) &&(GetMachineState()>=MACHINE_STATE_WAIT_FOR_COOLER))
         {
             InitCounter-=1.0;
+            if(InitCounter<0)InitCounter = 0;
             DiagnosticsMonitor.chillertemperature = &InitCounter;
 
         }
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 047293ea9..a3caadf7b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -43,6 +43,7 @@ uint32_t HomingControlId[NUM_OF_MOTORS];
 
 uint32_t Diagnostics_Dryer_UnLoading(void);
 uint32_t Diagnostics_Dryer_Loading(void);
+int kval_upper_value;
 
 /********************************************************************************
  * Motor Homing
@@ -88,11 +89,11 @@ uint32_t MotorHomingRequestCallback(uint32_t deviceID, uint32_t ReadValue)
 
     if(deviceID == HARDWARE_MOTOR_TYPE__MOTO_RLOADING)
     {
-        MotorSetKvalRun(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 24);
+        MotorSetKvalRun(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, kval_upper_value);
     }
     if(deviceID == HARDWARE_MOTOR_TYPE__MOTO_LLOADING)
     {
-        MotorSetKvalRun(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 24);
+        MotorSetKvalRun(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, kval_upper_value);
     }
     if (resetPullerDancer == true)
     {
@@ -146,7 +147,6 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer)
 
     LoadArmRounds = (int)dryerbufferlength;
 
-    int kval_upper_value;
     if (Is_PP_Machine())
         kval_upper_value = MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].kvalrun;
     else
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 3f30e755a..1d69a2925 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -1229,7 +1229,7 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId)
             Report("Unhandled brushstops remained",__FILE__,__LINE__,(int)JobBrushStopId,RpWarning,(int)PrevSegment->brushstopscount,0);
             //REPORT_MSG (Segment->brushstopscount, "Segment->brushstopscount");
             //for (Brush_i=JobBrushStopId;Brush_i<PrevSegment->brushstopscount;Brush_i++) #bug 3348 - unhandled jobstops stops too soon
-            for (Brush_i=JobBrushStopId;Brush_i<=PrevSegment->brushstopscount;Brush_i++)
+            for (Brush_i=JobBrushStopId;Brush_i<PrevSegment->brushstopscount;Brush_i++)
             {
                 if (status == ERROR)
                     break;
@@ -1241,13 +1241,15 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId)
                 }
                 else
                 {
+                    Report("Unhandled brushstops ERROR",__FILE__,__LINE__,(int)tFileBrushStop,RpWarning,(int)PrevSegment->brushstopscount,0);
                     status = ERROR;
                     break;
                 }
             }//for brushstops
         }
     }
-    return status;
+    Report("Unhandled brushstops result",__FILE__,__LINE__,(int)Brush_i,RpWarning,(int)PrevSegment->brushstopscount,0);
+    return OK;
 }
 uint32_t IDSPreSegmentState(void *SegmentDetails, int SegmentId)
 {
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index e0a2f79d5..f822c869c 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -286,6 +286,7 @@ void midTankStateMachine(void)
             }
             if (doorState != prevDoorState) {
                 prevDoorState = doorState;
+                Report("Door state change", __FILE__, __LINE__, doorState, RpMessage, prevDoorState, 0);
             }
             break;
         case MidTankStateWait:
-- 
cgit v1.3.1