remove some warnings

21 files changed, 123 insertions, 50 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
index bf1151d6e..24f02f60c 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
@@ -24,6 +24,7 @@
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 #include "drivers/FPGA/Full_Vme/FPGA_Programming_Up.h"
 #include "drivers/FPGA/Full_Vme/ispvme/vmopcode.h"
+#include "drivers/Flash_ram/FlashProgram.h"
 #include "Common/Utilities/Utils.h"
 
 #include "Common/SWUpdate/FileSystem.h"
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c b/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
index 8d1040ea2..9a1de790e 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
@@ -202,9 +202,9 @@ uint32_t unload_max_count=0;
  void IdleTaskGetLoadTable (uint32_t *aBuffer)
  {
      int i;
-     for (i=0;i<100;i++)
-         aBuffer[i] = idle_load_table[i];
-     //memcpy (aBuffer,idle_load_table,sizeof(idle_load_table));
+     //for (i=0;i<100;i++)
+     //    aBuffer[i] = idle_load_table[i];
+     memcpy (aBuffer,idle_load_table,sizeof(idle_load_table));
  }
  uint32_t MillisecCounter = 0;
  uint32_t ControlCounter = 0;
diff --git a/Software/Embedded_SW/Embedded/Common/report/report.h b/Software/Embedded_SW/Embedded/Common/report/report.h
index 35253ce80..2d7e93ca5 100644
--- a/Software/Embedded_SW/Embedded/Common/report/report.h
+++ b/Software/Embedded_SW/Embedded/Common/report/report.h
@@ -130,6 +130,7 @@ void ReportResetReason(void);
 uint32_t OpenLogFile(void);
 uint32_t CloseLogFile(void);
 bool isReportActive(void);
+uint32_t LogToFile(char *message, char *FileName, int LineNumber,int errorCode,int Severity,int parameter);
 
 
 /***************************************************************************
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index c8a11ce10..6ed149039 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -79,9 +79,9 @@ bool isReportActive(void)
 }
 uint32_t OpenLogFile(void)
 {
-    uint32_t Bytes = 0;
-    int len;
-    /*LogFresult = f_open(LogFileHandle,LogPath,FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
+    /*int len;
+        uint32_t Bytes = 0;
+    LogFresult = f_open(LogFileHandle,LogPath,FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
     if (LogFresult == FR_OK)
     {
         if (LogFileHandle->fsize < 100000)
@@ -105,11 +105,12 @@ uint32_t LogToFile(char *message,       /* The formatted message
                        int Severity,      /* user parameter no. 1                 */
                        int parameter)
 {
-    uint32_t Bytes = 0;
-    int len;
 
         /* print user supplied error code */
-      /*  len = usnprintf(message, 300, "\r\n %s, file %s  line %d code %d sev %d,param %d",message,FileName, LineNumber,errorCode, Severity, parameter);
+      /*     uint32_t Bytes = 0;
+    int len;
+
+       len = usnprintf(message, 300, "\r\n %s, file %s  line %d code %d sev %d,param %d",message,FileName, LineNumber,errorCode, Severity, parameter);
         LogFresult = f_write(LogFileHandle,message,len,&Bytes );*/
 
         return LogFresult;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
index fc3f88057..32a0dd8e0 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
@@ -8,7 +8,7 @@
 #ifndef DRIVERS_I2C_COMMUNICATION_HEAD_CARD_HEATERS_HEAD_HEATERS_H_
 #define DRIVERS_I2C_COMMUNICATION_HEAD_CARD_HEATERS_HEAD_HEATERS_H_
 
-#warning move to heaters enum
+
 typedef enum
 {
     HEADCARD_HIT_ZN1,
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 8670a56b4..f659d965a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -74,21 +74,12 @@ void Trigger_Heater_Current_Read(void)
 {
     I2C_ReadingMessageStruc I2C_ReadingMessage;
     uint8_t Heater_i=0;
-    uint8_t Heater_Lim=0;
-    if(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)
-        Heater_Lim = NUM_OF_CURRENT_HEATERS;
-    if(Head_Type == HEAD_TYPE_SYLKO)
-        Heater_Lim = HEAD_NUM_OF_ADC;
-    if(Head_Type == HEAD_TYPE_STAPLE_SPUN)
-        Heater_Lim = HEAD_NUM_OF_ADC;
 
-   // for (Heater_i = 0;Heater_i < Heater_Lim;Heater_i++)//No need - reads all inputs at the same time
-    {
-        I2C_ReadingMessage.messageId = Heater_Current_Reading;
-        I2C_ReadingMessage.parameter = Heater_i;
-        if (I2C_ReadingMsgQ != NULL)
-            Mailbox_post(I2C_ReadingMsgQ , &I2C_ReadingMessage, BIOS_NO_WAIT);
-    }
+    I2C_ReadingMessage.messageId = Heater_Current_Reading;
+    I2C_ReadingMessage.parameter = Heater_i;
+    if (I2C_ReadingMsgQ != NULL)
+       Mailbox_post(I2C_ReadingMsgQ , &I2C_ReadingMessage, BIOS_NO_WAIT);
+
     return;
 
 }
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index 59405be76..cf54019c5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -417,7 +417,7 @@ uint32_t Valve3WayCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 uint32_t Control3WayValvesWithCallback (Valves_t _ValveId, bool direction, callback_fptr callback) //direction: MidTank_Dispenser or Dispenser_Mixer
 {
 
-    uint32_t busy = false;
+    //uint32_t busy = false;
     //Report("Control3WayValvesWithCallback ",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)direction,0);
     if (Valve3WayControlId[_ValveId] != 0xFF)
     {
@@ -432,7 +432,7 @@ uint32_t Control3WayValvesWithCallback (Valves_t _ValveId, bool direction, callb
         Report("Add control callback failed",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)Valve3WayControlId[_ValveId],0);
     //else
     //    Report("Add control callback",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)Valve3WayControlId[_ValveId],0);
-    busy = FPGA_GetDispenserValveBusyOCD(_ValveId,0);
+    /*busy = */FPGA_GetDispenserValveBusyOCD(_ValveId,0);
     //Report("Set valve id, dir, busy",__FILE__,_ValveId,(int)direction,RpWarning,(int)busy,0);
 
     EnableDisableDispenserValve(_ValveId, ENABLE);
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
index 37c2280c9..bef2b1727 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
@@ -132,7 +132,7 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b
 uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize)
 {
     volatile uint32_t ui32Idx;
-    uint32_t status;
+    //uint32_t status;
 #ifdef FLASH_DEBUG
     Address[RxIndex] = ui32FlashStart;
     Size[RxIndex] = ui32FileSize;
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index da92b6fdf..393a366ac 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -53,6 +53,7 @@
 #include "Modules/Control/MillisecTask.h"
 #include "Modules/Heaters/Heaters_ex.h"
 #include "Modules/Ids/Ids_ex.h"
+#include "Modules/AlarmHandling/AlarmHandling.h"
 
 #include "StateMachines/Printing/PrintingSTM.h"
 #include "StateMachines/Initialization/InitSequence.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 9fe67d773..03135c0d5 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -876,7 +876,6 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     {
         if (HeaterCheckReady()==false)
         {
-#warning fit to new head with new alarms
             for (Heater_i=HEATER_TYPE__DryerAirHeater;Heater_i<HEATER_TYPE_MAX_HEATERS;Heater_i++)
             {
                 LoadHeaterState((HeaterType)Heater_i,&HeaterState);
@@ -925,7 +924,7 @@ uint32_t AlarmHandling_ControlTrigger(uint32_t IfIndex, uint32_t ReadValue)
     AlarmHandlingMessageStruc Message;
 
     if (AlarmHandlingActive == false)
-        return;
+        return OK;
     //send message to the Millisec task
     Message.messageId = AlarmHandlingTrigger;
     Message.msglen = sizeof(AlarmHandlingMessageStruc);
@@ -955,7 +954,7 @@ void AlarmHandlingInternalSetAlarm(uint32_t AlarmId, bool value)
 {
     int Alarm_i;
     if (AlarmItem == NULL)
-        return ERROR;
+        return;
     for (Alarm_i = 0;Alarm_i < NumOfSystemAlarms;Alarm_i++)
     {
         if (AlarmItem[Alarm_i].EventType == AlarmId)
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h
index be7687f28..29be2bd23 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h
@@ -13,6 +13,8 @@
 uint32_t AlarmHandlingFlashLoad(void);
 uint32_t AlarmHandlingLoadFile(void);
 
+void AlarmHandlingInit(void);
+
 
 uint32_t AlarmHandling_ControlTrigger(uint32_t IfIndex, uint32_t ReadValue);
 //uint32_t AlarmHandling_CalculateTemperatures(uint32_t SensorId, uint32_t Data);
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 6542af287..a6c1d42f7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -227,11 +227,6 @@ void OneMilliSecondMillisecInterrupt(UArg arg0)
     return ;
 }
 uint32_t PT100Activity = 0;
-int32_t MillisecReadFromI2CTempSensor(uint32_t TempSensorId,  MSecFptr Callback)
-{
-#warning call I2C temeratures
-    return OK;
-}
 
 int32_t MillisecReadFromTempSensor(uint32_t TempSensorId,  MSecFptr Callback)
 {
@@ -744,8 +739,9 @@ uint32_t MillisecLowLoop(uint32_t tick)
         midtankDisplay = 1-midtankDisplay;
         Gas_PPM_Info = Calculate_Gas_Power_Consumption();
         //Trigger_WHS_MAX11614_Read_allADC();
+#ifdef CONTROL_DEBUG
         ResetControlTime();
-
+#endif
     }
     if (OneHourTick)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index bb3149b43..5adf6f83d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -560,10 +560,12 @@ uint32_t ControlLoop(uint32_t tick)
     return OK;
 }
 uint32_t prevtick = 0;
+#ifdef CONTROL_DEBUG
 void ResetControlTime(void)
 {
     memset(ControlTime,0,sizeof(ControlTime));
 }
+#endif
 uint32_t ControlLowLoop(uint32_t tick)
 {
     uint32_t skipped_ticks = 0;
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
index 598675f8c..9bb62d2ec 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
@@ -31,8 +31,8 @@
 #include "drivers/Valves/Valve.h"
 #include "drivers/Heater/Heater.h"
 #include "modules/waste/waste.h"
-#include <Drivers/I2C_Communication/I2C_Task.h>
-
+#include "Drivers/I2C_Communication/I2C_Task.h"
+#include "Drivers/I2C_Communication/I2C.h"
 #include "modules/ids/ids_ex.h"
 
 /********************************************************************************
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 35065cc2a..ec7650f3d 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -40,6 +40,7 @@
 #include "drivers/I2C_Communication/DAC/Blower.h"
 #include "drivers/Valves/Valve.h"
 #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
+#include "Drivers/I2C_Communication/I2C.h"
 #include "drivers/Flash_ram/MCU_E2Prom.h"
 
 #include "StateMachines/Printing/PrintingSTM.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
index 05425cc45..b1d870919 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
@@ -17,6 +17,7 @@ extern int     DCTimeSliceAllocation[HEATER_TYPE_MAX_HEATERS];
 extern int      NumberOFSlicesInUse;
 extern uint32_t MillisecondsPerChange;
 
+void initializeArrays(void);
 
 typedef struct  HeaterPIDControlConfigstruc
 {
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
index 237722779..0f6cb5124 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
@@ -68,6 +68,7 @@ uint32_t Heaters_Init(void)
     memset(HeaterControl,0,sizeof(HeaterControl));
     for (i = 0;i<HEATER_TYPE_MAX_HEATERS; i++)
         DeActivateHeater(i);
+    initializeArrays();
 
     BlowerCfg.enabled = true;
     BlowerCfg.voltage = 3000;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 2de6b0641..2ee7a3d2a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -93,17 +93,95 @@ uint32_t    DisasterControlId = 0xFF;
 #define MINIMUM_HEATER_READ 9.0
 #define MAXIMUM_HEATER_READ 283
 
-#ifdef Use_Head_Card
 uint32_t HeaterId2PT100Id[HEATER_TYPE_MAX_HEATERS] = {DRYER_AIR_PT100,DRYER_MAIN_PT100,DRYER_SECONDARY_PT100,HEAD_PT100_ZONE_1_0X80_0, HEAD_PT100_ZONE_2_0X80_1, HEAD_PT100_ZONE_3_0X82_0,
                                                       HEAD_PT100_ZONE_4_0X82_1, HEAD_PT100_ZONE_5_0X84_0, HEAD_PT100_ZONE_6_0X84_1,HEAD_PT100_MIXER_0X8E_0, HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_8_0X86_1,
                                                       HEAD_PT100_ZONE_9_0X88_0, HEAD_PT100_ZONE_10_0X88_1, HEAD_PT100_ZONE_11_0X8A_0, HEAD_PT100_ZONE_12_0X8A_1,HEAD_PT100_AIR_HEATER_2_0X8C_1,HEAD_PT100_AIR_HEATER_1_0X8C_0 };
 HEATERS_CURRENT HeaterId2CurrentId[HEATER_TYPE_MAX_HEATERS] = {NUM_OF_CURRENT_HEATERS,HEATER_DRYER_CURRENT_1,HEATER_DRYER_CURRENT_2,HEAD_CURRENT_ZONE_1, HEAD_CURRENT_ZONE_2,
                                                                HEAD_CURRENT_ZONE_3, HEAD_CURRENT_ZONE_4, HEAD_CURRENT_ZONE_5, HEAD_CURRENT_ZONE_6, HEAD_CURRENT_MIXER, HEAD_CURRENT_ZONE_7,
                                                                HEAD_CURRENT_ZONE_8, HEAD_CURRENT_ZONE_9, HEAD_CURRENT_ZONE_10, HEAD_CURRENT_ZONE_11, HEAD_CURRENT_ZONE_12,HEAD_CURRENT_HTIN_1,HEAD_CURRENT_HTOT_1};
-#else
-uint32_t HeaterId2PT100Id[HEATER_TYPE_MAX_HEATERS] = {DRYER_AIR_PT100,DRYER_MAIN_PT100,DRYER_SECONDARY_PT100,TEMP_SENSE_ANALOG_DYEINGH_TEMP1,TEMP_SENSE_ANALOG_DYEINGH_TEMP2,TEMP_SENSE_ANALOG_DYEINGH_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP4,TEMP_SENSE_ANALOG_DYEINGH_TEMP5,HEAD6_PT100,MIXER_PT100,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-HEATERS_CURRENT HeaterId2CurrentId[HEATER_TYPE_MAX_HEATERS] = {NUM_OF_CURRENT_HEATERS,HEATER_DRYER_CURRENT_1,HEATER_DRYER_CURRENT_2,HEATER_HEAD_CURRENT_ZONE_1,HEATER_HEAD_CURRENT_ZONE_2,HEATER_HEAD_CURRENT_ZONE_3,HEATER_HEAD_CURRENT_ZONE_4,HEATER_HEAD_CURRENT_ZONE_5_6,HEATER_HEAD_CURRENT_ZONE_5_6,HEATER_MIXCHIP_CURRENT};
-#endif
+void initializeArrays(void)
+{
+    int i;
+    for (i=0;i<HEATER_TYPE_MAX_HEATERS;i++)
+    {
+        HeaterId2PT100Id[i] = 0xFF;
+        HeaterId2CurrentId[i] = NUM_OF_CURRENT_HEATERS;
+    }
+    if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+    {
+        HeaterId2PT100Id[HEATER_TYPE__DryerAirHeater] =       DRYER_AIR_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__DryerMainHeater] =      DRYER_MAIN_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__DryerSecondaryHeater] = DRYER_SECONDARY_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone1] =          HEAD_PT100_ZONE_1_0X80_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone2] =          HEAD_PT100_ZONE_2_0X80_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone3] =          HEAD_PT100_ZONE_3_0X82_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone4] =          HEAD_PT100_ZONE_4_0X82_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone5] =          HEAD_PT100_ZONE_5_0X84_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone6] =          HEAD_PT100_ZONE_6_0X84_1;
+        HeaterId2PT100Id[HEATER_TYPE__MixerHeater] =          HEAD_PT100_MIXER_0X8E_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone7] =          HEAD_PT100_ZONE_7_0X86_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone8] =          HEAD_PT100_ZONE_8_0X86_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone9] =          HEAD_PT100_ZONE_9_0X88_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone10] =         HEAD_PT100_ZONE_10_0X88_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone11] =         HEAD_PT100_ZONE_11_0X8A_0;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone12] =         HEAD_PT100_ZONE_12_0X8A_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeadCoverHeater1] =     HEAD_PT100_AIR_HEATER_2_0X8C_1;
+        HeaterId2PT100Id[HEATER_TYPE__HeadCoverHeater2] =     HEAD_PT100_AIR_HEATER_1_0X8C_0 ;
+
+        HeaterId2CurrentId[HEATER_TYPE__DryerAirHeater] =       NUM_OF_CURRENT_HEATERS;
+        HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater] =      HEATER_DRYER_CURRENT_1;
+        HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater] = HEATER_DRYER_CURRENT_2;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone1] =          HEAD_CURRENT_ZONE_1;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone2] =          HEAD_CURRENT_ZONE_2;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone3] =          HEAD_CURRENT_ZONE_3;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone4] =          HEAD_CURRENT_ZONE_4;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone5] =          HEAD_CURRENT_ZONE_5;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone6] =          HEAD_CURRENT_ZONE_6;
+        HeaterId2CurrentId[HEATER_TYPE__MixerHeater] =          HEAD_CURRENT_MIXER;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone7] =          HEAD_CURRENT_ZONE_7;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone8] =          HEAD_CURRENT_ZONE_8;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone9] =          HEAD_CURRENT_ZONE_9;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone10] =         HEAD_CURRENT_ZONE_10;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone11] =         HEAD_CURRENT_ZONE_11;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone12] =         HEAD_CURRENT_ZONE_12;
+        HeaterId2CurrentId[HEATER_TYPE__HeadCoverHeater1] =     HEAD_CURRENT_HTIN_1;
+        HeaterId2CurrentId[HEATER_TYPE__HeadCoverHeater2] =     HEAD_CURRENT_HTOT_1;
+
+    }
+    else
+    {
+        HeaterId2PT100Id[HEATER_TYPE__DryerAirHeater] =       DRYER_AIR_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__DryerMainHeater] =      DRYER_MAIN_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__DryerSecondaryHeater] = DRYER_SECONDARY_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone1] =          TEMP_SENSE_ANALOG_DYEINGH_TEMP1;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone2] =          TEMP_SENSE_ANALOG_DYEINGH_TEMP2;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone3] =          TEMP_SENSE_ANALOG_DYEINGH_TEMP3;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone4] =          TEMP_SENSE_ANALOG_DYEINGH_TEMP4;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone5] =          TEMP_SENSE_ANALOG_DYEINGH_TEMP5;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone6] =          HEAD6_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__MixerHeater] =          MIXER_PT100;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone7] =          0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone8] =          0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone9] =          0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone10] =         0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone11] =         0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeaterZone12] =         0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeadCoverHeater1] =     0xFF;
+        HeaterId2PT100Id[HEATER_TYPE__HeadCoverHeater2] =     0xFF;
+
+        HeaterId2CurrentId[HEATER_TYPE__DryerAirHeater] =       NUM_OF_CURRENT_HEATERS;
+        HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater] =      HEATER_DRYER_CURRENT_1;
+        HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater] = HEATER_DRYER_CURRENT_2;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone1] =          HEATER_HEAD_CURRENT_ZONE_1;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone2] =          HEATER_HEAD_CURRENT_ZONE_2;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone3] =          HEATER_HEAD_CURRENT_ZONE_3;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone4] =          HEATER_HEAD_CURRENT_ZONE_4;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone5] =          HEATER_HEAD_CURRENT_ZONE_5_6;
+        HeaterId2CurrentId[HEATER_TYPE__HeaterZone6] =          HEATER_HEAD_CURRENT_ZONE_5_6;
+        HeaterId2CurrentId[HEATER_TYPE__MixerHeater] =          HEATER_MIXCHIP_CURRENT;
+
+    }
+}
 uint32_t    DryerInternalPT100Id = DRYER_AIR_PT100;
 bool HeatersRestart = false;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
index 2091b3bc5..765e183cb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
@@ -46,7 +46,7 @@ void Stub_RealTimeUsageRequest(MessageContainer* requestContainer)
     StubRealTimeUsageResponse response =   STUB_REAL_TIME_USAGE_RESPONSE__INIT;
 
 
-    response.n_percentile = 100;
+    response.n_percentile = 101;
     response.percentile = my_malloc(sizeof(response.percentile)*response.n_percentile);
     if (response.percentile)
         IdleTaskGetLoadTable(response.percentile);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 5dc354785..2a83f8425 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -31,7 +31,7 @@
 #include "drivers/SSI_Comm/Dancer/Dancer.h"
 #include "drivers/motors/motor.h"
 #include "drivers/Flash_ram/MCU_E2Prom.h"
-
+#include "Drivers/I2C_Communication/I2C.h"
 #include "PMR/Stubs/StubHeatingTestRequest.pb-c.h"
 #include "PMR/Stubs/StubHeatingTestResponse.pb-c.h"
 #include "PMR/Stubs/StubHeatingTestPollRequest.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 59b5642fb..fd53d6da2 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -910,7 +910,7 @@ uint32_t ThreadInitialTestStub(HardwareMotor * request)
 
 void SetOriginMotorSpeed(float process_speed)
 {
-    int i,Motor_i, HW_Motor_Id;
+    int Motor_i, HW_Motor_Id;
     for (Motor_i = 0; Motor_i <= WINDER_MOTOR; Motor_i++)
     {
         HW_Motor_Id = ThreadMotorIdToMotorId[Motor_i];
@@ -1108,7 +1108,7 @@ char Endstr[150];
 {
      int Motor_i;
      ThreadControlActive = false;
-     uint32_t status = OK,tempCtl;
+     uint32_t status = OK;
      usnprintf(Endstr, 100, "Total _processed length: Feeder: %d Pooler %d",(int)TotalProcessedLength,(int)PoolerTotalProcessedLength);
      SendJobProgress(0.0,0,false, Endstr);
      ReportWithPackageFilter(ThreadFilter,Endstr,__FILE__,__LINE__,(int)TotalProcessedLength,RpWarning,(int)PoolerTotalProcessedLength,0);
@@ -1122,7 +1122,7 @@ char Endstr[150];
      if (SpeedControlId != 0xFF)
      {
          if(RemoveControlCallback(SpeedControlId,ThreadLengthCBFunction)!=OK)
-             ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)Motor_i,RpError,(int)SpeedControlId,0);
+             ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)ThreadLengthCBFunction,RpError,(int)SpeedControlId,0);
          SpeedControlId = 0xFF;
      }
      if (PoolerSpeedControlId != 0xFF)
@@ -1134,7 +1134,6 @@ char Endstr[150];
 
      for ( Motor_i = 0;Motor_i <= WINDER_MOTOR;Motor_i++)
      {
-         tempCtl = ControlIdtoMotorId[Motor_i];
          if (ControlIdtoMotorId[Motor_i] != 0xFF)
          {
              status = RemoveControlCallback(ControlIdtoMotorId[Motor_i],ThreadControlCBFunction);
@@ -1143,7 +1142,6 @@ char Endstr[150];
              else
                  ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)Motor_i,RpError,(int)ControlIdtoMotorId[Motor_i],0);
          }
-         //ReportWithPackageFilter(ThreadFilter,"Remove Control",__FILE__,Motor_i,(int)status,RpError,(int)tempCtl,0);
 
      }
 	 Task_sleep(100);