From 2cbc3deb559323ac366e84b3e0ba40d27447347e Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Sun, 2 Dec 2018 14:24:44 +0200
Subject: 1.1.5.1 Thread jogging, thread PID preparation,

---
 Software/Embedded_SW/Embedded/Modules/General/process.c     | 4 ++--
 Software/Embedded_SW/Embedded/Modules/General/process.h     | 2 +-
 Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c       | 3 +--
 Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 1ab1365d0..96248ab8b 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -28,7 +28,7 @@ int32_t tableindex = 0;
 
 #define MAX_ALLOWED_TEMPERATURE 280
 
-ProcessParameters* ProcessParametersKeep;
+ProcessParameters ProcessParametersKeep;
 
 uint32_t HandleProcessParameters(ProcessParameters* ProcessParams)
 {
@@ -47,7 +47,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams)
         return status;
     if (ProcessParams)
     {
-        ProcessParametersKeep = ProcessParams;
+        memcpy (&ProcessParametersKeep,ProcessParams,sizeof(ProcessParameters));
     }
     if (ProcessParams->mixertemp)
         status |= HeaterCommandRequestMessage(
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.h b/Software/Embedded_SW/Embedded/Modules/General/process.h
index 520b5e626..12f1f8461 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.h
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.h
@@ -19,7 +19,7 @@ extern double headairflow;
 extern double dryerairflow;
 extern int32_t tableindex;
 
-extern ProcessParameters* ProcessParametersKeep;
+extern ProcessParameters ProcessParametersKeep;
 
 extern void ProcessRequestFunc(MessageContainer* requestContainer);
 extern uint32_t HandleProcessParameters(ProcessParameters* ProcessParams);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 2af2f63c0..958f481bf 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -379,8 +379,7 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId)
      int Dispenser_i;
      TimerMotors_t HW_Motor_Id;
 
-     Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste);
-
+     Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste);  //#bug 323
          for (Dispenser_i = 0;Dispenser_i < MAX_SYSTEM_DISPENSERS;Dispenser_i++)
          {
              HW_Motor_Id = DispenserIdToMotorId[Dispenser_i];
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 15ea5157b..6db7f616e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -458,7 +458,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         NormalizedError = avreageSampleValue*NormalizedErrorCoEfficient[index];
         MotorControlConfig[index].m_mesuredParam = NormalizedError;
         DancerError[DancerId] = NormalizedError;
-        MotorControlConfig[index].m_calculatedError = AdvancedPIDAlgorithmCalculation((float)MotorControlConfig[index].m_SetParam , (float)MotorControlConfig[index].m_mesuredParam,
+        MotorControlConfig[index].m_calculatedError = /*Advanced*/PIDAlgorithmCalculation((float)MotorControlConfig[index].m_SetParam , (float)MotorControlConfig[index].m_mesuredParam,
                                                                               &MotorControlConfig[index].m_params,   &MotorControlConfig[index].m_preError, &MotorControlConfig[index].m_integral);
         if (index != FEEDER_MOTOR) //feeder unit handles errors opposite to left unit
         {
-- 
cgit v1.3.1