Updated events table DB & PMR & BL.

Implemented Dynamic event liquid type on PPC & FSE.

2 files changed, 212 insertions, 148 deletions

diff --git a/Software/PMR/Messages/Diagnostics/EventType.proto b/Software/PMR/Messages/Diagnostics/EventType.proto
index b602d2136..d24afb50b 100644
--- a/Software/PMR/Messages/Diagnostics/EventType.proto
+++ b/Software/PMR/Messages/Diagnostics/EventType.proto
@@ -145,26 +145,26 @@ enum EventType
     //No cone in the winder. Cannot execute job (Group = ThreadFeedingSystem, Category = Error)
     WINDER_CONE_DOES_NOT_EXIST = 3002;
 
-    //The feeder motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    FEEDER_MOTOR_OVERCURRENT = 3003;
+    //Feeder motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    FEEDER_MOTOR_MALFUNCTION = 3003;
 
-    //The current in the right loader motor is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    RIGHT_LOADER_MOTOR_OVERCURRENT = 3004;
+    //Right loader motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    RIGHT_LOADER_MOTOR_MALFUNCTION = 3004;
 
-    //The puller motor current is too high. Cannot execute job  (Group = ThreadFeedingSystem, Category = Warning)
-    PULLER_MOTOR_OVERCURRENT = 3005;
+    //Puller motor malfunction. Cannot execute job  (Group = ThreadFeedingSystem, Category = Warning)
+    PULLER_MOTOR_MALFUNCTION = 3005;
 
-    //The left loader motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    LEFT_LOADER_MOTOR_OVERCURRENT = 3006;
+    //Left loader motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    LEFT_LOADER_MOTOR_MALFUNCTION = 3006;
 
-    //The winder motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    WINDER_MOTOR_OVERCURRENT = 3007;
+    //Winder motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    WINDER_MOTOR_MALFUNCTION = 3007;
 
-    //The screw motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    SCREW_MOTOR_OVERCURRENT = 3008;
+    //Screw motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    SCREW_MOTOR_MALFUNCTION = 3008;
 
-    //The loading arm motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    LOADING_ARM_MOTOR_OVERCURRENT = 3009;
+    //Loading arm motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    LOADING_ARM_MOTOR_MALFUNCTION = 3009;
 
     //The feeder motor temperature is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
     FEEDER_MOTOR_OVERTEMPERATURE = 3010;
@@ -244,14 +244,14 @@ enum EventType
     //Screw travel failure. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
     SCREW_MOTOR_LIMIT_TIMEOUT = 3035;
 
-    //The winder dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    WINDER_DANCER_MOTOR_OVERCURRENT = 3036;
+    //Winder dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    WINDER_DANCER_MOTOR_MALFUNCTION = 3036;
 
-    //The puller dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    PULLER_DANCER_MOTOR_OVERCURRENT = 3037;
+    //Puller dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    PULLER_DANCER_MOTOR_MALFUNCTION = 3037;
 
-    //The feeder dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
-    FEEDER_DANCER_MOTOR_OVERCURRENT = 3038;
+    //Feeder dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
+    FEEDER_DANCER_MOTOR_MALFUNCTION = 3038;
 
     //The winder dancer motor temperature is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning)
     WINDER_DANCER_MOTOR_OVERTEMPERATURE = 3039;
@@ -292,8 +292,20 @@ enum EventType
     //Thread loading error. Cannot execute job (Group = ThreadFeedingSystem, Category = Error)
     THREAD_LOADING_ERROR = 3051;
 
-    //The dryer motor current is too high. Cannot execute job (Group = Dryer, Category = Warning)
-    DRYER_MOTOR_OVERCURRENT = 4000;
+    //Cannot communicate with BTSR. Cannot execute job (Group = ThreadFeedingSystem, Category = Error)
+    NO_COMMUNICATION_WITH_BTSR = 3052;
+
+    //BTSR malfunction. Cannot execute job. (Group = ThreadFeedingSystem, Category = Error)
+    BTSR_MALFUNCTION = 3053;
+
+    //Tension in BTSR is out of range. Cannot execute job (Group = ThreadFeedingSystem, Category = Error)
+    TENSION_IN_BTSR_OUT_OF_RANGE = 3054;
+
+    //Gripper malfunction. Thread caught in gripper. Cannot execute job (Group = ThreadFeedingSystem, Category = Error)
+    GRIPPER_MALFUNCTION = 3055;
+
+    //Dryer motor malfunction. Cannot execute job (Group = Dryer, Category = Warning)
+    DRYER_MOTOR_MALFUNCTION = 4000;
 
     //The dryer motor temperature is too high. Cannot execute jobs (Group = Dryer, Category = Warning)
     DRYER_MOTOR_OVERTEMPERATURE = 4001;
@@ -343,8 +355,8 @@ enum EventType
     //Dryer fan stopped. Cannot execute job (Group = Dryer, Category = Critical)
     DRYER_FAN_STOPPED = 4016;
 
-    //The current in dryer lid motor is too high. Cannot execute job (Group = Dryer, Category = Warning)
-    DRYER_LID_MOTOR_OVERCURRENT = 4017;
+    //Dryer lid motor malfunction. Cannot execute job (Group = Dryer, Category = Warning)
+    DRYER_LID_MOTOR_MALFUNCTION = 4017;
 
     //The temperature in the dryer lid motor is too high. Cannot execute job (Group = Dryer, Category = Warning)
     DRYER_LID_MOTOR_OVERTEMPERATURE = 4018;
@@ -451,8 +463,8 @@ enum EventType
     //Could not close the dyeing head cover. Cannot execute job  (Group = DyeingHead, Category = Error)
     DYEING_HEAD_COVER_CLOSE_TIMEOUT = 5030;
 
-    //The current in the dyeing head cover motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
-    DYEING_HEAD_COVER_MOTOR_OVERCURRENT = 5031;
+    //Dyeing head cover motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning)
+    DYEING_HEAD_COVER_MOTOR_MALFUNCTION = 5031;
 
     //The temperature in the dyeing head cover motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
     DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE = 5032;
@@ -463,8 +475,8 @@ enum EventType
     //The voltage in the dyeing head cover motor is too low. Cannot execute job (Group = DyeingHead, Category = Warning)
     DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE = 5034;
 
-    //The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
-    DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT = 5035;
+    //Dyeing head cleaning mechanism motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning)
+    DYEING_HEAD_CLEANING_MECHANISM_MOTOR_MALFUNCTION = 5035;
 
     //The temperature in the dyeing head cleaning mechanism motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
     DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE = 5036;
@@ -475,8 +487,8 @@ enum EventType
     //The voltage in dyeing head cleaning mechanism motor is too low. Cannot execute job (Group = DyeingHead, Category = Warning)
     DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE = 5038;
 
-    //The current in the dyeing head cleaning head motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
-    DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT = 5039;
+    //Dyeing head cleaning head motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning)
+    DYEING_HEAD_CLEANING_HEAD_MOTOR_MALFUNCTION = 5039;
 
     //The temperature in the dyeing head cleaning head motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning)
     DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE = 5040;
@@ -676,125 +688,125 @@ enum EventType
     //Mixer current loop break. Cannot execute job (Group = Mixer, Category = Error)
     MIXER_CURRENT_LOOP_BREAK = 6005;
 
-    //Overpressure in black dispenser . Cannot execute job (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical)
     DISPENSER_1_OVERPRESSURE = 7000;
 
-    //Overpressure in cyan dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_2_OVERPRESSURE = 7001;
 
-    //Overpressure in magenta dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_3_OVERPRESSURE = 7002;
 
-    //Overpressure in yellow dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_4_OVERPRESSURE = 7003;
 
-    //Overpressure in transparent ink dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_5_OVERPRESSURE = 7004;
 
-    //Overpressure in spot color 1 dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_6_OVERPRESSURE = 7005;
 
-    //Overpressure in cleaner dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job  (Group = Dispensers, Category = Critical)
     DISPENSER_7_OVERPRESSURE = 7006;
 
-    //Overpressure in lubricant  dispenser. Cannot execute job (Group = Dispensers, Category = Critical)
+    //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical)
     DISPENSER_8_OVERPRESSURE = 7007;
 
-    //The pressure in black dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_1_UNDERPRESSURE = 7008;
 
-    //The pressure in cyan dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_2_UNDERPRESSURE = 7009;
 
-    //The pressure in magenta dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_3_UNDERPRESSURE = 7010;
 
-    //The pressure in yellow dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_4_UNDERPRESSURE = 7011;
 
-    //The pressure in transparent ink dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_5_UNDERPRESSURE = 7012;
 
-    //The pressure in spot color 1 dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_6_UNDERPRESSURE = 7013;
 
-    //The pressure in cleaner dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_7_UNDERPRESSURE = 7014;
 
-    //The pressure in lubricant dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_8_UNDERPRESSURE = 7015;
 
-    //Black dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_1_EMPTY = 7016;
 
-    //Cyan dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_2_EMPTY = 7017;
 
-    //Magenta dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_3_EMPTY = 7018;
 
-    //Yellow dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_4_EMPTY = 7019;
 
-    //Transparent ink dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_5_EMPTY = 7020;
 
-    //Spot color 1 dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_6_EMPTY = 7021;
 
-    //Cleaner dispenser is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_7_EMPTY = 7022;
 
-    //Lubricant dispenser  is empty (Group = Dispensers, Category = Error)
+    //The @ dispenser is empty (Group = Dispensers, Category = Error)
     DISPENSER_8_EMPTY = 7023;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_1_REFILL_FAILURE = 7024;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_2_REFILL_FAILURE = 7025;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_3_REFILL_FAILURE = 7026;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_4_REFILL_FAILURE = 7027;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_5_REFILL_FAILURE = 7028;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_6_REFILL_FAILURE = 7029;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_7_REFILL_FAILURE = 7030;
 
-    //Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error)
+    //Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_8_REFILL_FAILURE = 7031;
 
-    //Black dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_1_MOTOR_OVERCURRENT = 7032;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_1_MOTOR_MALFUNCTION = 7032;
 
-    //Cyan dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_2_MOTOR_OVERCURRENT = 7033;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_2_MOTOR_MALFUNCTION = 7033;
 
-    //Magenta dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_3_MOTOR_OVERCURRENT = 7034;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_3_MOTOR_MALFUNCTION = 7034;
 
-    //Yellow dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_4_MOTOR_OVERCURRENT = 7035;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_4_MOTOR_MALFUNCTION = 7035;
 
-    //Transparent ink dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_5_MOTOR_OVERCURRENT = 7036;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_5_MOTOR_MALFUNCTION = 7036;
 
-    //Spot color 1 dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_6_MOTOR_OVERCURRENT = 7037;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_6_MOTOR_MALFUNCTION = 7037;
 
-    //Cleaner dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_7_MOTOR_OVERCURRENT = 7038;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_7_MOTOR_MALFUNCTION = 7038;
 
-    //Lubricant dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning)
-    DISPENSER_8_MOTOR_OVERCURRENT = 7039;
+    //Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning)
+    DISPENSER_8_MOTOR_MALFUNCTION = 7039;
 
     //Black dispenser motor temperature is too high. Cannot execute job (Group = Dispensers, Category = Warning)
     DISPENSER_1_MOTOR_OVERTEMPERATURE = 7040;
@@ -868,174 +880,222 @@ enum EventType
     //Lubricant dispenser motor voltage is too low. Cannot execute job (Group = Dispensers, Category = Warning)
     DISPENSER_8_MOTOR_UNDERVOLTAGE = 7063;
 
-    //Black dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_1_UPPER_HARD_LIMIT = 7064;
 
-    //Cyan dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_2_UPPER_HARD_LIMIT = 7065;
 
-    //Magenta dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_3_UPPER_HARD_LIMIT = 7066;
 
-    //Yellow dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_4_UPPER_HARD_LIMIT = 7067;
 
-    //Transparent ink dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_5_UPPER_HARD_LIMIT = 7068;
 
-    //Spot color 1 dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_6_UPPER_HARD_LIMIT = 7069;
 
-    //Cleaner dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_7_UPPER_HARD_LIMIT = 7070;
 
-    //Lubricant dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_8_UPPER_HARD_LIMIT = 7071;
 
-    //Black dispenser is at the  lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_1_LOWER_HARD_LIMIT = 7072;
 
-    //Cyan dispenser is at the  lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_2_LOWER_HARD_LIMIT = 7073;
 
-    //Magenta dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_3_LOWER_HARD_LIMIT = 7074;
 
-    //Yellow dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_4_LOWER_HARD_LIMIT = 7075;
 
-    //Transparent ink dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_5_LOWER_HARD_LIMIT = 7076;
 
-    //Spot color 1 dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_6_LOWER_HARD_LIMIT = 7077;
 
-    //Cleaner dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_7_LOWER_HARD_LIMIT = 7078;
 
-    //Lubricant dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error)
+    //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_8_LOWER_HARD_LIMIT = 7079;
 
-    //Pressure in black dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_1_HIGH_PRESSURE = 7080;
 
-    //Pressure in cyan dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_2_HIGH_PRESSURE = 7081;
 
-    //Pressure in magenta dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_3_HIGH_PRESSURE = 7082;
 
-    //Pressure in yellow dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_4_HIGH_PRESSURE = 7083;
 
-    //Pressure in transparent ink dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error)
     DISPENSER_5_HIGH_PRESSURE = 7084;
 
-    //Pressure in spot color 1 dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_6_HIGH_PRESSURE = 7085;
 
-    //Pressure in cleaner dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_7_HIGH_PRESSURE = 7086;
 
-    //Pressure in lubricant dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
+    //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error)
     DISPENSER_8_HIGH_PRESSURE = 7087;
 
-    //Black ink level is low (Group = InkDeliverySystem, Category = Warning)
+    //Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_9_OVERPRESSURE = 7088;
+
+    //Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_9_UNDERPRESSURE = 7089;
+
+    //Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_10_OVERPRESSURE = 7090;
+
+    //Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_10_UNDERPRESSURE = 7091;
+
+    //Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_9_MOTOR_1_MALFUNCTION = 7092;
+
+    //Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_9_MOTOR_2_MALFUNCTION = 7093;
+
+    //Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_10_MOTOR_1_MALFUNCTION = 7094;
+
+    //Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error)
+    DISPENSER_10_MOTOR_2_MALFUNCTION = 7095;
+
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_1_LOW_LEVEL = 8000;
 
-    //Cyan ink level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_2_LOW_LEVEL = 8001;
 
-    //Magenta ink level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_3_LOW_LEVEL = 8002;
 
-    //Yellow ink level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_4_LOW_LEVEL = 8003;
 
-    //Transparent ink level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_5_LOW_LEVEL = 8004;
 
-    //Spot color I level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_6_LOW_LEVEL = 8005;
 
-    //Cleaner level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_7_LOW_LEVEL = 8006;
 
-    //Lubricant level is low (Group = InkDeliverySystem, Category = Warning)
+    //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning)
     MID_TANK_8_LOW_LEVEL = 8007;
 
-    //Black ink is empty. Cannnot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_1_EMPTY = 8008;
 
-    //Cyan ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_2_EMPTY = 8009;
 
-    //Magenta ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_3_EMPTY = 8010;
 
-    //Yellow ink  is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink  is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_4_EMPTY = 8011;
 
-    //Transparent ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_5_EMPTY = 8012;
 
-    //Spot color I  is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_6_EMPTY = 8013;
 
-    //Cleaner is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_7_EMPTY = 8014;
 
-    //Lubricant is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_8_EMPTY = 8015;
 
-    //Black ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_1_OVERFLOW = 8016;
 
-    //Cyan ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_2_OVERFLOW = 8017;
 
-    //Magenta ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_3_OVERFLOW = 8018;
 
-    //Yellow ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_4_OVERFLOW = 8019;
 
-    //Transparent ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_5_OVERFLOW = 8020;
 
-    //Spot color 1 overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_6_OVERFLOW = 8021;
 
-    //Cleaner overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_7_OVERFLOW = 8022;
 
-    //Lubricant overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_8_OVERFLOW = 8023;
 
-    //Failed to fill black ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_1_FILL_TIMEOUT = 8024;
 
-    //Failed to fill cyan ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_2_FILL_TIMEOUT = 8025;
 
-    //Failed to fill magenta ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_3_FILL_TIMEOUT = 8026;
 
-    //Failed to fill yellow ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_4_FILL_TIMEOUT = 8027;
 
-    //Failed to fill transparent ink. Canot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_5_FILL_TIMEOUT = 8028;
 
-    //Failed to fill spot color 1 ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_6_FILL_TIMEOUT = 8029;
 
-    //Failed to fill cleaner. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_7_FILL_TIMEOUT = 8030;
 
-    //Failed to fill lubricant. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error)
     MID_TANK_8_FILL_TIMEOUT = 8031;
 
+    //Level of @ is low (Group = InkDeliverySystem, Category = Warning)
+    MID_TANK_9_LOW_LEVEL = 8032;
+
+    //The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_9_EMPTY = 8033;
+
+    //Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_9_OVERFLOW = 8034;
+
+    //Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_9_FILL_TIMEOUT = 8035;
+
+    //Level of @ is low (Group = InkDeliverySystem, Category = Warning)
+    MID_TANK_10_LOW_LEVEL = 8036;
+
+    //The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_10_EMPTY = 8037;
+
+    //Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_10_OVERFLOW = 8038;
+
+    //Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error)
+    MID_TANK_10_FILL_TIMEOUT = 8039;
+
     //Cannot detect air filter. Cannot execute job  (Group = WasteHandlingSystem, Category = Critical)
     AIR_FILTER_NOT_INSTALLED = 9000;
 
@@ -1105,10 +1165,10 @@ enum EventType
     //Cooler temperature is too low. Cannot execute job (Group = WasteHandlingSystem, Category = Error)
     COOLER_TEMPERATURE_TOO_LOW = 9022;
 
-    //Cannot detect ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Error)
+    //Cannot detect ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10000;
 
-    //Cannot identify ink cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Error)
+    //Cannot identify ink cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_RFID_TIMEOUT = 10001;
 
     //No waste cartridge in system. Cannot execute job. Please insert waste cartridge (Group = InkFillingSystem, Category = Error)
@@ -1117,40 +1177,40 @@ enum EventType
     //Both waste cartridges are full. Cannot execute job. Please replace waste cartridges (Group = InkFillingSystem, Category = Error)
     ALL_WASTE_CARTRIDGES_FULL = 10003;
 
-    //Cannot detect waste cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Error)
+    //Cannot detect waste cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10004;
 
-    //Cannot identify waste cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Error)
+    //Cannot identify waste cartridge. Cannot execute job  (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_RFID_TIMEOUT = 10005;
 
-    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error)
+    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10006;
 
-    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error)
+    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10007;
 
-    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error)
+    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10008;
 
-    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error)
+    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10009;
 
-    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error)
+    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_AUTHENTICATION_FAILED = 10010;
 
-    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error)
+    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_AUTHENTICATION_FAILED = 10011;
 
-    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error)
+    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_IS_BLOCKED = 10012;
 
-    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error)
+    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_IS_BLOCKED = 10013;
 
-    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error)
+    //Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
     INK_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10014;
 
-    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error)
+    //Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning)
     WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10015;
 
     //Ink in cartridge is expired. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning)
diff --git a/Software/PMR/Messages/Hardware/HardwareDispenserType.proto b/Software/PMR/Messages/Hardware/HardwareDispenserType.proto
index 21dc87530..908b910af 100644
--- a/Software/PMR/Messages/Hardware/HardwareDispenserType.proto
+++ b/Software/PMR/Messages/Hardware/HardwareDispenserType.proto
@@ -18,4 +18,8 @@ enum HardwareDispenserType
 
     StandardDispenser = 0;
 
+    LubricantDispenser = 1;
+
+    CleanerDispenser = 2;
+
 }