Integration of new DEV PC.

24 files changed, 384 insertions, 60 deletions

diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c
index 2d033e2a1..caf6b17a8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c
@@ -52,7 +52,7 @@ void   input_liquid__free_unpacked
   assert(message->base.descriptor == &input_liquid__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] =
 {
   {
     "LiquidType",
@@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "IsExtraInk",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(InputLiquid, has_isextraink),
+    offsetof(InputLiquid, isextraink),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Color",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputLiquid, has_color),
+    offsetof(InputLiquid, color),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned input_liquid__field_indices_by_name[] = {
   1,   /* field[1] = CalibrationData */
+  5,   /* field[5] = Color */
+  4,   /* field[4] = IsExtraInk */
   0,   /* field[0] = LiquidType */
   2,   /* field[2] = MaxNanoliterPerCentimeter */
   3,   /* field[3] = Volume */
@@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = {
 static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor input_liquid__descriptor =
 {
@@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor =
   "InputLiquid",
   "",
   sizeof(InputLiquid),
-  4,
+  6,
   input_liquid__field_descriptors,
   input_liquid__field_indices_by_name,
   1,  input_liquid__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h
index c2a47b166..75d257e35 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h
@@ -35,10 +35,14 @@ struct  _InputLiquid
   double maxnanoliterpercentimeter;
   protobuf_c_boolean has_volume;
   double volume;
+  protobuf_c_boolean has_isextraink;
+  protobuf_c_boolean isextraink;
+  protobuf_c_boolean has_color;
+  int32_t color;
 };
 #define INPUT_LIQUID__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
-    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* InputLiquid methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c
index d6d4117b7..e47246064 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
   { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
   { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
   { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
+  { "Violet", "LIQUID_TYPE__Violet", 10 },
+  { "Blue", "LIQUID_TYPE__Blue", 11 },
+  { "LightBlue", "LIQUID_TYPE__LightBlue", 12 },
+  { "Orange", "LIQUID_TYPE__Orange", 13 },
+  { "LightOrange", "LIQUID_TYPE__LightOrange", 14 },
+  { "Rubine", "LIQUID_TYPE__Rubine", 15 },
+  { "LightRubine", "LIQUID_TYPE__LightRubine", 16 },
+  { "Navy", "LIQUID_TYPE__Navy", 17 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 18}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] =
 {
   { "Black", 3 },
+  { "Blue", 11 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightBlue", 12 },
   { "LightCyan", 7 },
   { "LightMagenta", 8 },
+  { "LightOrange", 14 },
+  { "LightRubine", 16 },
   { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
+  { "Navy", 17 },
+  { "Orange", 13 },
+  { "Rubine", 15 },
   { "TransparentInk", 4 },
+  { "Violet", 10 },
   { "Yellow", 2 },
 };
 const ProtobufCEnumDescriptor liquid_type__descriptor =
@@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  10,
+  18,
   liquid_type__enum_values_by_number,
-  10,
+  18,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h
index eba52c4a7..c30bf0cd2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h
@@ -29,7 +29,15 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Cleaner = 6,
   LIQUID_TYPE__LightCyan = 7,
   LIQUID_TYPE__LightMagenta = 8,
-  LIQUID_TYPE__LightYellow = 9
+  LIQUID_TYPE__LightYellow = 9,
+  LIQUID_TYPE__Violet = 10,
+  LIQUID_TYPE__Blue = 11,
+  LIQUID_TYPE__LightBlue = 12,
+  LIQUID_TYPE__Orange = 13,
+  LIQUID_TYPE__LightOrange = 14,
+  LIQUID_TYPE__Rubine = 15,
+  LIQUID_TYPE__LightRubine = 16,
+  LIQUID_TYPE__Navy = 17
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;