pressure handling in inactive dispensers

7 files changed, 340 insertions, 305 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 5c5865811..5675c5607 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -133,7 +133,6 @@ void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer)
     MessageContainer responseContainer;
     uint8_t* container_buffer;
     uint32_t status = 0;
-    int Dist_i;
 
     SetupDebugDisributorsRequest* request = setup_debug_disributors_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
     SetupDebugDisributorsResponse response = SETUP_DEBUG_DISRIBUTORS_RESPONSE__INIT;
@@ -141,27 +140,15 @@ void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer)
     responseContainer = createContainer(MESSAGE_TYPE__SetupDebugDisributorsResponse, requestContainer->token, true, &response, &setup_debug_disributors_response__pack, &setup_debug_disributors_response__get_packed_size);
     container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
 
-    if (request->n_distributoractive == (DEBUG_DISTRIBUTOR__MaintFilter+1))
+
+    if (request->has_debugdistributor == true )
     {
-        status|=ReportSwitchPackageFilter(ControlFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__ControlFilter    ]);
-        status|=ReportSwitchPackageFilter(HeatersFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__HeatersFilter    ]);
-        status|=ReportSwitchPackageFilter(JobFilter     , request->distributoractive[DEBUG_DISTRIBUTOR__JobFilter        ]);
-        status|=ReportSwitchPackageFilter(WasteFilter     , request->distributoractive[DEBUG_DISTRIBUTOR__WasteFilter      ]);
-        status|=ReportSwitchPackageFilter(AlarmFilter     , request->distributoractive[DEBUG_DISTRIBUTOR__AlarmFilter      ]);
-        status|=ReportSwitchPackageFilter(DiagnosticsFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__DiagnosticsFilter]);
-        status|=ReportSwitchPackageFilter(IDSFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__IDSFilter        ]);
-        status|=ReportSwitchPackageFilter(ThreadFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__ThreadFilter ]);
-        status|=ReportSwitchPackageFilter(GeneralFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__GeneralFilter]);
-        status|=ReportSwitchPackageFilter(CommFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__CommFilter ]);
-        status|=ReportSwitchPackageFilter(FPGAFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__FPGAFilter ]);
-        status|=ReportSwitchPackageFilter(LoadFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__LoadFilter ]);
-        status|=ReportSwitchPackageFilter(InitFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__InitFilter ]);
-        status|=ReportSwitchPackageFilter(MaintFilter   , request->distributoractive[DEBUG_DISTRIBUTOR__MaintFilter]);
+        status|=ReportSwitchPackageFilter(request->debugdistributor   , request->distributoractive);
     }
     else
     {
         status = ERROR_CODE__INVALID_PARAMETER;
-        ReportWithPackageFilter(GeneralFilter,"not all filters defined in SetupDebugDisributorsRequest",__FILE__,__LINE__,request->n_distributoractive,RpWarning,0,  0);
+        ReportWithPackageFilter(GeneralFilter,"SetupDebugDisributorsRequest error",__FILE__,__LINE__,request->has_debugdistributor,RpWarning,0,  0);
     }
     if (status)
     {
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c
index ebdad2054..e4e1c7ae1 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c
@@ -52,14 +52,26 @@ void   setup_debug_disributors_request__free_unpacked
   assert(message->base.descriptor == &setup_debug_disributors_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor setup_debug_disributors_request__field_descriptors[1] =
+static const ProtobufCFieldDescriptor setup_debug_disributors_request__field_descriptors[2] =
 {
   {
-    "DistributorActive",
+    "DebugDistributor",
     1,
-    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(SetupDebugDisributorsRequest, has_debugdistributor),
+    offsetof(SetupDebugDisributorsRequest, debugdistributor),
+    &debug_distributor_type__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "DistributorActive",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(SetupDebugDisributorsRequest, n_distributoractive),
+    offsetof(SetupDebugDisributorsRequest, has_distributoractive),
     offsetof(SetupDebugDisributorsRequest, distributoractive),
     NULL,
     NULL,
@@ -68,12 +80,13 @@ static const ProtobufCFieldDescriptor setup_debug_disributors_request__field_des
   },
 };
 static const unsigned setup_debug_disributors_request__field_indices_by_name[] = {
-  0,   /* field[0] = DistributorActive */
+  0,   /* field[0] = DebugDistributor */
+  1,   /* field[1] = DistributorActive */
 };
 static const ProtobufCIntRange setup_debug_disributors_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 1 }
+  { 0, 2 }
 };
 const ProtobufCMessageDescriptor setup_debug_disributors_request__descriptor =
 {
@@ -83,7 +96,7 @@ const ProtobufCMessageDescriptor setup_debug_disributors_request__descriptor =
   "SetupDebugDisributorsRequest",
   "",
   sizeof(SetupDebugDisributorsRequest),
-  1,
+  2,
   setup_debug_disributors_request__field_descriptors,
   setup_debug_disributors_request__field_indices_by_name,
   1,  setup_debug_disributors_request__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h
index 65a5091ac..053609d76 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h
@@ -14,6 +14,7 @@ PROTOBUF_C__BEGIN_DECLS
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
+#include "DebugDistributorType.pb-c.h"
 
 typedef struct _SetupDebugDisributorsRequest SetupDebugDisributorsRequest;
 
@@ -26,12 +27,14 @@ typedef struct _SetupDebugDisributorsRequest SetupDebugDisributorsRequest;
 struct  _SetupDebugDisributorsRequest
 {
   ProtobufCMessage base;
-  size_t n_distributoractive;
-  protobuf_c_boolean *distributoractive;
+  protobuf_c_boolean has_debugdistributor;
+  DebugDistributorType debugdistributor;
+  protobuf_c_boolean has_distributoractive;
+  protobuf_c_boolean distributoractive;
 };
 #define SETUP_DEBUG_DISRIBUTORS_REQUEST__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&setup_debug_disributors_request__descriptor) \
-    , 0,NULL }
+    , 0, DEBUG_DISTRIBUTOR_TYPE__ControlFilter, 0, 0 }
 
 
 /* SetupDebugDisributorsRequest methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
index 11ae78d92..9c97628bb 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "EventType.pb-c.h"
-static const ProtobufCEnumValue event_type__enum_values_by_number[289] =
+static const ProtobufCEnumValue event_type__enum_values_by_number[291] =
 {
   { "None", "EVENT_TYPE__None", 0 },
   { "REQUEST_SENT", "EVENT_TYPE__REQUEST_SENT", 1000 },
@@ -41,6 +41,8 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[289] =
   { "MACHINE_STATE_HW_CONFIG_FAILED", "EVENT_TYPE__MACHINE_STATE_HW_CONFIG_FAILED", 2014 },
   { "MACHINE_STATE_INITIAL_BLOWER_FAILED", "EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED", 2015 },
   { "UNSPECIFIED", "EVENT_TYPE__UNSPECIFIED", 2016 },
+  { "MACHINE_INTERNAL_OVERTEMPERATURE_2", "EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2", 2017 },
+  { "ELECTRICAL_CABINET_OVERTEMPERATURE", "EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE", 2018 },
   { "THREAD_BREAK", "EVENT_TYPE__THREAD_BREAK", 3000 },
   { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", "EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 3001 },
   { "WINDER_CONE_DOES_NOT_EXIST", "EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST", 3002 },
@@ -300,299 +302,301 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[289] =
   { "WASTE_CARTRIDGE_RFID_TIMEOUT", "EVENT_TYPE__WASTE_CARTRIDGE_RFID_TIMEOUT", 10005 },
 };
 static const ProtobufCIntRange event_type__value_ranges[] = {
-{0, 0},{1000, 1},{2000, 15},{3000, 32},{4000, 83},{5000, 105},{6000, 148},{7000, 154},{8000, 242},{9000, 274},{10000, 283},{0, 289}
+{0, 0},{1000, 1},{2000, 15},{3000, 34},{4000, 85},{5000, 107},{6000, 150},{7000, 156},{8000, 244},{9000, 276},{10000, 285},{0, 291}
 };
-static const ProtobufCEnumValueIndex event_type__enum_values_by_name[289] =
+static const ProtobufCEnumValueIndex event_type__enum_values_by_name[291] =
 {
-  { "AIR_FILTER_CLOGGED", 275 },
-  { "AIR_FILTER_NOT_INSTALLED", 274 },
-  { "ALL_WASTE_CARTRIDGES_FULL", 286 },
+  { "AIR_FILTER_CLOGGED", 277 },
+  { "AIR_FILTER_NOT_INSTALLED", 276 },
+  { "ALL_WASTE_CARTRIDGES_FULL", 288 },
   { "APPLICATION_EXCEPTION", 4 },
   { "APPLICATION_INFORMATION", 5 },
   { "APPLICATION_STARTED", 6 },
   { "APPLICATION_TERMINATED", 7 },
   { "CARTRIDGES_COVER_OPEN", 21 },
-  { "CHILLER_DRY_CONTACT", 280 },
-  { "DISPENSER_1_EMPTY", 170 },
-  { "DISPENSER_1_HIGH_PRESSURE", 234 },
-  { "DISPENSER_1_LOWER_HARD_LIMIT", 226 },
-  { "DISPENSER_1_MOTOR_OVERCURRENT", 186 },
-  { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 194 },
-  { "DISPENSER_1_MOTOR_STALL", 202 },
-  { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 210 },
-  { "DISPENSER_1_OVERPRESSURE", 154 },
-  { "DISPENSER_1_REFILL_FAILURE", 178 },
-  { "DISPENSER_1_UNDERPRESSURE", 162 },
-  { "DISPENSER_1_UPPER_HARD_LIMIT", 218 },
-  { "DISPENSER_2_EMPTY", 171 },
-  { "DISPENSER_2_HIGH_PRESSURE", 235 },
-  { "DISPENSER_2_LOWER_HARD_LIMIT", 227 },
-  { "DISPENSER_2_MOTOR_OVERCURRENT", 187 },
-  { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 195 },
-  { "DISPENSER_2_MOTOR_STALL", 203 },
-  { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 211 },
-  { "DISPENSER_2_OVERPRESSURE", 155 },
-  { "DISPENSER_2_REFILL_FAILURE", 179 },
-  { "DISPENSER_2_UNDERPRESSURE", 163 },
-  { "DISPENSER_2_UPPER_HARD_LIMIT", 219 },
-  { "DISPENSER_3_EMPTY", 172 },
-  { "DISPENSER_3_HIGH_PRESSURE", 236 },
-  { "DISPENSER_3_LOWER_HARD_LIMIT", 228 },
-  { "DISPENSER_3_MOTOR_OVERCURRENT", 188 },
-  { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 196 },
-  { "DISPENSER_3_MOTOR_STALL", 204 },
-  { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 212 },
-  { "DISPENSER_3_OVERPRESSURE", 156 },
-  { "DISPENSER_3_REFILL_FAILURE", 180 },
-  { "DISPENSER_3_UNDERPRESSURE", 164 },
-  { "DISPENSER_3_UPPER_HARD_LIMIT", 220 },
-  { "DISPENSER_4_EMPTY", 173 },
-  { "DISPENSER_4_HIGH_PRESSURE", 237 },
-  { "DISPENSER_4_LOWER_HARD_LIMIT", 229 },
-  { "DISPENSER_4_MOTOR_OVERCURRENT", 189 },
-  { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 197 },
-  { "DISPENSER_4_MOTOR_STALL", 205 },
-  { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 213 },
-  { "DISPENSER_4_OVERPRESSURE", 157 },
-  { "DISPENSER_4_REFILL_FAILURE", 181 },
-  { "DISPENSER_4_UNDERPRESSURE", 165 },
-  { "DISPENSER_4_UPPER_HARD_LIMIT", 221 },
-  { "DISPENSER_5_EMPTY", 174 },
-  { "DISPENSER_5_HIGH_PRESSURE", 238 },
-  { "DISPENSER_5_LOWER_HARD_LIMIT", 230 },
-  { "DISPENSER_5_MOTOR_OVERCURRENT", 190 },
-  { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 198 },
-  { "DISPENSER_5_MOTOR_STALL", 206 },
-  { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 214 },
-  { "DISPENSER_5_OVERPRESSURE", 158 },
-  { "DISPENSER_5_REFILL_FAILURE", 182 },
-  { "DISPENSER_5_UNDERPRESSURE", 166 },
-  { "DISPENSER_5_UPPER_HARD_LIMIT", 222 },
-  { "DISPENSER_6_EMPTY", 175 },
-  { "DISPENSER_6_HIGH_PRESSURE", 239 },
-  { "DISPENSER_6_LOWER_HARD_LIMIT", 231 },
-  { "DISPENSER_6_MOTOR_OVERCURRENT", 191 },
-  { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 199 },
-  { "DISPENSER_6_MOTOR_STALL", 207 },
-  { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 215 },
-  { "DISPENSER_6_OVERPRESSURE", 159 },
-  { "DISPENSER_6_REFILL_FAILURE", 183 },
-  { "DISPENSER_6_UNDERPRESSURE", 167 },
-  { "DISPENSER_6_UPPER_HARD_LIMIT", 223 },
-  { "DISPENSER_7_EMPTY", 176 },
-  { "DISPENSER_7_HIGH_PRESSURE", 240 },
-  { "DISPENSER_7_LOWER_HARD_LIMIT", 232 },
-  { "DISPENSER_7_MOTOR_OVERCURRENT", 192 },
-  { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 200 },
-  { "DISPENSER_7_MOTOR_STALL", 208 },
-  { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 216 },
-  { "DISPENSER_7_OVERPRESSURE", 160 },
-  { "DISPENSER_7_REFILL_FAILURE", 184 },
-  { "DISPENSER_7_UNDERPRESSURE", 168 },
-  { "DISPENSER_7_UPPER_HARD_LIMIT", 224 },
-  { "DISPENSER_8_EMPTY", 177 },
-  { "DISPENSER_8_HIGH_PRESSURE", 241 },
-  { "DISPENSER_8_LOWER_HARD_LIMIT", 233 },
-  { "DISPENSER_8_MOTOR_OVERCURRENT", 193 },
-  { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 201 },
-  { "DISPENSER_8_MOTOR_STALL", 209 },
-  { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 217 },
-  { "DISPENSER_8_OVERPRESSURE", 161 },
-  { "DISPENSER_8_REFILL_FAILURE", 185 },
-  { "DISPENSER_8_UNDERPRESSURE", 169 },
-  { "DISPENSER_8_UPPER_HARD_LIMIT", 225 },
-  { "DRYER_DOOR_OPEN", 87 },
-  { "DRYER_FAN_RPM_TOO_LOW", 98 },
-  { "DRYER_FAN_STOPPED", 99 },
-  { "DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK", 96 },
-  { "DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE", 94 },
-  { "DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK", 97 },
-  { "DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE", 95 },
-  { "DRYER_LID_MOTOR_OVERCURRENT", 100 },
-  { "DRYER_LID_MOTOR_OVERTEMPERATURE", 101 },
-  { "DRYER_LID_MOTOR_STALL", 102 },
-  { "DRYER_LID_MOTOR_UNDERVOLTAGE", 103 },
-  { "DRYER_MOTOR_OVERCURRENT", 83 },
-  { "DRYER_MOTOR_OVERTEMPERATURE", 84 },
-  { "DRYER_MOTOR_STALL", 85 },
-  { "DRYER_MOTOR_UNDERVOLTAGE", 86 },
-  { "DRYER_THERMAL_CUTOFF", 93 },
-  { "DRYER_ZONE_1_OVERTEMPERATURE", 88 },
-  { "DRYER_ZONE_1_UNDERTEMPERATURE_A", 90 },
-  { "DRYER_ZONE_1_UNDERTEMPERATURE_B", 91 },
-  { "DRYER_ZONE_2_OVERTEMPERATURE", 89 },
-  { "DRYER_ZONE_2_UNDERTEMPERATURE_A", 104 },
-  { "DRYER_ZONE_2_UNDERTEMPERATURE_B", 92 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT", 144 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 145 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 146 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", 147 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT", 140 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE", 141 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_STALL", 142 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE", 143 },
-  { "DYEING_HEAD_COVER_CLOSE_TIMEOUT", 135 },
-  { "DYEING_HEAD_COVER_MOTOR_OVERCURRENT", 136 },
-  { "DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE", 137 },
-  { "DYEING_HEAD_COVER_MOTOR_STALL", 138 },
-  { "DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE", 139 },
-  { "DYEING_HEAD_COVER_OPEN_TIMEOUT", 134 },
-  { "DYEING_HEAD_THERMAL_CUTOFF", 133 },
-  { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 128 },
-  { "DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE", 123 },
-  { "DYEING_HEAD_ZONE_1_OVERTEMPERATURE", 105 },
-  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A", 111 },
-  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B", 117 },
-  { "DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", 129 },
-  { "DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", 124 },
-  { "DYEING_HEAD_ZONE_2_OVERTEMPERATURE", 106 },
-  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A", 112 },
-  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B", 118 },
-  { "DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", 130 },
-  { "DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", 125 },
-  { "DYEING_HEAD_ZONE_3_OVERTEMPERATURE", 107 },
-  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A", 113 },
-  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B", 119 },
-  { "DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", 131 },
-  { "DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", 126 },
-  { "DYEING_HEAD_ZONE_4_OVERTEMPERATURE", 108 },
-  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A", 114 },
-  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B", 120 },
-  { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 132 },
-  { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 127 },
-  { "DYEING_HEAD_ZONE_5_OVERTEMPERATURE", 109 },
-  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A", 115 },
-  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B", 121 },
-  { "DYEING_HEAD_ZONE_6_OVERTEMPERATURE", 110 },
-  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A", 116 },
-  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B", 122 },
+  { "CHILLER_DRY_CONTACT", 282 },
+  { "DISPENSER_1_EMPTY", 172 },
+  { "DISPENSER_1_HIGH_PRESSURE", 236 },
+  { "DISPENSER_1_LOWER_HARD_LIMIT", 228 },
+  { "DISPENSER_1_MOTOR_OVERCURRENT", 188 },
+  { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 196 },
+  { "DISPENSER_1_MOTOR_STALL", 204 },
+  { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 212 },
+  { "DISPENSER_1_OVERPRESSURE", 156 },
+  { "DISPENSER_1_REFILL_FAILURE", 180 },
+  { "DISPENSER_1_UNDERPRESSURE", 164 },
+  { "DISPENSER_1_UPPER_HARD_LIMIT", 220 },
+  { "DISPENSER_2_EMPTY", 173 },
+  { "DISPENSER_2_HIGH_PRESSURE", 237 },
+  { "DISPENSER_2_LOWER_HARD_LIMIT", 229 },
+  { "DISPENSER_2_MOTOR_OVERCURRENT", 189 },
+  { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 197 },
+  { "DISPENSER_2_MOTOR_STALL", 205 },
+  { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 213 },
+  { "DISPENSER_2_OVERPRESSURE", 157 },
+  { "DISPENSER_2_REFILL_FAILURE", 181 },
+  { "DISPENSER_2_UNDERPRESSURE", 165 },
+  { "DISPENSER_2_UPPER_HARD_LIMIT", 221 },
+  { "DISPENSER_3_EMPTY", 174 },
+  { "DISPENSER_3_HIGH_PRESSURE", 238 },
+  { "DISPENSER_3_LOWER_HARD_LIMIT", 230 },
+  { "DISPENSER_3_MOTOR_OVERCURRENT", 190 },
+  { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 198 },
+  { "DISPENSER_3_MOTOR_STALL", 206 },
+  { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 214 },
+  { "DISPENSER_3_OVERPRESSURE", 158 },
+  { "DISPENSER_3_REFILL_FAILURE", 182 },
+  { "DISPENSER_3_UNDERPRESSURE", 166 },
+  { "DISPENSER_3_UPPER_HARD_LIMIT", 222 },
+  { "DISPENSER_4_EMPTY", 175 },
+  { "DISPENSER_4_HIGH_PRESSURE", 239 },
+  { "DISPENSER_4_LOWER_HARD_LIMIT", 231 },
+  { "DISPENSER_4_MOTOR_OVERCURRENT", 191 },
+  { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 199 },
+  { "DISPENSER_4_MOTOR_STALL", 207 },
+  { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 215 },
+  { "DISPENSER_4_OVERPRESSURE", 159 },
+  { "DISPENSER_4_REFILL_FAILURE", 183 },
+  { "DISPENSER_4_UNDERPRESSURE", 167 },
+  { "DISPENSER_4_UPPER_HARD_LIMIT", 223 },
+  { "DISPENSER_5_EMPTY", 176 },
+  { "DISPENSER_5_HIGH_PRESSURE", 240 },
+  { "DISPENSER_5_LOWER_HARD_LIMIT", 232 },
+  { "DISPENSER_5_MOTOR_OVERCURRENT", 192 },
+  { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 200 },
+  { "DISPENSER_5_MOTOR_STALL", 208 },
+  { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 216 },
+  { "DISPENSER_5_OVERPRESSURE", 160 },
+  { "DISPENSER_5_REFILL_FAILURE", 184 },
+  { "DISPENSER_5_UNDERPRESSURE", 168 },
+  { "DISPENSER_5_UPPER_HARD_LIMIT", 224 },
+  { "DISPENSER_6_EMPTY", 177 },
+  { "DISPENSER_6_HIGH_PRESSURE", 241 },
+  { "DISPENSER_6_LOWER_HARD_LIMIT", 233 },
+  { "DISPENSER_6_MOTOR_OVERCURRENT", 193 },
+  { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 201 },
+  { "DISPENSER_6_MOTOR_STALL", 209 },
+  { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 217 },
+  { "DISPENSER_6_OVERPRESSURE", 161 },
+  { "DISPENSER_6_REFILL_FAILURE", 185 },
+  { "DISPENSER_6_UNDERPRESSURE", 169 },
+  { "DISPENSER_6_UPPER_HARD_LIMIT", 225 },
+  { "DISPENSER_7_EMPTY", 178 },
+  { "DISPENSER_7_HIGH_PRESSURE", 242 },
+  { "DISPENSER_7_LOWER_HARD_LIMIT", 234 },
+  { "DISPENSER_7_MOTOR_OVERCURRENT", 194 },
+  { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 202 },
+  { "DISPENSER_7_MOTOR_STALL", 210 },
+  { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 218 },
+  { "DISPENSER_7_OVERPRESSURE", 162 },
+  { "DISPENSER_7_REFILL_FAILURE", 186 },
+  { "DISPENSER_7_UNDERPRESSURE", 170 },
+  { "DISPENSER_7_UPPER_HARD_LIMIT", 226 },
+  { "DISPENSER_8_EMPTY", 179 },
+  { "DISPENSER_8_HIGH_PRESSURE", 243 },
+  { "DISPENSER_8_LOWER_HARD_LIMIT", 235 },
+  { "DISPENSER_8_MOTOR_OVERCURRENT", 195 },
+  { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 203 },
+  { "DISPENSER_8_MOTOR_STALL", 211 },
+  { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 219 },
+  { "DISPENSER_8_OVERPRESSURE", 163 },
+  { "DISPENSER_8_REFILL_FAILURE", 187 },
+  { "DISPENSER_8_UNDERPRESSURE", 171 },
+  { "DISPENSER_8_UPPER_HARD_LIMIT", 227 },
+  { "DRYER_DOOR_OPEN", 89 },
+  { "DRYER_FAN_RPM_TOO_LOW", 100 },
+  { "DRYER_FAN_STOPPED", 101 },
+  { "DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK", 98 },
+  { "DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE", 96 },
+  { "DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK", 99 },
+  { "DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE", 97 },
+  { "DRYER_LID_MOTOR_OVERCURRENT", 102 },
+  { "DRYER_LID_MOTOR_OVERTEMPERATURE", 103 },
+  { "DRYER_LID_MOTOR_STALL", 104 },
+  { "DRYER_LID_MOTOR_UNDERVOLTAGE", 105 },
+  { "DRYER_MOTOR_OVERCURRENT", 85 },
+  { "DRYER_MOTOR_OVERTEMPERATURE", 86 },
+  { "DRYER_MOTOR_STALL", 87 },
+  { "DRYER_MOTOR_UNDERVOLTAGE", 88 },
+  { "DRYER_THERMAL_CUTOFF", 95 },
+  { "DRYER_ZONE_1_OVERTEMPERATURE", 90 },
+  { "DRYER_ZONE_1_UNDERTEMPERATURE_A", 92 },
+  { "DRYER_ZONE_1_UNDERTEMPERATURE_B", 93 },
+  { "DRYER_ZONE_2_OVERTEMPERATURE", 91 },
+  { "DRYER_ZONE_2_UNDERTEMPERATURE_A", 106 },
+  { "DRYER_ZONE_2_UNDERTEMPERATURE_B", 94 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT", 146 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 147 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 148 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", 149 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT", 142 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE", 143 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_STALL", 144 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE", 145 },
+  { "DYEING_HEAD_COVER_CLOSE_TIMEOUT", 137 },
+  { "DYEING_HEAD_COVER_MOTOR_OVERCURRENT", 138 },
+  { "DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE", 139 },
+  { "DYEING_HEAD_COVER_MOTOR_STALL", 140 },
+  { "DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE", 141 },
+  { "DYEING_HEAD_COVER_OPEN_TIMEOUT", 136 },
+  { "DYEING_HEAD_THERMAL_CUTOFF", 135 },
+  { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 130 },
+  { "DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE", 125 },
+  { "DYEING_HEAD_ZONE_1_OVERTEMPERATURE", 107 },
+  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A", 113 },
+  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B", 119 },
+  { "DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", 131 },
+  { "DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", 126 },
+  { "DYEING_HEAD_ZONE_2_OVERTEMPERATURE", 108 },
+  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A", 114 },
+  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B", 120 },
+  { "DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", 132 },
+  { "DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", 127 },
+  { "DYEING_HEAD_ZONE_3_OVERTEMPERATURE", 109 },
+  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A", 115 },
+  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B", 121 },
+  { "DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", 133 },
+  { "DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", 128 },
+  { "DYEING_HEAD_ZONE_4_OVERTEMPERATURE", 110 },
+  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A", 116 },
+  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B", 122 },
+  { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 134 },
+  { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 129 },
+  { "DYEING_HEAD_ZONE_5_OVERTEMPERATURE", 111 },
+  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A", 117 },
+  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B", 123 },
+  { "DYEING_HEAD_ZONE_6_OVERTEMPERATURE", 112 },
+  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A", 118 },
+  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B", 124 },
   { "ELECTRICAL_CABINET_FANS_RPM_TOO_LOW", 26 },
   { "ELECTRICAL_CABINET_FANS_STOPPED", 27 },
+  { "ELECTRICAL_CABINET_OVERTEMPERATURE", 33 },
   { "EMERGENCY_PUSH_BUTTON_PRESSED", 16 },
-  { "FEEDER_DANCER_MOTOR_OVERCURRENT", 70 },
-  { "FEEDER_DANCER_MOTOR_OVERTEMPERATURE", 73 },
-  { "FEEDER_DANCER_MOTOR_STALL", 76 },
-  { "FEEDER_DANCER_MOTOR_UNDERVOLTAGE", 79 },
-  { "FEEDER_MOTOR_OVERCURRENT", 35 },
-  { "FEEDER_MOTOR_OVERTEMPERATURE", 42 },
-  { "FEEDER_MOTOR_STALL", 49 },
-  { "FEEDER_MOTOR_UNDERVOLTAGE", 56 },
+  { "FEEDER_DANCER_MOTOR_OVERCURRENT", 72 },
+  { "FEEDER_DANCER_MOTOR_OVERTEMPERATURE", 75 },
+  { "FEEDER_DANCER_MOTOR_STALL", 78 },
+  { "FEEDER_DANCER_MOTOR_UNDERVOLTAGE", 81 },
+  { "FEEDER_MOTOR_OVERCURRENT", 37 },
+  { "FEEDER_MOTOR_OVERTEMPERATURE", 44 },
+  { "FEEDER_MOTOR_STALL", 51 },
+  { "FEEDER_MOTOR_UNDERVOLTAGE", 58 },
   { "FRONT_COVER_1_OPEN", 17 },
   { "FRONT_COVER_2_OPEN", 18 },
   { "FRONT_COVER_3_OPEN", 19 },
   { "FRONT_COVER_4_OPEN", 20 },
-  { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 283 },
-  { "INK_CARTRIDGE_RFID_TIMEOUT", 284 },
-  { "INSUFFICIENT_AIR_FLOW", 281 },
+  { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 285 },
+  { "INK_CARTRIDGE_RFID_TIMEOUT", 286 },
+  { "INSUFFICIENT_AIR_FLOW", 283 },
   { "JOB_ABORTED", 12 },
   { "JOB_COMPLETED", 14 },
   { "JOB_FAILED", 13 },
   { "JOB_STARTED", 11 },
   { "JOB_STATUS", 10 },
-  { "LEFT_LOADER_MOTOR_OVERCURRENT", 38 },
-  { "LEFT_LOADER_MOTOR_OVERTEMPERATURE", 45 },
-  { "LEFT_LOADER_MOTOR_STALL", 52 },
-  { "LEFT_LOADER_MOTOR_UNDERVOLTAGE", 59 },
-  { "LOADING_ARM_MOTOR_OVERCURRENT", 41 },
-  { "LOADING_ARM_MOTOR_OVERTEMPERATURE", 48 },
-  { "LOADING_ARM_MOTOR_STALL", 55 },
-  { "LOADING_ARM_MOTOR_UNDERVOLTAGE", 62 },
-  { "LTFU_DOWN_TIMEOUT", 64 },
-  { "LTFU_UP_TIMEOUT", 63 },
+  { "LEFT_LOADER_MOTOR_OVERCURRENT", 40 },
+  { "LEFT_LOADER_MOTOR_OVERTEMPERATURE", 47 },
+  { "LEFT_LOADER_MOTOR_STALL", 54 },
+  { "LEFT_LOADER_MOTOR_UNDERVOLTAGE", 61 },
+  { "LOADING_ARM_MOTOR_OVERCURRENT", 43 },
+  { "LOADING_ARM_MOTOR_OVERTEMPERATURE", 50 },
+  { "LOADING_ARM_MOTOR_STALL", 57 },
+  { "LOADING_ARM_MOTOR_UNDERVOLTAGE", 64 },
+  { "LTFU_DOWN_TIMEOUT", 66 },
+  { "LTFU_UP_TIMEOUT", 65 },
   { "MACHINE_FANS_RPM_TOO_LOW", 24 },
   { "MACHINE_FANS_STOPPED", 25 },
   { "MACHINE_INTERNAL_OVERTEMPERATURE", 23 },
+  { "MACHINE_INTERNAL_OVERTEMPERATURE_2", 32 },
   { "MACHINE_STATE_HW_CONFIG_FAILED", 29 },
   { "MACHINE_STATE_INITIAL_BLOWER_FAILED", 30 },
   { "MACHINE_STATE_NO_CFG_FILE", 28 },
-  { "MACHINE_STATE_NO_THREAD_DETECTED", 82 },
-  { "MID_TANK_1_EMPTY", 250 },
-  { "MID_TANK_1_FILL_TIMEOUT", 266 },
-  { "MID_TANK_1_LOW_LEVEL", 242 },
-  { "MID_TANK_1_OVERFLOW", 258 },
-  { "MID_TANK_2_EMPTY", 251 },
-  { "MID_TANK_2_FILL_TIMEOUT", 267 },
-  { "MID_TANK_2_LOW_LEVEL", 243 },
-  { "MID_TANK_2_OVERFLOW", 259 },
-  { "MID_TANK_3_EMPTY", 252 },
-  { "MID_TANK_3_FILL_TIMEOUT", 268 },
-  { "MID_TANK_3_LOW_LEVEL", 244 },
-  { "MID_TANK_3_OVERFLOW", 260 },
-  { "MID_TANK_4_EMPTY", 253 },
-  { "MID_TANK_4_FILL_TIMEOUT", 269 },
-  { "MID_TANK_4_LOW_LEVEL", 245 },
-  { "MID_TANK_4_OVERFLOW", 261 },
-  { "MID_TANK_5_EMPTY", 254 },
-  { "MID_TANK_5_FILL_TIMEOUT", 270 },
-  { "MID_TANK_5_LOW_LEVEL", 246 },
-  { "MID_TANK_5_OVERFLOW", 262 },
-  { "MID_TANK_6_EMPTY", 255 },
-  { "MID_TANK_6_FILL_TIMEOUT", 271 },
-  { "MID_TANK_6_LOW_LEVEL", 247 },
-  { "MID_TANK_6_OVERFLOW", 263 },
-  { "MID_TANK_7_EMPTY", 256 },
-  { "MID_TANK_7_FILL_TIMEOUT", 272 },
-  { "MID_TANK_7_LOW_LEVEL", 248 },
-  { "MID_TANK_7_OVERFLOW", 264 },
-  { "MID_TANK_8_EMPTY", 257 },
-  { "MID_TANK_8_FILL_TIMEOUT", 273 },
-  { "MID_TANK_8_LOW_LEVEL", 249 },
-  { "MID_TANK_8_OVERFLOW", 265 },
-  { "MIXER_CURRENT_LOOP_BREAK", 153 },
-  { "MIXER_CURRENT_OUT_OF_RANGE", 152 },
-  { "MIXER_OVERTEMPERATURE", 148 },
-  { "MIXER_THERMAL_CUTOFF", 151 },
-  { "MIXER_UNDERTEMPERATURE_A", 149 },
-  { "MIXER_UNDERTEMPERATURE_B", 150 },
-  { "NO_AIR_PRESSURE", 277 },
-  { "NO_WASTE_CARTRIDGE_AVAILABLE", 285 },
+  { "MACHINE_STATE_NO_THREAD_DETECTED", 84 },
+  { "MID_TANK_1_EMPTY", 252 },
+  { "MID_TANK_1_FILL_TIMEOUT", 268 },
+  { "MID_TANK_1_LOW_LEVEL", 244 },
+  { "MID_TANK_1_OVERFLOW", 260 },
+  { "MID_TANK_2_EMPTY", 253 },
+  { "MID_TANK_2_FILL_TIMEOUT", 269 },
+  { "MID_TANK_2_LOW_LEVEL", 245 },
+  { "MID_TANK_2_OVERFLOW", 261 },
+  { "MID_TANK_3_EMPTY", 254 },
+  { "MID_TANK_3_FILL_TIMEOUT", 270 },
+  { "MID_TANK_3_LOW_LEVEL", 246 },
+  { "MID_TANK_3_OVERFLOW", 262 },
+  { "MID_TANK_4_EMPTY", 255 },
+  { "MID_TANK_4_FILL_TIMEOUT", 271 },
+  { "MID_TANK_4_LOW_LEVEL", 247 },
+  { "MID_TANK_4_OVERFLOW", 263 },
+  { "MID_TANK_5_EMPTY", 256 },
+  { "MID_TANK_5_FILL_TIMEOUT", 272 },
+  { "MID_TANK_5_LOW_LEVEL", 248 },
+  { "MID_TANK_5_OVERFLOW", 264 },
+  { "MID_TANK_6_EMPTY", 257 },
+  { "MID_TANK_6_FILL_TIMEOUT", 273 },
+  { "MID_TANK_6_LOW_LEVEL", 249 },
+  { "MID_TANK_6_OVERFLOW", 265 },
+  { "MID_TANK_7_EMPTY", 258 },
+  { "MID_TANK_7_FILL_TIMEOUT", 274 },
+  { "MID_TANK_7_LOW_LEVEL", 250 },
+  { "MID_TANK_7_OVERFLOW", 266 },
+  { "MID_TANK_8_EMPTY", 259 },
+  { "MID_TANK_8_FILL_TIMEOUT", 275 },
+  { "MID_TANK_8_LOW_LEVEL", 251 },
+  { "MID_TANK_8_OVERFLOW", 267 },
+  { "MIXER_CURRENT_LOOP_BREAK", 155 },
+  { "MIXER_CURRENT_OUT_OF_RANGE", 154 },
+  { "MIXER_OVERTEMPERATURE", 150 },
+  { "MIXER_THERMAL_CUTOFF", 153 },
+  { "MIXER_UNDERTEMPERATURE_A", 151 },
+  { "MIXER_UNDERTEMPERATURE_B", 152 },
+  { "NO_AIR_PRESSURE", 279 },
+  { "NO_WASTE_CARTRIDGE_AVAILABLE", 287 },
   { "None", 0 },
   { "POWER_UP_BIT_FAILURE", 15 },
-  { "PULLER_DANCER_MOTOR_OVERCURRENT", 69 },
-  { "PULLER_DANCER_MOTOR_OVERTEMPERATURE", 72 },
-  { "PULLER_DANCER_MOTOR_STALL", 75 },
-  { "PULLER_DANCER_MOTOR_UNDERVOLTAGE", 78 },
-  { "PULLER_MOTOR_OVERCURRENT", 37 },
-  { "PULLER_MOTOR_OVERTEMPERATURE", 44 },
-  { "PULLER_MOTOR_STALL", 51 },
-  { "PULLER_MOTOR_UNDERVOLTAGE", 58 },
+  { "PULLER_DANCER_MOTOR_OVERCURRENT", 71 },
+  { "PULLER_DANCER_MOTOR_OVERTEMPERATURE", 74 },
+  { "PULLER_DANCER_MOTOR_STALL", 77 },
+  { "PULLER_DANCER_MOTOR_UNDERVOLTAGE", 80 },
+  { "PULLER_MOTOR_OVERCURRENT", 39 },
+  { "PULLER_MOTOR_OVERTEMPERATURE", 46 },
+  { "PULLER_MOTOR_STALL", 53 },
+  { "PULLER_MOTOR_UNDERVOLTAGE", 60 },
   { "REAR_COVER_OPEN", 22 },
   { "RECORDING_STARTED", 8 },
   { "RECORDING_STOPPED", 9 },
   { "REQUEST_FAILED", 3 },
   { "REQUEST_SENT", 1 },
   { "RESPONSE_RECEIVED", 2 },
-  { "RIGHT_LOADER_MOTOR_OVERCURRENT", 36 },
-  { "RIGHT_LOADER_MOTOR_OVERTEMPERATURE", 43 },
-  { "RIGHT_LOADER_MOTOR_STALL", 50 },
-  { "RIGHT_LOADER_MOTOR_UNDERVOLTAGE", 57 },
-  { "RTFU_DOWN_TIMEOUT", 66 },
-  { "RTFU_UP_TIMEOUT", 65 },
-  { "SCREW_MOTOR_LIMIT_TIMEOUT", 67 },
-  { "SCREW_MOTOR_OVERCURRENT", 40 },
-  { "SCREW_MOTOR_OVERTEMPERATURE", 47 },
-  { "SCREW_MOTOR_STALL", 54 },
-  { "SCREW_MOTOR_UNDERVOLTAGE", 61 },
-  { "THREAD_BREAK", 32 },
-  { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 33 },
-  { "THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", 80 },
-  { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 81 },
+  { "RIGHT_LOADER_MOTOR_OVERCURRENT", 38 },
+  { "RIGHT_LOADER_MOTOR_OVERTEMPERATURE", 45 },
+  { "RIGHT_LOADER_MOTOR_STALL", 52 },
+  { "RIGHT_LOADER_MOTOR_UNDERVOLTAGE", 59 },
+  { "RTFU_DOWN_TIMEOUT", 68 },
+  { "RTFU_UP_TIMEOUT", 67 },
+  { "SCREW_MOTOR_LIMIT_TIMEOUT", 69 },
+  { "SCREW_MOTOR_OVERCURRENT", 42 },
+  { "SCREW_MOTOR_OVERTEMPERATURE", 49 },
+  { "SCREW_MOTOR_STALL", 56 },
+  { "SCREW_MOTOR_UNDERVOLTAGE", 63 },
+  { "THREAD_BREAK", 34 },
+  { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 35 },
+  { "THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", 82 },
+  { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 83 },
   { "UNSPECIFIED", 31 },
-  { "VOC_SENSOR_ALARM_SLOPE", 282 },
-  { "VOC_SENSOR_ALARM_TIME", 279 },
-  { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 287 },
-  { "WASTE_CARTRIDGE_RFID_TIMEOUT", 288 },
-  { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 276 },
-  { "WASTE_CONTAINER_OVERFLOW", 278 },
-  { "WINDER_CONE_DOES_NOT_EXIST", 34 },
-  { "WINDER_DANCER_MOTOR_OVERCURRENT", 68 },
-  { "WINDER_DANCER_MOTOR_OVERTEMPERATURE", 71 },
-  { "WINDER_DANCER_MOTOR_STALL", 74 },
-  { "WINDER_DANCER_MOTOR_UNDERVOLTAGE", 77 },
-  { "WINDER_MOTOR_OVERCURRENT", 39 },
-  { "WINDER_MOTOR_OVERTEMPERATURE", 46 },
-  { "WINDER_MOTOR_STALL", 53 },
-  { "WINDER_MOTOR_UNDERVOLTAGE", 60 },
+  { "VOC_SENSOR_ALARM_SLOPE", 284 },
+  { "VOC_SENSOR_ALARM_TIME", 281 },
+  { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 289 },
+  { "WASTE_CARTRIDGE_RFID_TIMEOUT", 290 },
+  { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 278 },
+  { "WASTE_CONTAINER_OVERFLOW", 280 },
+  { "WINDER_CONE_DOES_NOT_EXIST", 36 },
+  { "WINDER_DANCER_MOTOR_OVERCURRENT", 70 },
+  { "WINDER_DANCER_MOTOR_OVERTEMPERATURE", 73 },
+  { "WINDER_DANCER_MOTOR_STALL", 76 },
+  { "WINDER_DANCER_MOTOR_UNDERVOLTAGE", 79 },
+  { "WINDER_MOTOR_OVERCURRENT", 41 },
+  { "WINDER_MOTOR_OVERTEMPERATURE", 48 },
+  { "WINDER_MOTOR_STALL", 55 },
+  { "WINDER_MOTOR_UNDERVOLTAGE", 62 },
 };
 const ProtobufCEnumDescriptor event_type__descriptor =
 {
@@ -601,9 +605,9 @@ const ProtobufCEnumDescriptor event_type__descriptor =
   "EventType",
   "EventType",
   "",
-  289,
+  291,
   event_type__enum_values_by_number,
-  289,
+  291,
   event_type__enum_values_by_name,
   11,
   event_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
index 3a2ffd071..cd8abc59a 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
@@ -52,6 +52,8 @@ typedef enum _EventType {
   EVENT_TYPE__MACHINE_STATE_HW_CONFIG_FAILED = 2014,
   EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED = 2015,
   EVENT_TYPE__UNSPECIFIED = 2016,
+  EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2 = 2017,
+  EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE = 2018,
   EVENT_TYPE__THREAD_BREAK = 3000,
   EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER = 3001,
   EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST = 3002,
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
index ab5f80af4..0e28ec736 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
@@ -82,6 +82,8 @@ uint32_t InitialDispenserTimeout = INITIAL_DISPENSER_TIMEOUT_LIMIT;
 uint32_t InitialDispenserTimeLag = INITIAL_DISPENSER_TIMEOUT;
 uint32_t InitialDispenserSpeed = INITIAL_DISPENSER_SPEED;
 
+uint32_t    ControlIdtoInactiveDispenserId [MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+
 uint32_t IDS_StopHomeDispenserBuildPressure (uint32_t deviceID);
 
 AutoHoming_Config_enum AutoHoming_Config = AutoHoming_off;
@@ -487,6 +489,31 @@ uint32_t IDS_Dispenser_Alarm_Off (uint8_t DispenserId)
     Report("IDS_Dispenser_Alarm_Off",__FILE__,millisecondCounter,(int)DispenserId,RpWarning,0,0);
     return status;
 }
+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)
+        {
+            //LOG_ERROR(DispenserId,"IDS_Check_Pressure_Callback active in a job");
+            return ERROR;
+        }
+    }
+    if ((HomingActive[DispenserId] == true)||(PrimingActive[DispenserId] == true))
+    {
+        //LOG_ERROR(DispenserId,"IDS_Check_Pressure_Callback active in a job");
+        return ERROR;
+    }
+
+    if (GetDispenserPressure(DispenserId)>3.0)
+    {
+        Report("Pulling dispenser down to reduce pressure",__FILE__,DispenserId,(int)(GetDispenserPressure(DispenserId)*100),RpWarning,200,0);
+        MotorMove(HW_Motor_Id,1-MotorsCfg[HW_Motor_Id].directionthreadwize,200);
+    }
+    return OK;
+}
+
 
 void IDS_Dispenser_Init(uint8_t DispenserId)
 {
@@ -497,4 +524,7 @@ void IDS_Dispenser_Init(uint8_t DispenserId)
     PrimingActive[DispenserId]= false;
     Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF);
     Control3WayValvesWithCallback ((Valves_t)DispenserId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+    if (ControlIdtoInactiveDispenserId[DispenserId] == 0xFF)
+        ControlIdtoInactiveDispenserId[DispenserId] = AddControlCallback("IDS_Check_Pressure", IDS_Check_Pressure_Callback, eOneMinute,TemplateDataReadCBFunction ,0, 0, 0 );
+
 }
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index c241e3374..7815ea847 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -58,7 +58,6 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue);
 /******************** GLOBAL PARAMETERS  ********************************************/
 DispenserControlConfig_t DispenserControlConfig[MAX_SYSTEM_DISPENSERS];
 uint32_t    ControlIdtoDispenserId [MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-uint32_t    ControlIdtoInactiveDispenserId [MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 int OriginalDispenserSpd_2PPS[MAX_SYSTEM_DISPENSERS] = {0,0,0,0,0,0,0,0};
 bool         DispenserPreSegmentReady[MAX_SYSTEM_DISPENSERS] = {true,true,true,true,true,true,true,true};
 bool         DispenserSegmentReady[MAX_SYSTEM_DISPENSERS] = {true,true,true,true,true,true,true,true};
@@ -169,7 +168,7 @@ JobDescriptionFileBrushStop *GetNextBrushStopFromJobFile();
 void FreeBrushStopFileData(JobDescriptionFileBrushStop *BrushStop);
 
  */
-//shlomo JobDescriptionFileBrushStop *FirstBrushStop = NULL;
+JobDescriptionFileBrushStop *FirstBrushStop = NULL;
 
 //********************************************************************************************************************
  //************************** IDS JOB BUILDUP *************************************************************************
@@ -215,8 +214,8 @@ void FreeBrushStopFileData(JobDescriptionFileBrushStop *BrushStop);
                      BrushStop = GetNextBrushStopFromJobFile();
                      if (BrushStop)
                      {
-//shlomo                          if (FirstBrushStop == NULL)
-//shlomo                              FirstBrushStop = BrushStop;
+                         if (FirstBrushStop == NULL)
+                             FirstBrushStop = BrushStop;
                          if ((brushCounter % 100)==0)
                          {
                              SendJobProgress(0.0,0,false, "Processing file");
@@ -383,7 +382,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
 {
     if (AutoHoming_Config >= AutoHoming_JobEnd_PowerOn_off)
     {
-        if ((HomingActive[DispenserId] == false)&&(PrimingActive == false))
+        if ((HomingActive[DispenserId] == false)&&(PrimingActive[DispenserId] == false))
         {
             Report("Homing Inactive dispenser",__FILE__,DispenserId,HomingActive[DispenserId],RpWarning,PrimingActive[DispenserId],0);
             IDS_HomeDispenser (DispenserId, 1000 , NULL);
@@ -411,7 +410,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
      {
          if (DispenserUsedInJob[i] == false)
          {
-             if ((HomingActive[i] == false)&&(PrimingActive == false))
+             if ((HomingActive[i] == false)&&(PrimingActive[i] == false))
              {
                  Report("Inactive dispenser close valve",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
                  Control3WayValvesWithCallback (i, MidTank_Dispenser, InactiveDispenserHome); //direction: MidTank_Dispenser or Dispenser_Mixer
@@ -453,8 +452,8 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
 
      DispenserBuildTimeCounter+=PRESSURE_READ_TIME_GAP;
 
-//shlomo      if (pressureReady == false)
-//shlomo      {
+     if (pressureReady == false)
+     {
          if (DispenserBuildTimeCounter<(2*eOneSecond))
          {
              //REPORT_MSG(DispenserBuildTimeCounter,"waiting 2 seconds for pressure changes");
@@ -500,7 +499,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
              pressureReady = true;
          }
      }
-/* //shlomo      else if (endOfPrepareWCF == false)
+     else if (endOfPrepareWCF == false)
      {
          if ((0 == DispenserBuildTimeCounter)&&(FirstBrushStop))
          {
@@ -576,10 +575,6 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
          //start new stage
      if (endOfPrepareWCF == true)
      {
-	*/
-     if (pressureReady == true)
-     {
-	
          SafeRemoveControlCallback(DispenserPrepareControlId, IDS_Prepare_Callback );
          DispenserPrepareControlId = 0xFF;
          Report("IDS_Prepare_Callback SafeRemoveControlCallback",__FILE__,DispenserBuildTimeCounter,NumofReadyDispensers,RpWarning,(int)NumOfActiveDispensers,0);
@@ -681,7 +676,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
          {
              /**/if (AutoHoming_Config >= AutoHoming_JobEnd_PowerOn_off)
              {
-                 if ((HomingActive[i] == false)&&(PrimingActive == false))
+                 if ((HomingActive[i] == false)&&(PrimingActive[i] == false))
                  {
                      Report("Homing Inactive dispenser",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
                      IDS_HomeDispenser (i, 1000 , NULL);
@@ -691,7 +686,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
                      Report("Inactive dispenser already homing",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
                  }
              }/**/
-             /*if ((HomingActive[i] == false)&&(PrimingActive == false))
+             /*if ((HomingActive[i] == false)&&(PrimingActive[i] == false))
              {
                  Report("Inactive dispenser open valve",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
                  Control3WayValvesWithCallback (i, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
@@ -703,7 +698,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
                      Report("Inactive dispenser already homing",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
                  }
              }*/
-             //if ((HomingActive[i] == false)&&(PrimingActive == false))
+             //if ((HomingActive[i] == false)&&(PrimingActive[i] == false))
              //{
              //    Report("Inactive dispenser open valve",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0);
              //    Control3WayValvesWithCallback (i, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
@@ -1393,6 +1388,7 @@ uint32_t IDSSegmentStateSetValve(uint32_t IfIndex, uint32_t BusyFlag)
     SafeRemoveControlCallback(IDSValveControlId,IDSSegmentStateSetValve);
     Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Head);
     Report("IDSSegmentState set valve after 1 second",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0);
+    return OK;
 }
 #endif
 //********************************************************************************************************************