updating : special dispensers handling (for Moti), new process parameters, bugs and features. merged with Shai

3 files changed, 12 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
index 5630e8b5f..9062c79ca 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
@@ -65,7 +65,8 @@ HardwarePidControlType HeaterIdtoHeaterpid[HEATER_TYPE_MAX_HEATERS ]=
 { HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature,HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain,HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary,HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1,HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ2,
   HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3,HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ4,HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ5,HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ6,HARDWARE_PID_CONTROL_TYPE__MixerHeater,
   HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ7, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ8, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ9,
-  HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ10, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ11, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ12};
+  HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ10, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ11, HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ12,
+  HARDWARE_PID_CONTROL_TYPE__HeadCoverHeater1,HARDWARE_PID_CONTROL_TYPE__HeadCoverHeater2};
 HeaterType HeaterTypetoHeadHeater[HEATER_TYPE_MAX_HEATERS] = {HEATER_TYPE_MAX_HEATERS,HEATER_TYPE_MAX_HEATERS,HEATER_TYPE_MAX_HEATERS,HEADCARD_HIT_ZN1,HEADCARD_HIT_ZN2,HEADCARD_HIT_ZN3,HEADCARD_HIT_ZN4,HEADCARD_HIT_ZN5,HEADCARD_HIT_ZN6,
     HEADCARD_HIT_MIXER,HEADCARD_HIT_ZN7,HEADCARD_HIT_ZN8,HEADCARD_HIT_ZN9,HEADCARD_HIT_ZN10,HEADCARD_HIT_ZN11,HEADCARD_HIT_ZN12,HEADCARD_UPPER_HIT_IN1,HEADCARD_UPPER_HIT_OUT1};
 HEADCARD_HEATERS_ENUM HeadHeatertoHeaterType[HEADCARD_HIT_MIXER+1] = {HEATER_TYPE__HeaterZone1,HEATER_TYPE__HeaterZone2,HEATER_TYPE__HeaterZone3,HEATER_TYPE__HeaterZone4,HEATER_TYPE__HeaterZone5,HEATER_TYPE__HeaterZone6,
@@ -94,6 +95,8 @@ bool isHeater(HardwarePidControlType HeaterId)
       case HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ10:
       case HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ11:
       case HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ12:
+      case HARDWARE_PID_CONTROL_TYPE__HeadCoverHeater1:
+      case HARDWARE_PID_CONTROL_TYPE__HeadCoverHeater2:
         return true;
     default:
         return false;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
index 57b64fdfa..6152d32ac 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
@@ -114,9 +114,11 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat
         {
             Arb_Loss_Count= 0;
             Init_All_I2C();
-            Report("Reinitializing I2C master", __FILE__,__LINE__,status, RpMessage,Task_self(), 0);
+            Report("Reinitializing I2C master", __FILE__,Arb_Loss_Count,status, RpMessage,Task_self(), 0);
         }
     }
+    else
+        Arb_Loss_Count = 0;
     return status;
 }
 
@@ -188,9 +190,11 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data
         {
             Arb_Loss_Count= 0;
             Init_All_I2C();
-            Report("Reinitializing I2C master", __FILE__,__LINE__,status, RpMessage,Task_self(), 0);
+            Report("Reinitializing I2C master", __FILE__,Arb_Loss_Count,status, RpMessage,Task_self(), 0);
         }
     }
+    else
+        Arb_Loss_Count = 0;
     return status;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
index 81858a574..d29ccefca 100644
--- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
+++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
@@ -655,13 +655,13 @@ void handleRx(void)
                 buffId = initArray( expected_message_size);
                 if (buffId == 0xFF)
                 {
-                    LOG_ERROR(expected_message_size,"usb message length error");
+                    //LOG_ERROR(expected_message_size,"usb message length error");
+                    Report("usb message length error", __FILE__, __LINE__, expected_message_size, RpWarning,   (int)buffId, 0);
                     keep_expected_message_size = expected_message_size;
                     expected_message_size = 0;
                     size_bar = 0;
                     FileChunkUploadError();
                 }
-                //Report("usb message length", __FILE__, __LINE__, expected_message_size, RpWarning,   (int)buffId, 0);
             }
         }
     }