Refactored ColorLab PMR Structs !

104 files changed, 6605 insertions, 1768 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index b3ae0ea82..6e039a824 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index f105194a9..e1cd1c455 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/PMR/Messages/ColorLab/CalibrationData.proto b/Software/PMR/Messages/ColorLab/CalibrationData.proto
index 0d32af8a2..9f94c1ffb 100644
--- a/Software/PMR/Messages/ColorLab/CalibrationData.proto
+++ b/Software/PMR/Messages/ColorLab/CalibrationData.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 import "CalibrationPoint.proto";
+import "LiquidType.proto";
 
 package Tango.PMR.ColorLab;
 option java_package = "com.twine.tango.pmr.colorlab";
@@ -8,5 +9,6 @@ option java_package = "com.twine.tango.pmr.colorlab";
 
 message CalibrationData
 {
-	repeated CalibrationPoint CalibrationPoints = 1;
+	LiquidType LiquidType = 1;
+	repeated CalibrationPoint CalibrationPoints = 2;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto
index 9b04af4f3..1c0ce472e 100644
--- a/Software/PMR/Messages/ColorLab/ConversionInput.proto
+++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto
@@ -3,17 +3,17 @@ syntax = "proto3";
 package Tango.PMR.ColorLab;
 option java_package = "com.twine.tango.pmr.colorlab";
 
-import "InputColor.proto";
-import "CalibrationData.proto";
+import "InputCoordinates.proto";
+import "ColorSpace.proto";
 
 message ConversionInput
 {
 	double ThreadL = 1;
 	double ThreadA = 2;
 	double ThreadB = 3;
-	InputColor Input = 4;
-	bytes ForwardData = 5;
-	bytes InverseData = 6;
-	CalibrationData CalibrationData = 7;
+	ColorSpace ColorSpace = 4;
+	InputCoordinates InputCoordinates = 5;
+	bytes ForwardData = 6;
+	bytes InverseData = 7;
 	double SegmentLength = 8;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/ConversionOutput.proto b/Software/PMR/Messages/ColorLab/ConversionOutput.proto
index ec8254b8d..9d53f28ba 100644
--- a/Software/PMR/Messages/ColorLab/ConversionOutput.proto
+++ b/Software/PMR/Messages/ColorLab/ConversionOutput.proto
@@ -3,10 +3,12 @@ syntax = "proto3";
 package Tango.PMR.ColorLab;
 option java_package = "com.twine.tango.pmr.colorlab";
 
-import "OutputColor.proto";
+import "OutputCoordinates.proto";
 
 message ConversionOutput
 {
-	repeated OutputColor Suggestions = 1;
-	bool OutOfGamut = 2;
+	repeated OutputCoordinates HiveCoordinates = 1;
+	repeated OutputCoordinates TripleCoordinates = 2;
+	OutputCoordinates SingleCoordinates = 3;
+	bool OutOfGamut = 5;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/InputColor.proto b/Software/PMR/Messages/ColorLab/InputColor.proto
deleted file mode 100644
index abc07d267..000000000
--- a/Software/PMR/Messages/ColorLab/InputColor.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-syntax = "proto3";
-
-import "ColorSpace.proto";
-
-package Tango.PMR.ColorLab;
-option java_package = "com.twine.tango.pmr.colorlab";
-
-
-message InputColor
-{
-	ColorSpace ColorSpace = 1;
-
-	double Length = 2;
-
-	int32 Red = 3;
-	int32 Green = 4;
-	int32 Blue = 5;
-
-	double Cyan = 6;
-	double Magenta = 7;
-	double Yellow = 8;
-	double Black = 9;
-
-	double L = 10;
-	double A = 11;
-	double B = 12;
-
-	double CV = 13;
-	double MV = 14;
-	double YV = 15;
-	double KV = 16;
-	double V4 = 17;
-	double V5 = 18;
-	double V6 = 19;
-	double V7 = 20;
-
-	int32 PantonCode = 21;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/InputCoordinates.proto b/Software/PMR/Messages/ColorLab/InputCoordinates.proto
new file mode 100644
index 000000000..bc2edffab
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/InputCoordinates.proto
@@ -0,0 +1,28 @@
+syntax = "proto3";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+import "InputLiquid.proto";
+
+message InputCoordinates
+{
+	double Length = 1;
+
+	int32 Red = 2;
+	int32 Green = 3;
+	int32 Blue = 4;
+
+	double Cyan = 5;
+	double Magenta = 6;
+	double Yellow = 7;
+	double Key = 8;
+
+	double L = 9;
+	double A = 10;
+	double B = 11;
+
+	int32 PantonCode = 12;
+
+	repeated InputLiquid InputLiquids = 13;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/InputLiquid.proto b/Software/PMR/Messages/ColorLab/InputLiquid.proto
new file mode 100644
index 000000000..add34e2eb
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/InputLiquid.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+import "LiquidType.proto";
+import "CalibrationData.proto";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+message InputLiquid
+{
+	LiquidType LiquidType = 1;
+	CalibrationData CalibrationData = 2;
+	double MaxNanoliterPerCentimeter = 3;
+	double Volume = 4;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/LiquidType.proto b/Software/PMR/Messages/ColorLab/LiquidType.proto
new file mode 100644
index 000000000..4f36b859f
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/LiquidType.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package Tango.PMR.ColorLab;
+
+option java_package = "com.twine.tango.pmr.colorlab";
+
+
+enum LiquidType
+{
+	Cyan = 0;
+	Magenta = 1;
+	Yellow = 2;
+	Black = 3;
+	TransparentInk = 4;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/OutputColor.proto b/Software/PMR/Messages/ColorLab/OutputColor.proto
deleted file mode 100644
index 3896648ae..000000000
--- a/Software/PMR/Messages/ColorLab/OutputColor.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.ColorLab;
-option java_package = "com.twine.tango.pmr.colorlab";
-
-
-message OutputColor
-{
-  	int32 Red = 1;
-  	int32 Green = 2;
-  	int32 Blue = 3;
-
-	double CV = 4;
-	double MV = 5;
-	double YV = 6;
-	double KV = 7;
-	double V4 = 8;
-	double V5 = 9;
-	double V6 = 10;
-	double V7 = 11;
-
-	double Length = 12;
-
-	int32 ProcessParametersTableIndex = 13;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/OutputCoordinates.proto b/Software/PMR/Messages/ColorLab/OutputCoordinates.proto
new file mode 100644
index 000000000..3a79deb15
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/OutputCoordinates.proto
@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+import "OutputLiquid.proto";
+
+message OutputCoordinates
+{
+  	int32 Red = 1;
+  	int32 Green = 2;
+  	int32 Blue = 3;
+
+  	repeated OutputLiquid OutputLiquids = 4;
+
+	int32 ProcessParametersTableIndex = 5;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/OutputLiquid.proto b/Software/PMR/Messages/ColorLab/OutputLiquid.proto
new file mode 100644
index 000000000..92db98dd1
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/OutputLiquid.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+import "LiquidType.proto";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+message OutputLiquid
+{
+	LiquidType LiquidType = 1;
+	double Volume = 4;
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
index 6dfb3c5b1..77c82573d 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
@@ -4,8 +4,11 @@
 #include "PMR\ColorLab/ColorSpace.pb-c.h"
 #include "PMR\ColorLab/ConversionInput.pb-c.h"
 #include "PMR\ColorLab/ConversionOutput.pb-c.h"
-#include "PMR\ColorLab/InputColor.pb-c.h"
-#include "PMR\ColorLab/OutputColor.pb-c.h"
+#include "PMR\ColorLab/InputCoordinates.pb-c.h"
+#include "PMR\ColorLab/OutputCoordinates.pb-c.h"
+#include "PMR\ColorLab/OutputLiquid.pb-c.h"
+#include "PMR\ColorLab/InputLiquid.pb-c.h"
+#include "PMR\ColorLab/LiquidType.pb-c.h"
 
 Tango::ColorLib::ColorConverter::ColorConverter()
 {
@@ -18,84 +21,146 @@ Tango::ColorLib::ColorConverter::~ColorConverter()
 
 }
 
-size_t Tango::ColorLib::ColorConverter::ForwardConvert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer)
+size_t Tango::ColorLib::ColorConverter::Convert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer)
 {
-	//Get Input...
-	ConversionInput* input = conversion_input__unpack(NULL, input_buffer_size, input_buffer);
+	//Unpack conversion input...
+	ConversionInput* conversionInput = conversion_input__unpack(NULL, input_buffer_size, input_buffer);
 
 	//Initialize Output...
+	ConversionOutput conversionOutput = CONVERSION_OUTPUT__INIT;
 
-	ConversionOutput output = CONVERSION_OUTPUT__INIT;
+	//The request is for RGB to Volume...
+	if (conversionInput->colorspace == COLOR_SPACE__RGB)
+	{
+		//Get RGB values...
+		int r = conversionInput->inputcoordinates->red;
+		int g = conversionInput->inputcoordinates->green;
+		int b = conversionInput->inputcoordinates->blue;
 
-	//How To Fill...
+		//iterate over input liquids...
+		for (size_t i = 0; i < conversionInput->inputcoordinates->n_inputliquids; i++)
+		{
+			InputLiquid* inputLiquid = conversionInput->inputcoordinates->inputliquids[i];
 
-	int suggestion_count = 3;
+			//Get cyan liquid for example...
+			if (inputLiquid->liquidtype == LIQUID_TYPE__Cyan)
+			{
+				//Get liquid max nl per cm.
+				double maxNlPerCM = inputLiquid->maxnanoliterpercentimeter;
 
-	OutputColor** suggestions = (OutputColor**)malloc(sizeof(OutputColor*) * suggestion_count);
+				//Get liquid calibration data.
+				CalibrationData* calibrationData = inputLiquid->calibrationdata;
 
-	for (size_t i = 0; i < suggestion_count; i++)
-	{
-		OutputColor* color = (OutputColor*)malloc(sizeof(OutputColor));
-		output_color__init(color);
+				//Iterate over calibration points..
+				for (size_t j = 0; j < calibrationData->n_calibrationpoints; j++)
+				{
+					//Calibration Point
+					CalibrationPoint* point = calibrationData->calibrationpoints[j];
+					
+					double x = point->x;
+					double y = point->y;
+				}
+			}
+		}
 
-		color->red = 1;
-		color->green = 2;
-		color->blue = 3;
+		//Set conversion output with proper volumes...
 
-		color->has_red = true;
-		color->has_green = true;
-		color->has_blue = true;
+		//Set Cyan liquid volume...
+		OutputLiquid cyanLiquid = OUTPUT_LIQUID__INIT;
+		cyanLiquid.has_volume = true;
+		cyanLiquid.has_liquidtype = true;
+		cyanLiquid.liquidtype = LIQUID_TYPE__Cyan;
+		cyanLiquid.volume = 20;
 
-		suggestions[i] = color;
-	}
+		//Set Magenta liquid volume...
+		OutputLiquid magentaLiquid = OUTPUT_LIQUID__INIT;
+		magentaLiquid.has_volume = true;
+		magentaLiquid.has_liquidtype = true;
+		magentaLiquid.liquidtype = LIQUID_TYPE__Magenta;
+		magentaLiquid.volume = 30;
 
-	output.suggestions = suggestions;
-	output.n_suggestions = suggestion_count;
+		OutputLiquid** outputLiquids = (OutputLiquid**)malloc(sizeof(OutputLiquid*) * 2);
 
-	//Generate Output...
+		//Add cyan and magenta to output liquids array.
+		outputLiquids[0] = &cyanLiquid;
+		outputLiquids[1] = &magentaLiquid;
 
-	output_buffer = (uint8_t*)malloc(conversion_output__get_packed_size(&output));
+		conversionOutput.singlecoordinates->outputliquids = outputLiquids;
+	}
 
-	return conversion_output__pack(&output, output_buffer);
-}
 
 
+	//The request is for volumes to RGB...
+	else if (conversionInput->colorspace = COLOR_SPACE__Volume)
+	{
+		//iterate over input liquids...
+		for (size_t i = 0; i < conversionInput->inputcoordinates->n_inputliquids; i++)
+		{
+			InputLiquid* inputLiquid = conversionInput->inputcoordinates->inputliquids[i];
 
+			//Get cyan liquid for example...
+			if (inputLiquid->liquidtype == LIQUID_TYPE__Cyan)
+			{
+				//Get liquid max nl per cm.
+				double maxNlPerCM = inputLiquid->maxnanoliterpercentimeter;
 
+				//Get liquid volume.
+				double volume = inputLiquid->volume;
 
-size_t Tango::ColorLib::ColorConverter::InverseConvert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer)
-{
-	//Get Input...
-	ConversionInput* input = conversion_input__unpack(NULL, input_buffer_size, input_buffer);
+				//Get liquid calibration data.
+				CalibrationData* calibrationData = inputLiquid->calibrationdata;
 
-	//Initialize Output...
+				//Iterate over calibration points..
+				for (size_t j = 0; j < calibrationData->n_calibrationpoints; j++)
+				{
+					//Calibration Point
+					CalibrationPoint* point = calibrationData->calibrationpoints[j];
 
-	ConversionOutput output = CONVERSION_OUTPUT__INIT;
+					double x = point->x;
+					double y = point->y;
+				}
+			}
+			else if (inputLiquid->liquidtype == LIQUID_TYPE__Magenta)
+			{
+				//Same as above...
+			}
+		}
 
-	//How To Fill...
+		//Set conversion output (single) with proper RGB values...
+		OutputCoordinates outputCoords = OUTPUT_COORDINATES__INIT;
+		outputCoords.has_red = true;
+		outputCoords.has_green = true;
+		outputCoords.has_blue = true;
+		outputCoords.red = 50;
+		outputCoords.green = 100;
+		outputCoords.blue = 150;
 
-	int suggestion_count = 3;
+		conversionOutput.singlecoordinates = &outputCoords;
 
-	OutputColor** suggestions = (OutputColor**)malloc(sizeof(OutputColor*) * suggestion_count);
+		//Set conversion output (hive) with proper RGB values...
 
-	for (size_t i = 0; i < suggestion_count; i++)
-	{
-		OutputColor* color = (OutputColor*)malloc(sizeof(OutputColor));
-		output_color__init(color);
+		int hiveCellCount = 10;
 
-		color->red = 1;
-		color->green = 2;
-		color->blue = 3;
+		OutputCoordinates** hiveCoordinates = (OutputCoordinates**)malloc(sizeof(OutputCoordinates*) * hiveCellCount);
 
-		suggestions[i] = color;
-	}
+		for (size_t i = 0; i < hiveCellCount; i++)
+		{
+			OutputCoordinates cellCoords = OUTPUT_COORDINATES__INIT;
+			cellCoords.has_red = true;
+			cellCoords.has_green = true;
+			cellCoords.has_blue = true;
+			cellCoords.red = 10;
+			cellCoords.green = 20;
+			cellCoords.blue = 30;
 
-	output.suggestions = suggestions;
-	output.n_suggestions = suggestion_count;
+			hiveCoordinates[i] = &cellCoords;
+		}
 
-	//Generate Output...
+		conversionOutput.hivecoordinates = hiveCoordinates;
+	}
 
-	output_buffer = (uint8_t*)malloc(conversion_output__get_packed_size(&output));
+	//Pack output...
+	output_buffer = (uint8_t*)malloc(conversion_output__get_packed_size(&conversionOutput));
 
-	return conversion_output__pack(&output, output_buffer);
+	return conversion_output__pack(&conversionOutput, output_buffer);
 }
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.h b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.h
index 97995340d..165f7f733 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.h
@@ -11,8 +11,7 @@ namespace Tango
 		public:
 			ColorConverter();
 			~ColorConverter();
-			size_t ForwardConvert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer);
-			size_t InverseConvert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer);
+			size_t Convert(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer);
 		};
 	}
 }
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Exports.cpp b/Software/Visual_Studio/Native/Tango.ColorLib/Exports.cpp
index 27790818b..db94a6609 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Exports.cpp
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Exports.cpp
@@ -19,12 +19,6 @@ extern "C" EXPORT_API size_t __cdecl Calculate(uint8_t* request_buffer, size_t r
 extern "C" EXPORT_API size_t __cdecl ForwardConvert(uint8_t* input_buffer, size_t input_buffer_size, uint8_t*& output_buffer)
 {
 	ColorConverter converter;
-	return converter.ForwardConvert(input_buffer, input_buffer_size, output_buffer);
-}
-
-extern "C" EXPORT_API size_t __cdecl InverseConvert(uint8_t* input_buffer, size_t input_buffer_size, uint8_t*& output_buffer)
-{
-	ColorConverter converter;
-	return converter.InverseConvert(input_buffer, input_buffer_size, output_buffer);
+	return converter.Convert(input_buffer, input_buffer_size, output_buffer);
 }
 
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.c
index 16d4bba56..981988d99 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.c
@@ -52,11 +52,23 @@ void   calibration_data__free_unpacked
   assert(message->base.descriptor == &calibration_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor calibration_data__field_descriptors[1] =
+static const ProtobufCFieldDescriptor calibration_data__field_descriptors[2] =
 {
   {
-    "CalibrationPoints",
+    "LiquidType",
     1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(CalibrationData, has_liquidtype),
+    offsetof(CalibrationData, liquidtype),
+    &liquid_type__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "CalibrationPoints",
+    2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(CalibrationData, n_calibrationpoints),
@@ -68,12 +80,13 @@ static const ProtobufCFieldDescriptor calibration_data__field_descriptors[1] =
   },
 };
 static const unsigned calibration_data__field_indices_by_name[] = {
-  0,   /* field[0] = CalibrationPoints */
+  1,   /* field[1] = CalibrationPoints */
+  0,   /* field[0] = LiquidType */
 };
 static const ProtobufCIntRange calibration_data__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 1 }
+  { 0, 2 }
 };
 const ProtobufCMessageDescriptor calibration_data__descriptor =
 {
@@ -83,7 +96,7 @@ const ProtobufCMessageDescriptor calibration_data__descriptor =
   "CalibrationData",
   "",
   sizeof(CalibrationData),
-  1,
+  2,
   calibration_data__field_descriptors,
   calibration_data__field_indices_by_name,
   1,  calibration_data__number_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.h
index 993056a04..ccecc327e 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/CalibrationData.pb-c.h
@@ -15,6 +15,7 @@ PROTOBUF_C__BEGIN_DECLS
 #endif
 
 #include "CalibrationPoint.pb-c.h"
+#include "LiquidType.pb-c.h"
 
 typedef struct _CalibrationData CalibrationData;
 
@@ -27,12 +28,14 @@ typedef struct _CalibrationData CalibrationData;
 struct  _CalibrationData
 {
   ProtobufCMessage base;
+  protobuf_c_boolean has_liquidtype;
+  LiquidType liquidtype;
   size_t n_calibrationpoints;
   CalibrationPoint **calibrationpoints;
 };
 #define CALIBRATION_DATA__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&calibration_data__descriptor) \
-    , 0,NULL }
+    , 0, LIQUID_TYPE__Cyan, 0,NULL }
 
 
 /* CalibrationData methods */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
index 7fbeb8d03..a6221c8ba 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
@@ -91,20 +91,32 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[8] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "Input",
+    "ColorSpace",
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(ConversionInput, has_colorspace),
+    offsetof(ConversionInput, colorspace),
+    &color_space__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "InputCoordinates",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    offsetof(ConversionInput, input),
-    &input_color__descriptor,
+    offsetof(ConversionInput, inputcoordinates),
+    &input_coordinates__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
     "ForwardData",
-    5,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BYTES,
     offsetof(ConversionInput, has_forwarddata),
@@ -116,7 +128,7 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[8] =
   },
   {
     "InverseData",
-    6,
+    7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BYTES,
     offsetof(ConversionInput, has_inversedata),
@@ -127,18 +139,6 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[8] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "CalibrationData",
-    7,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(ConversionInput, calibrationdata),
-    &calibration_data__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
     "SegmentLength",
     8,
     PROTOBUF_C_LABEL_OPTIONAL,
@@ -152,10 +152,10 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[8] =
   },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
-  6,   /* field[6] = CalibrationData */
-  4,   /* field[4] = ForwardData */
-  3,   /* field[3] = Input */
-  5,   /* field[5] = InverseData */
+  3,   /* field[3] = ColorSpace */
+  5,   /* field[5] = ForwardData */
+  4,   /* field[4] = InputCoordinates */
+  6,   /* field[6] = InverseData */
   7,   /* field[7] = SegmentLength */
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
index 101f82b7d..6b929033a 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
@@ -14,8 +14,8 @@ 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 "InputColor.pb-c.h"
-#include "CalibrationData.pb-c.h"
+#include "InputCoordinates.pb-c.h"
+#include "ColorSpace.pb-c.h"
 
 typedef struct _ConversionInput ConversionInput;
 
@@ -34,18 +34,19 @@ struct  _ConversionInput
   double threada;
   protobuf_c_boolean has_threadb;
   double threadb;
-  InputColor *input;
+  protobuf_c_boolean has_colorspace;
+  ColorSpace colorspace;
+  InputCoordinates *inputcoordinates;
   protobuf_c_boolean has_forwarddata;
   ProtobufCBinaryData forwarddata;
   protobuf_c_boolean has_inversedata;
   ProtobufCBinaryData inversedata;
-  CalibrationData *calibrationdata;
   protobuf_c_boolean has_segmentlength;
   double segmentlength;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0 }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.c
index 224f4c973..bfc40f0a3 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.c
@@ -52,23 +52,47 @@ void   conversion_output__free_unpacked
   assert(message->base.descriptor == &conversion_output__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_output__field_descriptors[2] =
+static const ProtobufCFieldDescriptor conversion_output__field_descriptors[4] =
 {
   {
-    "Suggestions",
+    "HiveCoordinates",
     1,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    offsetof(ConversionOutput, n_suggestions),
-    offsetof(ConversionOutput, suggestions),
-    &output_color__descriptor,
+    offsetof(ConversionOutput, n_hivecoordinates),
+    offsetof(ConversionOutput, hivecoordinates),
+    &output_coordinates__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "OutOfGamut",
+    "TripleCoordinates",
     2,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(ConversionOutput, n_triplecoordinates),
+    offsetof(ConversionOutput, triplecoordinates),
+    &output_coordinates__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "SingleCoordinates",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_MESSAGE,
+    0,   /* quantifier_offset */
+    offsetof(ConversionOutput, singlecoordinates),
+    &output_coordinates__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "OutOfGamut",
+    5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(ConversionOutput, has_outofgamut),
@@ -80,13 +104,16 @@ static const ProtobufCFieldDescriptor conversion_output__field_descriptors[2] =
   },
 };
 static const unsigned conversion_output__field_indices_by_name[] = {
-  1,   /* field[1] = OutOfGamut */
-  0,   /* field[0] = Suggestions */
+  0,   /* field[0] = HiveCoordinates */
+  3,   /* field[3] = OutOfGamut */
+  2,   /* field[2] = SingleCoordinates */
+  1,   /* field[1] = TripleCoordinates */
 };
-static const ProtobufCIntRange conversion_output__number_ranges[1 + 1] =
+static const ProtobufCIntRange conversion_output__number_ranges[2 + 1] =
 {
   { 1, 0 },
-  { 0, 2 }
+  { 5, 3 },
+  { 0, 4 }
 };
 const ProtobufCMessageDescriptor conversion_output__descriptor =
 {
@@ -96,10 +123,10 @@ const ProtobufCMessageDescriptor conversion_output__descriptor =
   "ConversionOutput",
   "",
   sizeof(ConversionOutput),
-  2,
+  4,
   conversion_output__field_descriptors,
   conversion_output__field_indices_by_name,
-  1,  conversion_output__number_ranges,
+  2,  conversion_output__number_ranges,
   (ProtobufCMessageInit) conversion_output__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.h
index 7830ec580..0c58721db 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionOutput.pb-c.h
@@ -14,7 +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 "OutputColor.pb-c.h"
+#include "OutputCoordinates.pb-c.h"
 
 typedef struct _ConversionOutput ConversionOutput;
 
@@ -27,14 +27,17 @@ typedef struct _ConversionOutput ConversionOutput;
 struct  _ConversionOutput
 {
   ProtobufCMessage base;
-  size_t n_suggestions;
-  OutputColor **suggestions;
+  size_t n_hivecoordinates;
+  OutputCoordinates **hivecoordinates;
+  size_t n_triplecoordinates;
+  OutputCoordinates **triplecoordinates;
+  OutputCoordinates *singlecoordinates;
   protobuf_c_boolean has_outofgamut;
   protobuf_c_boolean outofgamut;
 };
 #define CONVERSION_OUTPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_output__descriptor) \
-    , 0,NULL, 0, 0 }
+    , 0,NULL, 0,NULL, NULL, 0, 0 }
 
 
 /* ConversionOutput methods */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputColor.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputColor.pb-c.c
deleted file mode 100644
index 2e5424bd8..000000000
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputColor.pb-c.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: InputColor.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "InputColor.pb-c.h"
-void   input_color__init
-                     (InputColor         *message)
-{
-  static const InputColor init_value = INPUT_COLOR__INIT;
-  *message = init_value;
-}
-size_t input_color__get_packed_size
-                     (const InputColor *message)
-{
-  assert(message->base.descriptor == &input_color__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t input_color__pack
-                     (const InputColor *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &input_color__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t input_color__pack_to_buffer
-                     (const InputColor *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &input_color__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-InputColor *
-       input_color__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (InputColor *)
-     protobuf_c_message_unpack (&input_color__descriptor,
-                                allocator, len, data);
-}
-void   input_color__free_unpacked
-                     (InputColor *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &input_color__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor input_color__field_descriptors[21] =
-{
-  {
-    "ColorSpace",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(InputColor, has_colorspace),
-    offsetof(InputColor, colorspace),
-    &color_space__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Length",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_length),
-    offsetof(InputColor, length),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Red",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(InputColor, has_red),
-    offsetof(InputColor, red),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Green",
-    4,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(InputColor, has_green),
-    offsetof(InputColor, green),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Blue",
-    5,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(InputColor, has_blue),
-    offsetof(InputColor, blue),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Cyan",
-    6,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_cyan),
-    offsetof(InputColor, cyan),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Magenta",
-    7,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_magenta),
-    offsetof(InputColor, magenta),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Yellow",
-    8,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_yellow),
-    offsetof(InputColor, yellow),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "Black",
-    9,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_black),
-    offsetof(InputColor, black),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "L",
-    10,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_l),
-    offsetof(InputColor, l),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "A",
-    11,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_a),
-    offsetof(InputColor, a),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "B",
-    12,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_b),
-    offsetof(InputColor, b),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "CV",
-    13,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_cv),
-    offsetof(InputColor, cv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "MV",
-    14,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_mv),
-    offsetof(InputColor, mv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "YV",
-    15,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_yv),
-    offsetof(InputColor, yv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "KV",
-    16,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_kv),
-    offsetof(InputColor, kv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "V4",
-    17,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_v4),
-    offsetof(InputColor, v4),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "V5",
-    18,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_v5),
-    offsetof(InputColor, v5),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "V6",
-    19,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_v6),
-    offsetof(InputColor, v6),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "V7",
-    20,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(InputColor, has_v7),
-    offsetof(InputColor, v7),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "PantonCode",
-    21,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(InputColor, has_pantoncode),
-    offsetof(InputColor, pantoncode),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned input_color__field_indices_by_name[] = {
-  10,   /* field[10] = A */
-  11,   /* field[11] = B */
-  8,   /* field[8] = Black */
-  4,   /* field[4] = Blue */
-  12,   /* field[12] = CV */
-  0,   /* field[0] = ColorSpace */
-  5,   /* field[5] = Cyan */
-  3,   /* field[3] = Green */
-  15,   /* field[15] = KV */
-  9,   /* field[9] = L */
-  1,   /* field[1] = Length */
-  13,   /* field[13] = MV */
-  6,   /* field[6] = Magenta */
-  20,   /* field[20] = PantonCode */
-  2,   /* field[2] = Red */
-  16,   /* field[16] = V4 */
-  17,   /* field[17] = V5 */
-  18,   /* field[18] = V6 */
-  19,   /* field[19] = V7 */
-  14,   /* field[14] = YV */
-  7,   /* field[7] = Yellow */
-};
-static const ProtobufCIntRange input_color__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 21 }
-};
-const ProtobufCMessageDescriptor input_color__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "InputColor",
-  "InputColor",
-  "InputColor",
-  "",
-  sizeof(InputColor),
-  21,
-  input_color__field_descriptors,
-  input_color__field_indices_by_name,
-  1,  input_color__number_ranges,
-  (ProtobufCMessageInit) input_color__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputColor.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputCoordinates.pb-c.c
index 35d507fac..a12759a89 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputColor.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputCoordinates.pb-c.c
@@ -1,248 +1,248 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: OutputColor.proto */
+/* Generated from: InputCoordinates.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "OutputColor.pb-c.h"
-void   output_color__init
-                     (OutputColor         *message)
+#include "InputCoordinates.pb-c.h"
+void   input_coordinates__init
+                     (InputCoordinates         *message)
 {
-  static const OutputColor init_value = OUTPUT_COLOR__INIT;
+  static const InputCoordinates init_value = INPUT_COORDINATES__INIT;
   *message = init_value;
 }
-size_t output_color__get_packed_size
-                     (const OutputColor *message)
+size_t input_coordinates__get_packed_size
+                     (const InputCoordinates *message)
 {
-  assert(message->base.descriptor == &output_color__descriptor);
+  assert(message->base.descriptor == &input_coordinates__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t output_color__pack
-                     (const OutputColor *message,
+size_t input_coordinates__pack
+                     (const InputCoordinates *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &output_color__descriptor);
+  assert(message->base.descriptor == &input_coordinates__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t output_color__pack_to_buffer
-                     (const OutputColor *message,
+size_t input_coordinates__pack_to_buffer
+                     (const InputCoordinates *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &output_color__descriptor);
+  assert(message->base.descriptor == &input_coordinates__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-OutputColor *
-       output_color__unpack
+InputCoordinates *
+       input_coordinates__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (OutputColor *)
-     protobuf_c_message_unpack (&output_color__descriptor,
+  return (InputCoordinates *)
+     protobuf_c_message_unpack (&input_coordinates__descriptor,
                                 allocator, len, data);
 }
-void   output_color__free_unpacked
-                     (OutputColor *message,
+void   input_coordinates__free_unpacked
+                     (InputCoordinates *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &output_color__descriptor);
+  assert(message->base.descriptor == &input_coordinates__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor output_color__field_descriptors[13] =
+static const ProtobufCFieldDescriptor input_coordinates__field_descriptors[13] =
 {
   {
-    "Red",
+    "Length",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(OutputColor, has_red),
-    offsetof(OutputColor, red),
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(InputCoordinates, has_length),
+    offsetof(InputCoordinates, length),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "Green",
+    "Red",
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    offsetof(OutputColor, has_green),
-    offsetof(OutputColor, green),
+    offsetof(InputCoordinates, has_red),
+    offsetof(InputCoordinates, red),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "Blue",
+    "Green",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    offsetof(OutputColor, has_blue),
-    offsetof(OutputColor, blue),
+    offsetof(InputCoordinates, has_green),
+    offsetof(InputCoordinates, green),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "CV",
+    "Blue",
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_cv),
-    offsetof(OutputColor, cv),
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputCoordinates, has_blue),
+    offsetof(InputCoordinates, blue),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "MV",
+    "Cyan",
     5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_mv),
-    offsetof(OutputColor, mv),
+    offsetof(InputCoordinates, has_cyan),
+    offsetof(InputCoordinates, cyan),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "YV",
+    "Magenta",
     6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_yv),
-    offsetof(OutputColor, yv),
+    offsetof(InputCoordinates, has_magenta),
+    offsetof(InputCoordinates, magenta),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "KV",
+    "Yellow",
     7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_kv),
-    offsetof(OutputColor, kv),
+    offsetof(InputCoordinates, has_yellow),
+    offsetof(InputCoordinates, yellow),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "V4",
+    "Key",
     8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_v4),
-    offsetof(OutputColor, v4),
+    offsetof(InputCoordinates, has_key),
+    offsetof(InputCoordinates, key),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "V5",
+    "L",
     9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_v5),
-    offsetof(OutputColor, v5),
+    offsetof(InputCoordinates, has_l),
+    offsetof(InputCoordinates, l),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "V6",
+    "A",
     10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_v6),
-    offsetof(OutputColor, v6),
+    offsetof(InputCoordinates, has_a),
+    offsetof(InputCoordinates, a),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "V7",
+    "B",
     11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_v7),
-    offsetof(OutputColor, v7),
+    offsetof(InputCoordinates, has_b),
+    offsetof(InputCoordinates, b),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "Length",
+    "PantonCode",
     12,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(OutputColor, has_length),
-    offsetof(OutputColor, length),
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(InputCoordinates, has_pantoncode),
+    offsetof(InputCoordinates, pantoncode),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "ProcessParametersTableIndex",
+    "InputLiquids",
     13,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(OutputColor, has_processparameterstableindex),
-    offsetof(OutputColor, processparameterstableindex),
-    NULL,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(InputCoordinates, n_inputliquids),
+    offsetof(InputCoordinates, inputliquids),
+    &input_liquid__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned output_color__field_indices_by_name[] = {
-  2,   /* field[2] = Blue */
-  3,   /* field[3] = CV */
-  1,   /* field[1] = Green */
-  6,   /* field[6] = KV */
-  11,   /* field[11] = Length */
-  4,   /* field[4] = MV */
-  12,   /* field[12] = ProcessParametersTableIndex */
-  0,   /* field[0] = Red */
-  7,   /* field[7] = V4 */
-  8,   /* field[8] = V5 */
-  9,   /* field[9] = V6 */
-  10,   /* field[10] = V7 */
-  5,   /* field[5] = YV */
+static const unsigned input_coordinates__field_indices_by_name[] = {
+  9,   /* field[9] = A */
+  10,   /* field[10] = B */
+  3,   /* field[3] = Blue */
+  4,   /* field[4] = Cyan */
+  2,   /* field[2] = Green */
+  12,   /* field[12] = InputLiquids */
+  7,   /* field[7] = Key */
+  8,   /* field[8] = L */
+  0,   /* field[0] = Length */
+  5,   /* field[5] = Magenta */
+  11,   /* field[11] = PantonCode */
+  1,   /* field[1] = Red */
+  6,   /* field[6] = Yellow */
 };
-static const ProtobufCIntRange output_color__number_ranges[1 + 1] =
+static const ProtobufCIntRange input_coordinates__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 13 }
 };
-const ProtobufCMessageDescriptor output_color__descriptor =
+const ProtobufCMessageDescriptor input_coordinates__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "OutputColor",
-  "OutputColor",
-  "OutputColor",
+  "InputCoordinates",
+  "InputCoordinates",
+  "InputCoordinates",
   "",
-  sizeof(OutputColor),
+  sizeof(InputCoordinates),
   13,
-  output_color__field_descriptors,
-  output_color__field_indices_by_name,
-  1,  output_color__number_ranges,
-  (ProtobufCMessageInit) output_color__init,
+  input_coordinates__field_descriptors,
+  input_coordinates__field_indices_by_name,
+  1,  input_coordinates__number_ranges,
+  (ProtobufCMessageInit) input_coordinates__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputColor.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputCoordinates.pb-c.h
index d9f67383a..0b159cd59 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputColor.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputCoordinates.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: InputColor.proto */
+/* Generated from: InputCoordinates.proto */
 
-#ifndef PROTOBUF_C_InputColor_2eproto__INCLUDED
-#define PROTOBUF_C_InputColor_2eproto__INCLUDED
+#ifndef PROTOBUF_C_InputCoordinates_2eproto__INCLUDED
+#define PROTOBUF_C_InputCoordinates_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -14,9 +14,9 @@ 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 "ColorSpace.pb-c.h"
+#include "InputLiquid.pb-c.h"
 
-typedef struct _InputColor InputColor;
+typedef struct _InputCoordinates InputCoordinates;
 
 
 /* --- enums --- */
@@ -24,11 +24,9 @@ typedef struct _InputColor InputColor;
 
 /* --- messages --- */
 
-struct  _InputColor
+struct  _InputCoordinates
 {
   ProtobufCMessage base;
-  protobuf_c_boolean has_colorspace;
-  ColorSpace colorspace;
   protobuf_c_boolean has_length;
   double length;
   protobuf_c_boolean has_red;
@@ -43,61 +41,47 @@ struct  _InputColor
   double magenta;
   protobuf_c_boolean has_yellow;
   double yellow;
-  protobuf_c_boolean has_black;
-  double black;
+  protobuf_c_boolean has_key;
+  double key;
   protobuf_c_boolean has_l;
   double l;
   protobuf_c_boolean has_a;
   double a;
   protobuf_c_boolean has_b;
   double b;
-  protobuf_c_boolean has_cv;
-  double cv;
-  protobuf_c_boolean has_mv;
-  double mv;
-  protobuf_c_boolean has_yv;
-  double yv;
-  protobuf_c_boolean has_kv;
-  double kv;
-  protobuf_c_boolean has_v4;
-  double v4;
-  protobuf_c_boolean has_v5;
-  double v5;
-  protobuf_c_boolean has_v6;
-  double v6;
-  protobuf_c_boolean has_v7;
-  double v7;
   protobuf_c_boolean has_pantoncode;
   int32_t pantoncode;
+  size_t n_inputliquids;
+  InputLiquid **inputliquids;
 };
-#define INPUT_COLOR__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&input_color__descriptor) \
-    , 0, COLOR_SPACE__Volume, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+#define INPUT_COORDINATES__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&input_coordinates__descriptor) \
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,NULL }
 
 
-/* InputColor methods */
-void   input_color__init
-                     (InputColor         *message);
-size_t input_color__get_packed_size
-                     (const InputColor   *message);
-size_t input_color__pack
-                     (const InputColor   *message,
+/* InputCoordinates methods */
+void   input_coordinates__init
+                     (InputCoordinates         *message);
+size_t input_coordinates__get_packed_size
+                     (const InputCoordinates   *message);
+size_t input_coordinates__pack
+                     (const InputCoordinates   *message,
                       uint8_t             *out);
-size_t input_color__pack_to_buffer
-                     (const InputColor   *message,
+size_t input_coordinates__pack_to_buffer
+                     (const InputCoordinates   *message,
                       ProtobufCBuffer     *buffer);
-InputColor *
-       input_color__unpack
+InputCoordinates *
+       input_coordinates__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   input_color__free_unpacked
-                     (InputColor *message,
+void   input_coordinates__free_unpacked
+                     (InputCoordinates *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*InputColor_Closure)
-                 (const InputColor *message,
+typedef void (*InputCoordinates_Closure)
+                 (const InputCoordinates *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -105,9 +89,9 @@ typedef void (*InputColor_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor input_color__descriptor;
+extern const ProtobufCMessageDescriptor input_coordinates__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_InputColor_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_InputCoordinates_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.c
new file mode 100644
index 000000000..2d033e2a1
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.c
@@ -0,0 +1,131 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: InputLiquid.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "InputLiquid.pb-c.h"
+void   input_liquid__init
+                     (InputLiquid         *message)
+{
+  static const InputLiquid init_value = INPUT_LIQUID__INIT;
+  *message = init_value;
+}
+size_t input_liquid__get_packed_size
+                     (const InputLiquid *message)
+{
+  assert(message->base.descriptor == &input_liquid__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t input_liquid__pack
+                     (const InputLiquid *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &input_liquid__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t input_liquid__pack_to_buffer
+                     (const InputLiquid *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &input_liquid__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+InputLiquid *
+       input_liquid__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (InputLiquid *)
+     protobuf_c_message_unpack (&input_liquid__descriptor,
+                                allocator, len, data);
+}
+void   input_liquid__free_unpacked
+                     (InputLiquid *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &input_liquid__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] =
+{
+  {
+    "LiquidType",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(InputLiquid, has_liquidtype),
+    offsetof(InputLiquid, liquidtype),
+    &liquid_type__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "CalibrationData",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_MESSAGE,
+    0,   /* quantifier_offset */
+    offsetof(InputLiquid, calibrationdata),
+    &calibration_data__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "MaxNanoliterPerCentimeter",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(InputLiquid, has_maxnanoliterpercentimeter),
+    offsetof(InputLiquid, maxnanoliterpercentimeter),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Volume",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(InputLiquid, has_volume),
+    offsetof(InputLiquid, volume),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned input_liquid__field_indices_by_name[] = {
+  1,   /* field[1] = CalibrationData */
+  0,   /* field[0] = LiquidType */
+  2,   /* field[2] = MaxNanoliterPerCentimeter */
+  3,   /* field[3] = Volume */
+};
+static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 4 }
+};
+const ProtobufCMessageDescriptor input_liquid__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "InputLiquid",
+  "InputLiquid",
+  "InputLiquid",
+  "",
+  sizeof(InputLiquid),
+  4,
+  input_liquid__field_descriptors,
+  input_liquid__field_indices_by_name,
+  1,  input_liquid__number_ranges,
+  (ProtobufCMessageInit) input_liquid__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.h
new file mode 100644
index 000000000..c2a47b166
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/InputLiquid.pb-c.h
@@ -0,0 +1,79 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: InputLiquid.proto */
+
+#ifndef PROTOBUF_C_InputLiquid_2eproto__INCLUDED
+#define PROTOBUF_C_InputLiquid_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "LiquidType.pb-c.h"
+#include "CalibrationData.pb-c.h"
+
+typedef struct _InputLiquid InputLiquid;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _InputLiquid
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_liquidtype;
+  LiquidType liquidtype;
+  CalibrationData *calibrationdata;
+  protobuf_c_boolean has_maxnanoliterpercentimeter;
+  double maxnanoliterpercentimeter;
+  protobuf_c_boolean has_volume;
+  double volume;
+};
+#define INPUT_LIQUID__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \
+    , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 }
+
+
+/* InputLiquid methods */
+void   input_liquid__init
+                     (InputLiquid         *message);
+size_t input_liquid__get_packed_size
+                     (const InputLiquid   *message);
+size_t input_liquid__pack
+                     (const InputLiquid   *message,
+                      uint8_t             *out);
+size_t input_liquid__pack_to_buffer
+                     (const InputLiquid   *message,
+                      ProtobufCBuffer     *buffer);
+InputLiquid *
+       input_liquid__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   input_liquid__free_unpacked
+                     (InputLiquid *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*InputLiquid_Closure)
+                 (const InputLiquid *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor input_liquid__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_InputLiquid_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.c
new file mode 100644
index 000000000..10b061dd6
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.c
@@ -0,0 +1,43 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: LiquidType.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "LiquidType.pb-c.h"
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[5] =
+{
+  { "Cyan", "LIQUID_TYPE__Cyan", 0 },
+  { "Magenta", "LIQUID_TYPE__Magenta", 1 },
+  { "Yellow", "LIQUID_TYPE__Yellow", 2 },
+  { "Black", "LIQUID_TYPE__Black", 3 },
+  { "TransparentInk", "LIQUID_TYPE__TransparentInk", 4 },
+};
+static const ProtobufCIntRange liquid_type__value_ranges[] = {
+{0, 0},{0, 5}
+};
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[5] =
+{
+  { "Black", 3 },
+  { "Cyan", 0 },
+  { "Magenta", 1 },
+  { "TransparentInk", 4 },
+  { "Yellow", 2 },
+};
+const ProtobufCEnumDescriptor liquid_type__descriptor =
+{
+  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
+  "LiquidType",
+  "LiquidType",
+  "LiquidType",
+  "",
+  5,
+  liquid_type__enum_values_by_number,
+  5,
+  liquid_type__enum_values_by_name,
+  1,
+  liquid_type__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.h
new file mode 100644
index 000000000..3559cc09c
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/LiquidType.pb-c.h
@@ -0,0 +1,46 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: LiquidType.proto */
+
+#ifndef PROTOBUF_C_LiquidType_2eproto__INCLUDED
+#define PROTOBUF_C_LiquidType_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+
+
+/* --- enums --- */
+
+typedef enum _LiquidType {
+  LIQUID_TYPE__Cyan = 0,
+  LIQUID_TYPE__Magenta = 1,
+  LIQUID_TYPE__Yellow = 2,
+  LIQUID_TYPE__Black = 3,
+  LIQUID_TYPE__TransparentInk = 4
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
+} LiquidType;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    liquid_type__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_LiquidType_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputColor.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputColor.pb-c.h
deleted file mode 100644
index 0c794c46c..000000000
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputColor.pb-c.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: OutputColor.proto */
-
-#ifndef PROTOBUF_C_OutputColor_2eproto__INCLUDED
-#define PROTOBUF_C_OutputColor_2eproto__INCLUDED
-
-#include <protobuf-c/protobuf-c.h>
-
-PROTOBUF_C__BEGIN_DECLS
-
-#if PROTOBUF_C_VERSION_NUMBER < 1003000
-# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
-# 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
-
-
-typedef struct _OutputColor OutputColor;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _OutputColor
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_red;
-  int32_t red;
-  protobuf_c_boolean has_green;
-  int32_t green;
-  protobuf_c_boolean has_blue;
-  int32_t blue;
-  protobuf_c_boolean has_cv;
-  double cv;
-  protobuf_c_boolean has_mv;
-  double mv;
-  protobuf_c_boolean has_yv;
-  double yv;
-  protobuf_c_boolean has_kv;
-  double kv;
-  protobuf_c_boolean has_v4;
-  double v4;
-  protobuf_c_boolean has_v5;
-  double v5;
-  protobuf_c_boolean has_v6;
-  double v6;
-  protobuf_c_boolean has_v7;
-  double v7;
-  protobuf_c_boolean has_length;
-  double length;
-  protobuf_c_boolean has_processparameterstableindex;
-  int32_t processparameterstableindex;
-};
-#define OUTPUT_COLOR__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&output_color__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-
-
-/* OutputColor methods */
-void   output_color__init
-                     (OutputColor         *message);
-size_t output_color__get_packed_size
-                     (const OutputColor   *message);
-size_t output_color__pack
-                     (const OutputColor   *message,
-                      uint8_t             *out);
-size_t output_color__pack_to_buffer
-                     (const OutputColor   *message,
-                      ProtobufCBuffer     *buffer);
-OutputColor *
-       output_color__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   output_color__free_unpacked
-                     (OutputColor *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*OutputColor_Closure)
-                 (const OutputColor *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor output_color__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_OutputColor_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.c
new file mode 100644
index 000000000..c41585415
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.c
@@ -0,0 +1,144 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: OutputCoordinates.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "OutputCoordinates.pb-c.h"
+void   output_coordinates__init
+                     (OutputCoordinates         *message)
+{
+  static const OutputCoordinates init_value = OUTPUT_COORDINATES__INIT;
+  *message = init_value;
+}
+size_t output_coordinates__get_packed_size
+                     (const OutputCoordinates *message)
+{
+  assert(message->base.descriptor == &output_coordinates__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t output_coordinates__pack
+                     (const OutputCoordinates *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &output_coordinates__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t output_coordinates__pack_to_buffer
+                     (const OutputCoordinates *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &output_coordinates__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+OutputCoordinates *
+       output_coordinates__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (OutputCoordinates *)
+     protobuf_c_message_unpack (&output_coordinates__descriptor,
+                                allocator, len, data);
+}
+void   output_coordinates__free_unpacked
+                     (OutputCoordinates *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &output_coordinates__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor output_coordinates__field_descriptors[5] =
+{
+  {
+    "Red",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(OutputCoordinates, has_red),
+    offsetof(OutputCoordinates, red),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Green",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(OutputCoordinates, has_green),
+    offsetof(OutputCoordinates, green),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Blue",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(OutputCoordinates, has_blue),
+    offsetof(OutputCoordinates, blue),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "OutputLiquids",
+    4,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(OutputCoordinates, n_outputliquids),
+    offsetof(OutputCoordinates, outputliquids),
+    &output_liquid__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "ProcessParametersTableIndex",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(OutputCoordinates, has_processparameterstableindex),
+    offsetof(OutputCoordinates, processparameterstableindex),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned output_coordinates__field_indices_by_name[] = {
+  2,   /* field[2] = Blue */
+  1,   /* field[1] = Green */
+  3,   /* field[3] = OutputLiquids */
+  4,   /* field[4] = ProcessParametersTableIndex */
+  0,   /* field[0] = Red */
+};
+static const ProtobufCIntRange output_coordinates__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 5 }
+};
+const ProtobufCMessageDescriptor output_coordinates__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OutputCoordinates",
+  "OutputCoordinates",
+  "OutputCoordinates",
+  "",
+  sizeof(OutputCoordinates),
+  5,
+  output_coordinates__field_descriptors,
+  output_coordinates__field_indices_by_name,
+  1,  output_coordinates__number_ranges,
+  (ProtobufCMessageInit) output_coordinates__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.h
new file mode 100644
index 000000000..410f0660a
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputCoordinates.pb-c.h
@@ -0,0 +1,81 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: OutputCoordinates.proto */
+
+#ifndef PROTOBUF_C_OutputCoordinates_2eproto__INCLUDED
+#define PROTOBUF_C_OutputCoordinates_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "OutputLiquid.pb-c.h"
+
+typedef struct _OutputCoordinates OutputCoordinates;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _OutputCoordinates
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_red;
+  int32_t red;
+  protobuf_c_boolean has_green;
+  int32_t green;
+  protobuf_c_boolean has_blue;
+  int32_t blue;
+  size_t n_outputliquids;
+  OutputLiquid **outputliquids;
+  protobuf_c_boolean has_processparameterstableindex;
+  int32_t processparameterstableindex;
+};
+#define OUTPUT_COORDINATES__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&output_coordinates__descriptor) \
+    , 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0 }
+
+
+/* OutputCoordinates methods */
+void   output_coordinates__init
+                     (OutputCoordinates         *message);
+size_t output_coordinates__get_packed_size
+                     (const OutputCoordinates   *message);
+size_t output_coordinates__pack
+                     (const OutputCoordinates   *message,
+                      uint8_t             *out);
+size_t output_coordinates__pack_to_buffer
+                     (const OutputCoordinates   *message,
+                      ProtobufCBuffer     *buffer);
+OutputCoordinates *
+       output_coordinates__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   output_coordinates__free_unpacked
+                     (OutputCoordinates *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*OutputCoordinates_Closure)
+                 (const OutputCoordinates *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor output_coordinates__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_OutputCoordinates_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.c
new file mode 100644
index 000000000..73f47bb20
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.c
@@ -0,0 +1,106 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: OutputLiquid.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "OutputLiquid.pb-c.h"
+void   output_liquid__init
+                     (OutputLiquid         *message)
+{
+  static const OutputLiquid init_value = OUTPUT_LIQUID__INIT;
+  *message = init_value;
+}
+size_t output_liquid__get_packed_size
+                     (const OutputLiquid *message)
+{
+  assert(message->base.descriptor == &output_liquid__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t output_liquid__pack
+                     (const OutputLiquid *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &output_liquid__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t output_liquid__pack_to_buffer
+                     (const OutputLiquid *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &output_liquid__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+OutputLiquid *
+       output_liquid__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (OutputLiquid *)
+     protobuf_c_message_unpack (&output_liquid__descriptor,
+                                allocator, len, data);
+}
+void   output_liquid__free_unpacked
+                     (OutputLiquid *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &output_liquid__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor output_liquid__field_descriptors[2] =
+{
+  {
+    "LiquidType",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(OutputLiquid, has_liquidtype),
+    offsetof(OutputLiquid, liquidtype),
+    &liquid_type__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Volume",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(OutputLiquid, has_volume),
+    offsetof(OutputLiquid, volume),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned output_liquid__field_indices_by_name[] = {
+  0,   /* field[0] = LiquidType */
+  1,   /* field[1] = Volume */
+};
+static const ProtobufCIntRange output_liquid__number_ranges[2 + 1] =
+{
+  { 1, 0 },
+  { 4, 1 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor output_liquid__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OutputLiquid",
+  "OutputLiquid",
+  "OutputLiquid",
+  "",
+  sizeof(OutputLiquid),
+  2,
+  output_liquid__field_descriptors,
+  output_liquid__field_indices_by_name,
+  2,  output_liquid__number_ranges,
+  (ProtobufCMessageInit) output_liquid__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.h
new file mode 100644
index 000000000..5401b8114
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/OutputLiquid.pb-c.h
@@ -0,0 +1,75 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: OutputLiquid.proto */
+
+#ifndef PROTOBUF_C_OutputLiquid_2eproto__INCLUDED
+#define PROTOBUF_C_OutputLiquid_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "LiquidType.pb-c.h"
+
+typedef struct _OutputLiquid OutputLiquid;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _OutputLiquid
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_liquidtype;
+  LiquidType liquidtype;
+  protobuf_c_boolean has_volume;
+  double volume;
+};
+#define OUTPUT_LIQUID__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&output_liquid__descriptor) \
+    , 0, LIQUID_TYPE__Cyan, 0, 0 }
+
+
+/* OutputLiquid methods */
+void   output_liquid__init
+                     (OutputLiquid         *message);
+size_t output_liquid__get_packed_size
+                     (const OutputLiquid   *message);
+size_t output_liquid__pack
+                     (const OutputLiquid   *message,
+                      uint8_t             *out);
+size_t output_liquid__pack_to_buffer
+                     (const OutputLiquid   *message,
+                      ProtobufCBuffer     *buffer);
+OutputLiquid *
+       output_liquid__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   output_liquid__free_unpacked
+                     (OutputLiquid *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*OutputLiquid_Closure)
+                 (const OutputLiquid *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor output_liquid__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_OutputLiquid_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.c
index 4f930f614..d5690d60f 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.c
@@ -7,17 +7,19 @@
 #endif
 
 #include "ErrorCode.pb-c.h"
-static const ProtobufCEnumValue error_code__enum_values_by_number[2] =
+static const ProtobufCEnumValue error_code__enum_values_by_number[3] =
 {
   { "NONE", "ERROR_CODE__NONE", 0 },
   { "BAD_CRC", "ERROR_CODE__BAD_CRC", 1 },
+  { "INVALID_DIGITAL_PIN_NUMBER", "ERROR_CODE__INVALID_DIGITAL_PIN_NUMBER", 2 },
 };
 static const ProtobufCIntRange error_code__value_ranges[] = {
-{0, 0},{0, 2}
+{0, 0},{0, 3}
 };
-static const ProtobufCEnumValueIndex error_code__enum_values_by_name[2] =
+static const ProtobufCEnumValueIndex error_code__enum_values_by_name[3] =
 {
   { "BAD_CRC", 1 },
+  { "INVALID_DIGITAL_PIN_NUMBER", 2 },
   { "NONE", 0 },
 };
 const ProtobufCEnumDescriptor error_code__descriptor =
@@ -27,9 +29,9 @@ const ProtobufCEnumDescriptor error_code__descriptor =
   "ErrorCode",
   "ErrorCode",
   "",
-  2,
+  3,
   error_code__enum_values_by_number,
-  2,
+  3,
   error_code__enum_values_by_name,
   1,
   error_code__value_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.h
index 7cc30c1d4..feb3bf249 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.h
@@ -21,7 +21,11 @@ PROTOBUF_C__BEGIN_DECLS
 
 typedef enum _ErrorCode {
   ERROR_CODE__NONE = 0,
-  ERROR_CODE__BAD_CRC = 1
+  ERROR_CODE__BAD_CRC = 1,
+  /*
+   *Can be returned by SetDigitalOutResponse.
+   */
+  ERROR_CODE__INVALID_DIGITAL_PIN_NUMBER = 2
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(ERROR_CODE)
 } ErrorCode;
 
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.c
index 405d43959..fb5ce4755 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "MessageType.pb-c.h"
-static const ProtobufCEnumValue message_type__enum_values_by_number[53] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[72] =
 {
   { "None", "MESSAGE_TYPE__None", 0 },
   { "CalculateRequest", "MESSAGE_TYPE__CalculateRequest", 3 },
@@ -55,32 +55,67 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[53] =
   { "KeepAliveResponse", "MESSAGE_TYPE__KeepAliveResponse", 1008 },
   { "PushDiagnosticsRequest", "MESSAGE_TYPE__PushDiagnosticsRequest", 2000 },
   { "PushDiagnosticsResponse", "MESSAGE_TYPE__PushDiagnosticsResponse", 2001 },
-  { "ReportRequest", "MESSAGE_TYPE__ReportRequest", 2002 },
-  { "ReportResponse", "MESSAGE_TYPE__ReportResponse", 2003 },
-  { "StatusResponse", "MESSAGE_TYPE__StatusResponse", 2004 },
+  { "MotorAbortHomingRequest", "MESSAGE_TYPE__MotorAbortHomingRequest", 2002 },
+  { "MotorAbortHomingResponse", "MESSAGE_TYPE__MotorAbortHomingResponse", 2003 },
+  { "MotorHomingRequest", "MESSAGE_TYPE__MotorHomingRequest", 2004 },
+  { "MotorHomingResponse", "MESSAGE_TYPE__MotorHomingResponse", 2005 },
+  { "MotorJoggingRequest", "MESSAGE_TYPE__MotorJoggingRequest", 2006 },
+  { "MotorJoggingResponse", "MESSAGE_TYPE__MotorJoggingResponse", 2007 },
+  { "MotorAbortJoggingRequest", "MESSAGE_TYPE__MotorAbortJoggingRequest", 2008 },
+  { "MotorAbortJoggingResponse", "MESSAGE_TYPE__MotorAbortJoggingResponse", 2009 },
+  { "DispenserAbortHomingRequest", "MESSAGE_TYPE__DispenserAbortHomingRequest", 2010 },
+  { "DispenserAbortHomingResponse", "MESSAGE_TYPE__DispenserAbortHomingResponse", 2011 },
+  { "DispenserHomingRequest", "MESSAGE_TYPE__DispenserHomingRequest", 2012 },
+  { "DispenserHomingResponse", "MESSAGE_TYPE__DispenserHomingResponse", 2013 },
+  { "DispenserJoggingRequest", "MESSAGE_TYPE__DispenserJoggingRequest", 2014 },
+  { "DispenserJoggingResponse", "MESSAGE_TYPE__DispenserJoggingResponse", 2015 },
+  { "DispenserAbortJoggingRequest", "MESSAGE_TYPE__DispenserAbortJoggingRequest", 2016 },
+  { "DispenserAbortJoggingResponse", "MESSAGE_TYPE__DispenserAbortJoggingResponse", 2017 },
+  { "SetDigitalOutRequest", "MESSAGE_TYPE__SetDigitalOutRequest", 2018 },
+  { "SetDigitalOutResponse", "MESSAGE_TYPE__SetDigitalOutResponse", 2019 },
+  { "ThreadJoggingRequest", "MESSAGE_TYPE__ThreadJoggingRequest", 2020 },
+  { "ThreadJoggingResponse", "MESSAGE_TYPE__ThreadJoggingResponse", 2021 },
+  { "ThreadAbortJoggingRequest", "MESSAGE_TYPE__ThreadAbortJoggingRequest", 2022 },
+  { "ThreadAbortJoggingResponse", "MESSAGE_TYPE__ThreadAbortJoggingResponse", 2023 },
   { "JobRequest", "MESSAGE_TYPE__JobRequest", 3000 },
   { "JobResponse", "MESSAGE_TYPE__JobResponse", 3001 },
   { "AbortJobRequest", "MESSAGE_TYPE__AbortJobRequest", 3002 },
   { "AbortJobResponse", "MESSAGE_TYPE__AbortJobResponse", 3003 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 1},{1000, 35},{2000, 44},{3000, 49},{0, 53}
+{0, 0},{3, 1},{1000, 35},{2000, 44},{3000, 68},{0, 72}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[53] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[72] =
 {
-  { "AbortJobRequest", 51 },
-  { "AbortJobResponse", 52 },
+  { "AbortJobRequest", 70 },
+  { "AbortJobResponse", 71 },
   { "CalculateRequest", 1 },
   { "CalculateResponse", 2 },
   { "DirectSynchronizationRequest", 38 },
   { "DirectSynchronizationResponse", 39 },
+  { "DispenserAbortHomingRequest", 54 },
+  { "DispenserAbortHomingResponse", 55 },
+  { "DispenserAbortJoggingRequest", 60 },
+  { "DispenserAbortJoggingResponse", 61 },
+  { "DispenserHomingRequest", 56 },
+  { "DispenserHomingResponse", 57 },
+  { "DispenserJoggingRequest", 58 },
+  { "DispenserJoggingResponse", 59 },
   { "ExternalBridgeUdpDiscoveryPacket", 35 },
   { "ExternalClientLoginRequest", 36 },
   { "ExternalClientLoginResponse", 37 },
-  { "JobRequest", 49 },
-  { "JobResponse", 50 },
+  { "JobRequest", 68 },
+  { "JobResponse", 69 },
   { "KeepAliveRequest", 42 },
   { "KeepAliveResponse", 43 },
+  { "MotorAbortHomingRequest", 46 },
+  { "MotorAbortHomingResponse", 47 },
+  { "MotorAbortJoggingRequest", 52 },
+  { "MotorAbortJoggingResponse", 53 },
+  { "MotorHomingRequest", 48 },
+  { "MotorHomingResponse", 49 },
+  { "MotorJoggingRequest", 50 },
+  { "MotorJoggingResponse", 51 },
   { "None", 0 },
   { "OverrideDataBaseRequest", 40 },
   { "OverrideDataBaseResponse", 41 },
@@ -88,9 +123,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[53] =
   { "ProgressResponse", 4 },
   { "PushDiagnosticsRequest", 44 },
   { "PushDiagnosticsResponse", 45 },
-  { "ReportRequest", 46 },
-  { "ReportResponse", 47 },
-  { "StatusResponse", 48 },
+  { "SetDigitalOutRequest", 62 },
+  { "SetDigitalOutResponse", 63 },
   { "StubCartridgeReadRequest", 5 },
   { "StubCartridgeReadResponse", 6 },
   { "StubCartridgeWriteRequest", 7 },
@@ -121,6 +155,10 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[53] =
   { "StubSteperMotorResponse", 28 },
   { "StubValveRequest", 29 },
   { "StubValveResponse", 30 },
+  { "ThreadAbortJoggingRequest", 66 },
+  { "ThreadAbortJoggingResponse", 67 },
+  { "ThreadJoggingRequest", 64 },
+  { "ThreadJoggingResponse", 65 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -129,9 +167,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "MessageType",
   "MessageType",
   "",
-  53,
+  72,
   message_type__enum_values_by_number,
-  53,
+  72,
   message_type__enum_values_by_name,
   5,
   message_type__value_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.h
index d5849f817..b465f2fe2 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.h
@@ -66,9 +66,28 @@ typedef enum _MessageType {
   MESSAGE_TYPE__KeepAliveResponse = 1008,
   MESSAGE_TYPE__PushDiagnosticsRequest = 2000,
   MESSAGE_TYPE__PushDiagnosticsResponse = 2001,
-  MESSAGE_TYPE__ReportRequest = 2002,
-  MESSAGE_TYPE__ReportResponse = 2003,
-  MESSAGE_TYPE__StatusResponse = 2004,
+  MESSAGE_TYPE__MotorAbortHomingRequest = 2002,
+  MESSAGE_TYPE__MotorAbortHomingResponse = 2003,
+  MESSAGE_TYPE__MotorHomingRequest = 2004,
+  MESSAGE_TYPE__MotorHomingResponse = 2005,
+  MESSAGE_TYPE__MotorJoggingRequest = 2006,
+  MESSAGE_TYPE__MotorJoggingResponse = 2007,
+  MESSAGE_TYPE__MotorAbortJoggingRequest = 2008,
+  MESSAGE_TYPE__MotorAbortJoggingResponse = 2009,
+  MESSAGE_TYPE__DispenserAbortHomingRequest = 2010,
+  MESSAGE_TYPE__DispenserAbortHomingResponse = 2011,
+  MESSAGE_TYPE__DispenserHomingRequest = 2012,
+  MESSAGE_TYPE__DispenserHomingResponse = 2013,
+  MESSAGE_TYPE__DispenserJoggingRequest = 2014,
+  MESSAGE_TYPE__DispenserJoggingResponse = 2015,
+  MESSAGE_TYPE__DispenserAbortJoggingRequest = 2016,
+  MESSAGE_TYPE__DispenserAbortJoggingResponse = 2017,
+  MESSAGE_TYPE__SetDigitalOutRequest = 2018,
+  MESSAGE_TYPE__SetDigitalOutResponse = 2019,
+  MESSAGE_TYPE__ThreadJoggingRequest = 2020,
+  MESSAGE_TYPE__ThreadJoggingResponse = 2021,
+  MESSAGE_TYPE__ThreadAbortJoggingRequest = 2022,
+  MESSAGE_TYPE__ThreadAbortJoggingResponse = 2023,
   MESSAGE_TYPE__JobRequest = 3000,
   MESSAGE_TYPE__JobResponse = 3001,
   MESSAGE_TYPE__AbortJobRequest = 3002,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.c
new file mode 100644
index 000000000..e50aa5c2c
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DataFileFrame.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DataFileFrame.pb-c.h"
+void   data_file_frame__init
+                     (DataFileFrame         *message)
+{
+  static const DataFileFrame init_value = DATA_FILE_FRAME__INIT;
+  *message = init_value;
+}
+size_t data_file_frame__get_packed_size
+                     (const DataFileFrame *message)
+{
+  assert(message->base.descriptor == &data_file_frame__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t data_file_frame__pack
+                     (const DataFileFrame *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &data_file_frame__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t data_file_frame__pack_to_buffer
+                     (const DataFileFrame *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &data_file_frame__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DataFileFrame *
+       data_file_frame__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DataFileFrame *)
+     protobuf_c_message_unpack (&data_file_frame__descriptor,
+                                allocator, len, data);
+}
+void   data_file_frame__free_unpacked
+                     (DataFileFrame *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &data_file_frame__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor data_file_frame__field_descriptors[2] =
+{
+  {
+    "Milliseconds",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DataFileFrame, has_milliseconds),
+    offsetof(DataFileFrame, milliseconds),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PushDiagnosticsResponse",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_MESSAGE,
+    0,   /* quantifier_offset */
+    offsetof(DataFileFrame, pushdiagnosticsresponse),
+    &push_diagnostics_response__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned data_file_frame__field_indices_by_name[] = {
+  0,   /* field[0] = Milliseconds */
+  1,   /* field[1] = PushDiagnosticsResponse */
+};
+static const ProtobufCIntRange data_file_frame__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor data_file_frame__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DataFileFrame",
+  "DataFileFrame",
+  "DataFileFrame",
+  "",
+  sizeof(DataFileFrame),
+  2,
+  data_file_frame__field_descriptors,
+  data_file_frame__field_indices_by_name,
+  1,  data_file_frame__number_ranges,
+  (ProtobufCMessageInit) data_file_frame__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.h
new file mode 100644
index 000000000..9ad0da792
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DataFileFrame.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DataFileFrame.proto */
+
+#ifndef PROTOBUF_C_DataFileFrame_2eproto__INCLUDED
+#define PROTOBUF_C_DataFileFrame_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "PushDiagnosticsResponse.pb-c.h"
+
+typedef struct _DataFileFrame DataFileFrame;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DataFileFrame
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_milliseconds;
+  int32_t milliseconds;
+  PushDiagnosticsResponse *pushdiagnosticsresponse;
+};
+#define DATA_FILE_FRAME__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&data_file_frame__descriptor) \
+    , 0, 0, NULL }
+
+
+/* DataFileFrame methods */
+void   data_file_frame__init
+                     (DataFileFrame         *message);
+size_t data_file_frame__get_packed_size
+                     (const DataFileFrame   *message);
+size_t data_file_frame__pack
+                     (const DataFileFrame   *message,
+                      uint8_t             *out);
+size_t data_file_frame__pack_to_buffer
+                     (const DataFileFrame   *message,
+                      ProtobufCBuffer     *buffer);
+DataFileFrame *
+       data_file_frame__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   data_file_frame__free_unpacked
+                     (DataFileFrame *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DataFileFrame_Closure)
+                 (const DataFileFrame *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor data_file_frame__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DataFileFrame_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.c
new file mode 100644
index 000000000..48e358d3d
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DigitalPin.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DigitalPin.pb-c.h"
+void   digital_pin__init
+                     (DigitalPin         *message)
+{
+  static const DigitalPin init_value = DIGITAL_PIN__INIT;
+  *message = init_value;
+}
+size_t digital_pin__get_packed_size
+                     (const DigitalPin *message)
+{
+  assert(message->base.descriptor == &digital_pin__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t digital_pin__pack
+                     (const DigitalPin *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &digital_pin__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t digital_pin__pack_to_buffer
+                     (const DigitalPin *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &digital_pin__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DigitalPin *
+       digital_pin__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DigitalPin *)
+     protobuf_c_message_unpack (&digital_pin__descriptor,
+                                allocator, len, data);
+}
+void   digital_pin__free_unpacked
+                     (DigitalPin *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &digital_pin__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor digital_pin__field_descriptors[2] =
+{
+  {
+    "Port",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DigitalPin, has_port),
+    offsetof(DigitalPin, port),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Value",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(DigitalPin, has_value),
+    offsetof(DigitalPin, value),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned digital_pin__field_indices_by_name[] = {
+  0,   /* field[0] = Port */
+  1,   /* field[1] = Value */
+};
+static const ProtobufCIntRange digital_pin__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor digital_pin__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DigitalPin",
+  "DigitalPin",
+  "DigitalPin",
+  "",
+  sizeof(DigitalPin),
+  2,
+  digital_pin__field_descriptors,
+  digital_pin__field_indices_by_name,
+  1,  digital_pin__number_ranges,
+  (ProtobufCMessageInit) digital_pin__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.h
new file mode 100644
index 000000000..2fd18cdff
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DigitalPin.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DigitalPin.proto */
+
+#ifndef PROTOBUF_C_DigitalPin_2eproto__INCLUDED
+#define PROTOBUF_C_DigitalPin_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DigitalPin DigitalPin;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DigitalPin
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_port;
+  int32_t port;
+  protobuf_c_boolean has_value;
+  protobuf_c_boolean value;
+};
+#define DIGITAL_PIN__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&digital_pin__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* DigitalPin methods */
+void   digital_pin__init
+                     (DigitalPin         *message);
+size_t digital_pin__get_packed_size
+                     (const DigitalPin   *message);
+size_t digital_pin__pack
+                     (const DigitalPin   *message,
+                      uint8_t             *out);
+size_t digital_pin__pack_to_buffer
+                     (const DigitalPin   *message,
+                      ProtobufCBuffer     *buffer);
+DigitalPin *
+       digital_pin__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   digital_pin__free_unpacked
+                     (DigitalPin *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DigitalPin_Closure)
+                 (const DigitalPin *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor digital_pin__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DigitalPin_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.c
new file mode 100644
index 000000000..57826af15
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortHomingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserAbortHomingRequest.pb-c.h"
+void   dispenser_abort_homing_request__init
+                     (DispenserAbortHomingRequest         *message)
+{
+  static const DispenserAbortHomingRequest init_value = DISPENSER_ABORT_HOMING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t dispenser_abort_homing_request__get_packed_size
+                     (const DispenserAbortHomingRequest *message)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_abort_homing_request__pack
+                     (const DispenserAbortHomingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_abort_homing_request__pack_to_buffer
+                     (const DispenserAbortHomingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserAbortHomingRequest *
+       dispenser_abort_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserAbortHomingRequest *)
+     protobuf_c_message_unpack (&dispenser_abort_homing_request__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_abort_homing_request__free_unpacked
+                     (DispenserAbortHomingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_abort_homing_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_abort_homing_request__field_descriptors[1] =
+{
+  {
+    "Code",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DispenserAbortHomingRequest, has_code),
+    offsetof(DispenserAbortHomingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_abort_homing_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange dispenser_abort_homing_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor dispenser_abort_homing_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserAbortHomingRequest",
+  "DispenserAbortHomingRequest",
+  "DispenserAbortHomingRequest",
+  "",
+  sizeof(DispenserAbortHomingRequest),
+  1,
+  dispenser_abort_homing_request__field_descriptors,
+  dispenser_abort_homing_request__field_indices_by_name,
+  1,  dispenser_abort_homing_request__number_ranges,
+  (ProtobufCMessageInit) dispenser_abort_homing_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.h
new file mode 100644
index 000000000..2e2395277
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingRequest.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortHomingRequest.proto */
+
+#ifndef PROTOBUF_C_DispenserAbortHomingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserAbortHomingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserAbortHomingRequest DispenserAbortHomingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserAbortHomingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define DISPENSER_ABORT_HOMING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_abort_homing_request__descriptor) \
+    , 0, 0 }
+
+
+/* DispenserAbortHomingRequest methods */
+void   dispenser_abort_homing_request__init
+                     (DispenserAbortHomingRequest         *message);
+size_t dispenser_abort_homing_request__get_packed_size
+                     (const DispenserAbortHomingRequest   *message);
+size_t dispenser_abort_homing_request__pack
+                     (const DispenserAbortHomingRequest   *message,
+                      uint8_t             *out);
+size_t dispenser_abort_homing_request__pack_to_buffer
+                     (const DispenserAbortHomingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserAbortHomingRequest *
+       dispenser_abort_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_abort_homing_request__free_unpacked
+                     (DispenserAbortHomingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserAbortHomingRequest_Closure)
+                 (const DispenserAbortHomingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_abort_homing_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserAbortHomingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.c
new file mode 100644
index 000000000..a5de8be16
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortHomingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserAbortHomingResponse.pb-c.h"
+void   dispenser_abort_homing_response__init
+                     (DispenserAbortHomingResponse         *message)
+{
+  static const DispenserAbortHomingResponse init_value = DISPENSER_ABORT_HOMING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t dispenser_abort_homing_response__get_packed_size
+                     (const DispenserAbortHomingResponse *message)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_abort_homing_response__pack
+                     (const DispenserAbortHomingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_abort_homing_response__pack_to_buffer
+                     (const DispenserAbortHomingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_abort_homing_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserAbortHomingResponse *
+       dispenser_abort_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserAbortHomingResponse *)
+     protobuf_c_message_unpack (&dispenser_abort_homing_response__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_abort_homing_response__free_unpacked
+                     (DispenserAbortHomingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_abort_homing_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define dispenser_abort_homing_response__field_descriptors NULL
+#define dispenser_abort_homing_response__field_indices_by_name NULL
+#define dispenser_abort_homing_response__number_ranges NULL
+const ProtobufCMessageDescriptor dispenser_abort_homing_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserAbortHomingResponse",
+  "DispenserAbortHomingResponse",
+  "DispenserAbortHomingResponse",
+  "",
+  sizeof(DispenserAbortHomingResponse),
+  0,
+  dispenser_abort_homing_response__field_descriptors,
+  dispenser_abort_homing_response__field_indices_by_name,
+  0,  dispenser_abort_homing_response__number_ranges,
+  (ProtobufCMessageInit) dispenser_abort_homing_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.h
new file mode 100644
index 000000000..73e37250d
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortHomingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortHomingResponse.proto */
+
+#ifndef PROTOBUF_C_DispenserAbortHomingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserAbortHomingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserAbortHomingResponse DispenserAbortHomingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserAbortHomingResponse
+{
+  ProtobufCMessage base;
+};
+#define DISPENSER_ABORT_HOMING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_abort_homing_response__descriptor) \
+     }
+
+
+/* DispenserAbortHomingResponse methods */
+void   dispenser_abort_homing_response__init
+                     (DispenserAbortHomingResponse         *message);
+size_t dispenser_abort_homing_response__get_packed_size
+                     (const DispenserAbortHomingResponse   *message);
+size_t dispenser_abort_homing_response__pack
+                     (const DispenserAbortHomingResponse   *message,
+                      uint8_t             *out);
+size_t dispenser_abort_homing_response__pack_to_buffer
+                     (const DispenserAbortHomingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserAbortHomingResponse *
+       dispenser_abort_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_abort_homing_response__free_unpacked
+                     (DispenserAbortHomingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserAbortHomingResponse_Closure)
+                 (const DispenserAbortHomingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_abort_homing_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserAbortHomingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.c
new file mode 100644
index 000000000..1a7a595d6
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserAbortJoggingRequest.pb-c.h"
+void   dispenser_abort_jogging_request__init
+                     (DispenserAbortJoggingRequest         *message)
+{
+  static const DispenserAbortJoggingRequest init_value = DISPENSER_ABORT_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t dispenser_abort_jogging_request__get_packed_size
+                     (const DispenserAbortJoggingRequest *message)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_abort_jogging_request__pack
+                     (const DispenserAbortJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_abort_jogging_request__pack_to_buffer
+                     (const DispenserAbortJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserAbortJoggingRequest *
+       dispenser_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserAbortJoggingRequest *)
+     protobuf_c_message_unpack (&dispenser_abort_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_abort_jogging_request__free_unpacked
+                     (DispenserAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_abort_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_abort_jogging_request__field_descriptors[1] =
+{
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DispenserAbortJoggingRequest, has_code),
+    offsetof(DispenserAbortJoggingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_abort_jogging_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange dispenser_abort_jogging_request__number_ranges[1 + 1] =
+{
+  { 2, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor dispenser_abort_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserAbortJoggingRequest",
+  "DispenserAbortJoggingRequest",
+  "DispenserAbortJoggingRequest",
+  "",
+  sizeof(DispenserAbortJoggingRequest),
+  1,
+  dispenser_abort_jogging_request__field_descriptors,
+  dispenser_abort_jogging_request__field_indices_by_name,
+  1,  dispenser_abort_jogging_request__number_ranges,
+  (ProtobufCMessageInit) dispenser_abort_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.h
new file mode 100644
index 000000000..342d3fd25
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingRequest.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_DispenserAbortJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserAbortJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserAbortJoggingRequest DispenserAbortJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserAbortJoggingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define DISPENSER_ABORT_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_abort_jogging_request__descriptor) \
+    , 0, 0 }
+
+
+/* DispenserAbortJoggingRequest methods */
+void   dispenser_abort_jogging_request__init
+                     (DispenserAbortJoggingRequest         *message);
+size_t dispenser_abort_jogging_request__get_packed_size
+                     (const DispenserAbortJoggingRequest   *message);
+size_t dispenser_abort_jogging_request__pack
+                     (const DispenserAbortJoggingRequest   *message,
+                      uint8_t             *out);
+size_t dispenser_abort_jogging_request__pack_to_buffer
+                     (const DispenserAbortJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserAbortJoggingRequest *
+       dispenser_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_abort_jogging_request__free_unpacked
+                     (DispenserAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserAbortJoggingRequest_Closure)
+                 (const DispenserAbortJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_abort_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserAbortJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.c
new file mode 100644
index 000000000..70c7f1ee0
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserAbortJoggingResponse.pb-c.h"
+void   dispenser_abort_jogging_response__init
+                     (DispenserAbortJoggingResponse         *message)
+{
+  static const DispenserAbortJoggingResponse init_value = DISPENSER_ABORT_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t dispenser_abort_jogging_response__get_packed_size
+                     (const DispenserAbortJoggingResponse *message)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_abort_jogging_response__pack
+                     (const DispenserAbortJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_abort_jogging_response__pack_to_buffer
+                     (const DispenserAbortJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserAbortJoggingResponse *
+       dispenser_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserAbortJoggingResponse *)
+     protobuf_c_message_unpack (&dispenser_abort_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_abort_jogging_response__free_unpacked
+                     (DispenserAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_abort_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_abort_jogging_response__field_descriptors[1] =
+{
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DispenserAbortJoggingResponse, has_code),
+    offsetof(DispenserAbortJoggingResponse, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_abort_jogging_response__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange dispenser_abort_jogging_response__number_ranges[1 + 1] =
+{
+  { 2, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor dispenser_abort_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserAbortJoggingResponse",
+  "DispenserAbortJoggingResponse",
+  "DispenserAbortJoggingResponse",
+  "",
+  sizeof(DispenserAbortJoggingResponse),
+  1,
+  dispenser_abort_jogging_response__field_descriptors,
+  dispenser_abort_jogging_response__field_indices_by_name,
+  1,  dispenser_abort_jogging_response__number_ranges,
+  (ProtobufCMessageInit) dispenser_abort_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.h
new file mode 100644
index 000000000..e9ddef6cb
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserAbortJoggingResponse.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserAbortJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_DispenserAbortJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserAbortJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserAbortJoggingResponse DispenserAbortJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserAbortJoggingResponse
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define DISPENSER_ABORT_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_abort_jogging_response__descriptor) \
+    , 0, 0 }
+
+
+/* DispenserAbortJoggingResponse methods */
+void   dispenser_abort_jogging_response__init
+                     (DispenserAbortJoggingResponse         *message);
+size_t dispenser_abort_jogging_response__get_packed_size
+                     (const DispenserAbortJoggingResponse   *message);
+size_t dispenser_abort_jogging_response__pack
+                     (const DispenserAbortJoggingResponse   *message,
+                      uint8_t             *out);
+size_t dispenser_abort_jogging_response__pack_to_buffer
+                     (const DispenserAbortJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserAbortJoggingResponse *
+       dispenser_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_abort_jogging_response__free_unpacked
+                     (DispenserAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserAbortJoggingResponse_Closure)
+                 (const DispenserAbortJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_abort_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserAbortJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.c
new file mode 100644
index 000000000..83e8f0f36
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserHomingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserHomingRequest.pb-c.h"
+void   dispenser_homing_request__init
+                     (DispenserHomingRequest         *message)
+{
+  static const DispenserHomingRequest init_value = DISPENSER_HOMING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t dispenser_homing_request__get_packed_size
+                     (const DispenserHomingRequest *message)
+{
+  assert(message->base.descriptor == &dispenser_homing_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_homing_request__pack
+                     (const DispenserHomingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_homing_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_homing_request__pack_to_buffer
+                     (const DispenserHomingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_homing_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserHomingRequest *
+       dispenser_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserHomingRequest *)
+     protobuf_c_message_unpack (&dispenser_homing_request__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_homing_request__free_unpacked
+                     (DispenserHomingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_homing_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_homing_request__field_descriptors[2] =
+{
+  {
+    "Code",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DispenserHomingRequest, has_code),
+    offsetof(DispenserHomingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Speed",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DispenserHomingRequest, has_speed),
+    offsetof(DispenserHomingRequest, speed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_homing_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+  1,   /* field[1] = Speed */
+};
+static const ProtobufCIntRange dispenser_homing_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor dispenser_homing_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserHomingRequest",
+  "DispenserHomingRequest",
+  "DispenserHomingRequest",
+  "",
+  sizeof(DispenserHomingRequest),
+  2,
+  dispenser_homing_request__field_descriptors,
+  dispenser_homing_request__field_indices_by_name,
+  1,  dispenser_homing_request__number_ranges,
+  (ProtobufCMessageInit) dispenser_homing_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.h
new file mode 100644
index 000000000..ba7ab19cf
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingRequest.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserHomingRequest.proto */
+
+#ifndef PROTOBUF_C_DispenserHomingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserHomingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserHomingRequest DispenserHomingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserHomingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+  protobuf_c_boolean has_speed;
+  double speed;
+};
+#define DISPENSER_HOMING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_homing_request__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* DispenserHomingRequest methods */
+void   dispenser_homing_request__init
+                     (DispenserHomingRequest         *message);
+size_t dispenser_homing_request__get_packed_size
+                     (const DispenserHomingRequest   *message);
+size_t dispenser_homing_request__pack
+                     (const DispenserHomingRequest   *message,
+                      uint8_t             *out);
+size_t dispenser_homing_request__pack_to_buffer
+                     (const DispenserHomingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserHomingRequest *
+       dispenser_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_homing_request__free_unpacked
+                     (DispenserHomingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserHomingRequest_Closure)
+                 (const DispenserHomingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_homing_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserHomingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.c
new file mode 100644
index 000000000..e37aaaa67
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserHomingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserHomingResponse.pb-c.h"
+void   dispenser_homing_response__init
+                     (DispenserHomingResponse         *message)
+{
+  static const DispenserHomingResponse init_value = DISPENSER_HOMING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t dispenser_homing_response__get_packed_size
+                     (const DispenserHomingResponse *message)
+{
+  assert(message->base.descriptor == &dispenser_homing_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_homing_response__pack
+                     (const DispenserHomingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_homing_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_homing_response__pack_to_buffer
+                     (const DispenserHomingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_homing_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserHomingResponse *
+       dispenser_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserHomingResponse *)
+     protobuf_c_message_unpack (&dispenser_homing_response__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_homing_response__free_unpacked
+                     (DispenserHomingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_homing_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_homing_response__field_descriptors[2] =
+{
+  {
+    "Progress",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DispenserHomingResponse, has_progress),
+    offsetof(DispenserHomingResponse, progress),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "MaxProgress",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DispenserHomingResponse, has_maxprogress),
+    offsetof(DispenserHomingResponse, maxprogress),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_homing_response__field_indices_by_name[] = {
+  1,   /* field[1] = MaxProgress */
+  0,   /* field[0] = Progress */
+};
+static const ProtobufCIntRange dispenser_homing_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor dispenser_homing_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserHomingResponse",
+  "DispenserHomingResponse",
+  "DispenserHomingResponse",
+  "",
+  sizeof(DispenserHomingResponse),
+  2,
+  dispenser_homing_response__field_descriptors,
+  dispenser_homing_response__field_indices_by_name,
+  1,  dispenser_homing_response__number_ranges,
+  (ProtobufCMessageInit) dispenser_homing_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.h
new file mode 100644
index 000000000..76899841b
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserHomingResponse.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserHomingResponse.proto */
+
+#ifndef PROTOBUF_C_DispenserHomingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserHomingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserHomingResponse DispenserHomingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserHomingResponse
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_progress;
+  double progress;
+  protobuf_c_boolean has_maxprogress;
+  double maxprogress;
+};
+#define DISPENSER_HOMING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_homing_response__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* DispenserHomingResponse methods */
+void   dispenser_homing_response__init
+                     (DispenserHomingResponse         *message);
+size_t dispenser_homing_response__get_packed_size
+                     (const DispenserHomingResponse   *message);
+size_t dispenser_homing_response__pack
+                     (const DispenserHomingResponse   *message,
+                      uint8_t             *out);
+size_t dispenser_homing_response__pack_to_buffer
+                     (const DispenserHomingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserHomingResponse *
+       dispenser_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_homing_response__free_unpacked
+                     (DispenserHomingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserHomingResponse_Closure)
+                 (const DispenserHomingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_homing_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserHomingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.c
new file mode 100644
index 000000000..720e45d8f
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.c
@@ -0,0 +1,118 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserJoggingRequest.pb-c.h"
+void   dispenser_jogging_request__init
+                     (DispenserJoggingRequest         *message)
+{
+  static const DispenserJoggingRequest init_value = DISPENSER_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t dispenser_jogging_request__get_packed_size
+                     (const DispenserJoggingRequest *message)
+{
+  assert(message->base.descriptor == &dispenser_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_jogging_request__pack
+                     (const DispenserJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_jogging_request__pack_to_buffer
+                     (const DispenserJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserJoggingRequest *
+       dispenser_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserJoggingRequest *)
+     protobuf_c_message_unpack (&dispenser_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_jogging_request__free_unpacked
+                     (DispenserJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_jogging_request__field_descriptors[3] =
+{
+  {
+    "Direction",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(DispenserJoggingRequest, has_direction),
+    offsetof(DispenserJoggingRequest, direction),
+    &motor_direction__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(DispenserJoggingRequest, has_code),
+    offsetof(DispenserJoggingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Speed",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DispenserJoggingRequest, has_speed),
+    offsetof(DispenserJoggingRequest, speed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_jogging_request__field_indices_by_name[] = {
+  1,   /* field[1] = Code */
+  0,   /* field[0] = Direction */
+  2,   /* field[2] = Speed */
+};
+static const ProtobufCIntRange dispenser_jogging_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 3 }
+};
+const ProtobufCMessageDescriptor dispenser_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserJoggingRequest",
+  "DispenserJoggingRequest",
+  "DispenserJoggingRequest",
+  "",
+  sizeof(DispenserJoggingRequest),
+  3,
+  dispenser_jogging_request__field_descriptors,
+  dispenser_jogging_request__field_indices_by_name,
+  1,  dispenser_jogging_request__number_ranges,
+  (ProtobufCMessageInit) dispenser_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.h
new file mode 100644
index 000000000..b3d962769
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingRequest.pb-c.h
@@ -0,0 +1,77 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_DispenserJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "MotorDirection.pb-c.h"
+
+typedef struct _DispenserJoggingRequest DispenserJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserJoggingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_direction;
+  MotorDirection direction;
+  protobuf_c_boolean has_code;
+  int32_t code;
+  protobuf_c_boolean has_speed;
+  double speed;
+};
+#define DISPENSER_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_jogging_request__descriptor) \
+    , 0, MOTOR_DIRECTION__Forward, 0, 0, 0, 0 }
+
+
+/* DispenserJoggingRequest methods */
+void   dispenser_jogging_request__init
+                     (DispenserJoggingRequest         *message);
+size_t dispenser_jogging_request__get_packed_size
+                     (const DispenserJoggingRequest   *message);
+size_t dispenser_jogging_request__pack
+                     (const DispenserJoggingRequest   *message,
+                      uint8_t             *out);
+size_t dispenser_jogging_request__pack_to_buffer
+                     (const DispenserJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserJoggingRequest *
+       dispenser_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_jogging_request__free_unpacked
+                     (DispenserJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserJoggingRequest_Closure)
+                 (const DispenserJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.c
new file mode 100644
index 000000000..499387197
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserJoggingResponse.pb-c.h"
+void   dispenser_jogging_response__init
+                     (DispenserJoggingResponse         *message)
+{
+  static const DispenserJoggingResponse init_value = DISPENSER_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t dispenser_jogging_response__get_packed_size
+                     (const DispenserJoggingResponse *message)
+{
+  assert(message->base.descriptor == &dispenser_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_jogging_response__pack
+                     (const DispenserJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_jogging_response__pack_to_buffer
+                     (const DispenserJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserJoggingResponse *
+       dispenser_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserJoggingResponse *)
+     protobuf_c_message_unpack (&dispenser_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_jogging_response__free_unpacked
+                     (DispenserJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define dispenser_jogging_response__field_descriptors NULL
+#define dispenser_jogging_response__field_indices_by_name NULL
+#define dispenser_jogging_response__number_ranges NULL
+const ProtobufCMessageDescriptor dispenser_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserJoggingResponse",
+  "DispenserJoggingResponse",
+  "DispenserJoggingResponse",
+  "",
+  sizeof(DispenserJoggingResponse),
+  0,
+  dispenser_jogging_response__field_descriptors,
+  dispenser_jogging_response__field_indices_by_name,
+  0,  dispenser_jogging_response__number_ranges,
+  (ProtobufCMessageInit) dispenser_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.h
new file mode 100644
index 000000000..7cdda36f8
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/DispenserJoggingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_DispenserJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _DispenserJoggingResponse DispenserJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserJoggingResponse
+{
+  ProtobufCMessage base;
+};
+#define DISPENSER_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_jogging_response__descriptor) \
+     }
+
+
+/* DispenserJoggingResponse methods */
+void   dispenser_jogging_response__init
+                     (DispenserJoggingResponse         *message);
+size_t dispenser_jogging_response__get_packed_size
+                     (const DispenserJoggingResponse   *message);
+size_t dispenser_jogging_response__pack
+                     (const DispenserJoggingResponse   *message,
+                      uint8_t             *out);
+size_t dispenser_jogging_response__pack_to_buffer
+                     (const DispenserJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserJoggingResponse *
+       dispenser_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_jogging_response__free_unpacked
+                     (DispenserJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserJoggingResponse_Closure)
+                 (const DispenserJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.c
new file mode 100644
index 000000000..63c2bdf9e
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortHomingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorAbortHomingRequest.pb-c.h"
+void   motor_abort_homing_request__init
+                     (MotorAbortHomingRequest         *message)
+{
+  static const MotorAbortHomingRequest init_value = MOTOR_ABORT_HOMING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t motor_abort_homing_request__get_packed_size
+                     (const MotorAbortHomingRequest *message)
+{
+  assert(message->base.descriptor == &motor_abort_homing_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_abort_homing_request__pack
+                     (const MotorAbortHomingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_abort_homing_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_abort_homing_request__pack_to_buffer
+                     (const MotorAbortHomingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_abort_homing_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorAbortHomingRequest *
+       motor_abort_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorAbortHomingRequest *)
+     protobuf_c_message_unpack (&motor_abort_homing_request__descriptor,
+                                allocator, len, data);
+}
+void   motor_abort_homing_request__free_unpacked
+                     (MotorAbortHomingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_abort_homing_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_abort_homing_request__field_descriptors[1] =
+{
+  {
+    "Code",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(MotorAbortHomingRequest, has_code),
+    offsetof(MotorAbortHomingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_abort_homing_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange motor_abort_homing_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor motor_abort_homing_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorAbortHomingRequest",
+  "MotorAbortHomingRequest",
+  "MotorAbortHomingRequest",
+  "",
+  sizeof(MotorAbortHomingRequest),
+  1,
+  motor_abort_homing_request__field_descriptors,
+  motor_abort_homing_request__field_indices_by_name,
+  1,  motor_abort_homing_request__number_ranges,
+  (ProtobufCMessageInit) motor_abort_homing_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.h
new file mode 100644
index 000000000..e480d02b4
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingRequest.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortHomingRequest.proto */
+
+#ifndef PROTOBUF_C_MotorAbortHomingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_MotorAbortHomingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorAbortHomingRequest MotorAbortHomingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorAbortHomingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define MOTOR_ABORT_HOMING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_abort_homing_request__descriptor) \
+    , 0, 0 }
+
+
+/* MotorAbortHomingRequest methods */
+void   motor_abort_homing_request__init
+                     (MotorAbortHomingRequest         *message);
+size_t motor_abort_homing_request__get_packed_size
+                     (const MotorAbortHomingRequest   *message);
+size_t motor_abort_homing_request__pack
+                     (const MotorAbortHomingRequest   *message,
+                      uint8_t             *out);
+size_t motor_abort_homing_request__pack_to_buffer
+                     (const MotorAbortHomingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+MotorAbortHomingRequest *
+       motor_abort_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_abort_homing_request__free_unpacked
+                     (MotorAbortHomingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorAbortHomingRequest_Closure)
+                 (const MotorAbortHomingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_abort_homing_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorAbortHomingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.c
new file mode 100644
index 000000000..d95f3d978
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortHomingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorAbortHomingResponse.pb-c.h"
+void   motor_abort_homing_response__init
+                     (MotorAbortHomingResponse         *message)
+{
+  static const MotorAbortHomingResponse init_value = MOTOR_ABORT_HOMING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t motor_abort_homing_response__get_packed_size
+                     (const MotorAbortHomingResponse *message)
+{
+  assert(message->base.descriptor == &motor_abort_homing_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_abort_homing_response__pack
+                     (const MotorAbortHomingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_abort_homing_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_abort_homing_response__pack_to_buffer
+                     (const MotorAbortHomingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_abort_homing_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorAbortHomingResponse *
+       motor_abort_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorAbortHomingResponse *)
+     protobuf_c_message_unpack (&motor_abort_homing_response__descriptor,
+                                allocator, len, data);
+}
+void   motor_abort_homing_response__free_unpacked
+                     (MotorAbortHomingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_abort_homing_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define motor_abort_homing_response__field_descriptors NULL
+#define motor_abort_homing_response__field_indices_by_name NULL
+#define motor_abort_homing_response__number_ranges NULL
+const ProtobufCMessageDescriptor motor_abort_homing_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorAbortHomingResponse",
+  "MotorAbortHomingResponse",
+  "MotorAbortHomingResponse",
+  "",
+  sizeof(MotorAbortHomingResponse),
+  0,
+  motor_abort_homing_response__field_descriptors,
+  motor_abort_homing_response__field_indices_by_name,
+  0,  motor_abort_homing_response__number_ranges,
+  (ProtobufCMessageInit) motor_abort_homing_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.h
new file mode 100644
index 000000000..fb69cf90f
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortHomingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortHomingResponse.proto */
+
+#ifndef PROTOBUF_C_MotorAbortHomingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_MotorAbortHomingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorAbortHomingResponse MotorAbortHomingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorAbortHomingResponse
+{
+  ProtobufCMessage base;
+};
+#define MOTOR_ABORT_HOMING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_abort_homing_response__descriptor) \
+     }
+
+
+/* MotorAbortHomingResponse methods */
+void   motor_abort_homing_response__init
+                     (MotorAbortHomingResponse         *message);
+size_t motor_abort_homing_response__get_packed_size
+                     (const MotorAbortHomingResponse   *message);
+size_t motor_abort_homing_response__pack
+                     (const MotorAbortHomingResponse   *message,
+                      uint8_t             *out);
+size_t motor_abort_homing_response__pack_to_buffer
+                     (const MotorAbortHomingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+MotorAbortHomingResponse *
+       motor_abort_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_abort_homing_response__free_unpacked
+                     (MotorAbortHomingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorAbortHomingResponse_Closure)
+                 (const MotorAbortHomingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_abort_homing_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorAbortHomingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.c
new file mode 100644
index 000000000..45c487e65
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorAbortJoggingRequest.pb-c.h"
+void   motor_abort_jogging_request__init
+                     (MotorAbortJoggingRequest         *message)
+{
+  static const MotorAbortJoggingRequest init_value = MOTOR_ABORT_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t motor_abort_jogging_request__get_packed_size
+                     (const MotorAbortJoggingRequest *message)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_abort_jogging_request__pack
+                     (const MotorAbortJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_abort_jogging_request__pack_to_buffer
+                     (const MotorAbortJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorAbortJoggingRequest *
+       motor_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorAbortJoggingRequest *)
+     protobuf_c_message_unpack (&motor_abort_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   motor_abort_jogging_request__free_unpacked
+                     (MotorAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_abort_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_abort_jogging_request__field_descriptors[1] =
+{
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(MotorAbortJoggingRequest, has_code),
+    offsetof(MotorAbortJoggingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_abort_jogging_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange motor_abort_jogging_request__number_ranges[1 + 1] =
+{
+  { 2, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor motor_abort_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorAbortJoggingRequest",
+  "MotorAbortJoggingRequest",
+  "MotorAbortJoggingRequest",
+  "",
+  sizeof(MotorAbortJoggingRequest),
+  1,
+  motor_abort_jogging_request__field_descriptors,
+  motor_abort_jogging_request__field_indices_by_name,
+  1,  motor_abort_jogging_request__number_ranges,
+  (ProtobufCMessageInit) motor_abort_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.h
new file mode 100644
index 000000000..39511ffa9
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingRequest.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_MotorAbortJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_MotorAbortJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorAbortJoggingRequest MotorAbortJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorAbortJoggingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define MOTOR_ABORT_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_abort_jogging_request__descriptor) \
+    , 0, 0 }
+
+
+/* MotorAbortJoggingRequest methods */
+void   motor_abort_jogging_request__init
+                     (MotorAbortJoggingRequest         *message);
+size_t motor_abort_jogging_request__get_packed_size
+                     (const MotorAbortJoggingRequest   *message);
+size_t motor_abort_jogging_request__pack
+                     (const MotorAbortJoggingRequest   *message,
+                      uint8_t             *out);
+size_t motor_abort_jogging_request__pack_to_buffer
+                     (const MotorAbortJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+MotorAbortJoggingRequest *
+       motor_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_abort_jogging_request__free_unpacked
+                     (MotorAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorAbortJoggingRequest_Closure)
+                 (const MotorAbortJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_abort_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorAbortJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.c
new file mode 100644
index 000000000..f32b7aad0
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorAbortJoggingResponse.pb-c.h"
+void   motor_abort_jogging_response__init
+                     (MotorAbortJoggingResponse         *message)
+{
+  static const MotorAbortJoggingResponse init_value = MOTOR_ABORT_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t motor_abort_jogging_response__get_packed_size
+                     (const MotorAbortJoggingResponse *message)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_abort_jogging_response__pack
+                     (const MotorAbortJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_abort_jogging_response__pack_to_buffer
+                     (const MotorAbortJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorAbortJoggingResponse *
+       motor_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorAbortJoggingResponse *)
+     protobuf_c_message_unpack (&motor_abort_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   motor_abort_jogging_response__free_unpacked
+                     (MotorAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_abort_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_abort_jogging_response__field_descriptors[1] =
+{
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(MotorAbortJoggingResponse, has_code),
+    offsetof(MotorAbortJoggingResponse, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_abort_jogging_response__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+};
+static const ProtobufCIntRange motor_abort_jogging_response__number_ranges[1 + 1] =
+{
+  { 2, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor motor_abort_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorAbortJoggingResponse",
+  "MotorAbortJoggingResponse",
+  "MotorAbortJoggingResponse",
+  "",
+  sizeof(MotorAbortJoggingResponse),
+  1,
+  motor_abort_jogging_response__field_descriptors,
+  motor_abort_jogging_response__field_indices_by_name,
+  1,  motor_abort_jogging_response__number_ranges,
+  (ProtobufCMessageInit) motor_abort_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.h
new file mode 100644
index 000000000..e78157ab4
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorAbortJoggingResponse.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorAbortJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_MotorAbortJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_MotorAbortJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorAbortJoggingResponse MotorAbortJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorAbortJoggingResponse
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+};
+#define MOTOR_ABORT_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_abort_jogging_response__descriptor) \
+    , 0, 0 }
+
+
+/* MotorAbortJoggingResponse methods */
+void   motor_abort_jogging_response__init
+                     (MotorAbortJoggingResponse         *message);
+size_t motor_abort_jogging_response__get_packed_size
+                     (const MotorAbortJoggingResponse   *message);
+size_t motor_abort_jogging_response__pack
+                     (const MotorAbortJoggingResponse   *message,
+                      uint8_t             *out);
+size_t motor_abort_jogging_response__pack_to_buffer
+                     (const MotorAbortJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+MotorAbortJoggingResponse *
+       motor_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_abort_jogging_response__free_unpacked
+                     (MotorAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorAbortJoggingResponse_Closure)
+                 (const MotorAbortJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_abort_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorAbortJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.c
new file mode 100644
index 000000000..7eaa11ff6
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.c
@@ -0,0 +1,37 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorDirection.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorDirection.pb-c.h"
+static const ProtobufCEnumValue motor_direction__enum_values_by_number[2] =
+{
+  { "Forward", "MOTOR_DIRECTION__Forward", 0 },
+  { "Backward", "MOTOR_DIRECTION__Backward", 1 },
+};
+static const ProtobufCIntRange motor_direction__value_ranges[] = {
+{0, 0},{0, 2}
+};
+static const ProtobufCEnumValueIndex motor_direction__enum_values_by_name[2] =
+{
+  { "Backward", 1 },
+  { "Forward", 0 },
+};
+const ProtobufCEnumDescriptor motor_direction__descriptor =
+{
+  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
+  "MotorDirection",
+  "MotorDirection",
+  "MotorDirection",
+  "",
+  2,
+  motor_direction__enum_values_by_number,
+  2,
+  motor_direction__enum_values_by_name,
+  1,
+  motor_direction__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.h
new file mode 100644
index 000000000..e5b190f2b
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorDirection.pb-c.h
@@ -0,0 +1,43 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorDirection.proto */
+
+#ifndef PROTOBUF_C_MotorDirection_2eproto__INCLUDED
+#define PROTOBUF_C_MotorDirection_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+
+
+/* --- enums --- */
+
+typedef enum _MotorDirection {
+  MOTOR_DIRECTION__Forward = 0,
+  MOTOR_DIRECTION__Backward = 1
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MOTOR_DIRECTION)
+} MotorDirection;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    motor_direction__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorDirection_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.c
new file mode 100644
index 000000000..39413d2a7
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorHomingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorHomingRequest.pb-c.h"
+void   motor_homing_request__init
+                     (MotorHomingRequest         *message)
+{
+  static const MotorHomingRequest init_value = MOTOR_HOMING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t motor_homing_request__get_packed_size
+                     (const MotorHomingRequest *message)
+{
+  assert(message->base.descriptor == &motor_homing_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_homing_request__pack
+                     (const MotorHomingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_homing_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_homing_request__pack_to_buffer
+                     (const MotorHomingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_homing_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorHomingRequest *
+       motor_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorHomingRequest *)
+     protobuf_c_message_unpack (&motor_homing_request__descriptor,
+                                allocator, len, data);
+}
+void   motor_homing_request__free_unpacked
+                     (MotorHomingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_homing_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_homing_request__field_descriptors[2] =
+{
+  {
+    "Code",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(MotorHomingRequest, has_code),
+    offsetof(MotorHomingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Speed",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(MotorHomingRequest, has_speed),
+    offsetof(MotorHomingRequest, speed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_homing_request__field_indices_by_name[] = {
+  0,   /* field[0] = Code */
+  1,   /* field[1] = Speed */
+};
+static const ProtobufCIntRange motor_homing_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor motor_homing_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorHomingRequest",
+  "MotorHomingRequest",
+  "MotorHomingRequest",
+  "",
+  sizeof(MotorHomingRequest),
+  2,
+  motor_homing_request__field_descriptors,
+  motor_homing_request__field_indices_by_name,
+  1,  motor_homing_request__number_ranges,
+  (ProtobufCMessageInit) motor_homing_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.h
new file mode 100644
index 000000000..e2c9f3c91
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingRequest.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorHomingRequest.proto */
+
+#ifndef PROTOBUF_C_MotorHomingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_MotorHomingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorHomingRequest MotorHomingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorHomingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_code;
+  int32_t code;
+  protobuf_c_boolean has_speed;
+  double speed;
+};
+#define MOTOR_HOMING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_homing_request__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* MotorHomingRequest methods */
+void   motor_homing_request__init
+                     (MotorHomingRequest         *message);
+size_t motor_homing_request__get_packed_size
+                     (const MotorHomingRequest   *message);
+size_t motor_homing_request__pack
+                     (const MotorHomingRequest   *message,
+                      uint8_t             *out);
+size_t motor_homing_request__pack_to_buffer
+                     (const MotorHomingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+MotorHomingRequest *
+       motor_homing_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_homing_request__free_unpacked
+                     (MotorHomingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorHomingRequest_Closure)
+                 (const MotorHomingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_homing_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorHomingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.c
new file mode 100644
index 000000000..76d79e96b
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorHomingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorHomingResponse.pb-c.h"
+void   motor_homing_response__init
+                     (MotorHomingResponse         *message)
+{
+  static const MotorHomingResponse init_value = MOTOR_HOMING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t motor_homing_response__get_packed_size
+                     (const MotorHomingResponse *message)
+{
+  assert(message->base.descriptor == &motor_homing_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_homing_response__pack
+                     (const MotorHomingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_homing_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_homing_response__pack_to_buffer
+                     (const MotorHomingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_homing_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorHomingResponse *
+       motor_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorHomingResponse *)
+     protobuf_c_message_unpack (&motor_homing_response__descriptor,
+                                allocator, len, data);
+}
+void   motor_homing_response__free_unpacked
+                     (MotorHomingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_homing_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_homing_response__field_descriptors[2] =
+{
+  {
+    "Progress",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(MotorHomingResponse, has_progress),
+    offsetof(MotorHomingResponse, progress),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "MaxProgress",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(MotorHomingResponse, has_maxprogress),
+    offsetof(MotorHomingResponse, maxprogress),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_homing_response__field_indices_by_name[] = {
+  1,   /* field[1] = MaxProgress */
+  0,   /* field[0] = Progress */
+};
+static const ProtobufCIntRange motor_homing_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor motor_homing_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorHomingResponse",
+  "MotorHomingResponse",
+  "MotorHomingResponse",
+  "",
+  sizeof(MotorHomingResponse),
+  2,
+  motor_homing_response__field_descriptors,
+  motor_homing_response__field_indices_by_name,
+  1,  motor_homing_response__number_ranges,
+  (ProtobufCMessageInit) motor_homing_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.h
new file mode 100644
index 000000000..df0452482
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorHomingResponse.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorHomingResponse.proto */
+
+#ifndef PROTOBUF_C_MotorHomingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_MotorHomingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorHomingResponse MotorHomingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorHomingResponse
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_progress;
+  double progress;
+  protobuf_c_boolean has_maxprogress;
+  double maxprogress;
+};
+#define MOTOR_HOMING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_homing_response__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* MotorHomingResponse methods */
+void   motor_homing_response__init
+                     (MotorHomingResponse         *message);
+size_t motor_homing_response__get_packed_size
+                     (const MotorHomingResponse   *message);
+size_t motor_homing_response__pack
+                     (const MotorHomingResponse   *message,
+                      uint8_t             *out);
+size_t motor_homing_response__pack_to_buffer
+                     (const MotorHomingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+MotorHomingResponse *
+       motor_homing_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_homing_response__free_unpacked
+                     (MotorHomingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorHomingResponse_Closure)
+                 (const MotorHomingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_homing_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorHomingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.c
new file mode 100644
index 000000000..9beca81cc
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.c
@@ -0,0 +1,118 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorJoggingRequest.pb-c.h"
+void   motor_jogging_request__init
+                     (MotorJoggingRequest         *message)
+{
+  static const MotorJoggingRequest init_value = MOTOR_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t motor_jogging_request__get_packed_size
+                     (const MotorJoggingRequest *message)
+{
+  assert(message->base.descriptor == &motor_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_jogging_request__pack
+                     (const MotorJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_jogging_request__pack_to_buffer
+                     (const MotorJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorJoggingRequest *
+       motor_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorJoggingRequest *)
+     protobuf_c_message_unpack (&motor_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   motor_jogging_request__free_unpacked
+                     (MotorJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor motor_jogging_request__field_descriptors[3] =
+{
+  {
+    "Direction",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(MotorJoggingRequest, has_direction),
+    offsetof(MotorJoggingRequest, direction),
+    &motor_direction__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Code",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(MotorJoggingRequest, has_code),
+    offsetof(MotorJoggingRequest, code),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Speed",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(MotorJoggingRequest, has_speed),
+    offsetof(MotorJoggingRequest, speed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned motor_jogging_request__field_indices_by_name[] = {
+  1,   /* field[1] = Code */
+  0,   /* field[0] = Direction */
+  2,   /* field[2] = Speed */
+};
+static const ProtobufCIntRange motor_jogging_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 3 }
+};
+const ProtobufCMessageDescriptor motor_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorJoggingRequest",
+  "MotorJoggingRequest",
+  "MotorJoggingRequest",
+  "",
+  sizeof(MotorJoggingRequest),
+  3,
+  motor_jogging_request__field_descriptors,
+  motor_jogging_request__field_indices_by_name,
+  1,  motor_jogging_request__number_ranges,
+  (ProtobufCMessageInit) motor_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.h
new file mode 100644
index 000000000..9832fdcdf
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingRequest.pb-c.h
@@ -0,0 +1,77 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_MotorJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_MotorJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "MotorDirection.pb-c.h"
+
+typedef struct _MotorJoggingRequest MotorJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorJoggingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_direction;
+  MotorDirection direction;
+  protobuf_c_boolean has_code;
+  int32_t code;
+  protobuf_c_boolean has_speed;
+  double speed;
+};
+#define MOTOR_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_jogging_request__descriptor) \
+    , 0, MOTOR_DIRECTION__Forward, 0, 0, 0, 0 }
+
+
+/* MotorJoggingRequest methods */
+void   motor_jogging_request__init
+                     (MotorJoggingRequest         *message);
+size_t motor_jogging_request__get_packed_size
+                     (const MotorJoggingRequest   *message);
+size_t motor_jogging_request__pack
+                     (const MotorJoggingRequest   *message,
+                      uint8_t             *out);
+size_t motor_jogging_request__pack_to_buffer
+                     (const MotorJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+MotorJoggingRequest *
+       motor_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_jogging_request__free_unpacked
+                     (MotorJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorJoggingRequest_Closure)
+                 (const MotorJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.c
new file mode 100644
index 000000000..e5af97d42
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "MotorJoggingResponse.pb-c.h"
+void   motor_jogging_response__init
+                     (MotorJoggingResponse         *message)
+{
+  static const MotorJoggingResponse init_value = MOTOR_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t motor_jogging_response__get_packed_size
+                     (const MotorJoggingResponse *message)
+{
+  assert(message->base.descriptor == &motor_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t motor_jogging_response__pack
+                     (const MotorJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &motor_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t motor_jogging_response__pack_to_buffer
+                     (const MotorJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &motor_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MotorJoggingResponse *
+       motor_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MotorJoggingResponse *)
+     protobuf_c_message_unpack (&motor_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   motor_jogging_response__free_unpacked
+                     (MotorJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &motor_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define motor_jogging_response__field_descriptors NULL
+#define motor_jogging_response__field_indices_by_name NULL
+#define motor_jogging_response__number_ranges NULL
+const ProtobufCMessageDescriptor motor_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "MotorJoggingResponse",
+  "MotorJoggingResponse",
+  "MotorJoggingResponse",
+  "",
+  sizeof(MotorJoggingResponse),
+  0,
+  motor_jogging_response__field_descriptors,
+  motor_jogging_response__field_indices_by_name,
+  0,  motor_jogging_response__number_ranges,
+  (ProtobufCMessageInit) motor_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.h
new file mode 100644
index 000000000..53d11d3fc
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/MotorJoggingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: MotorJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_MotorJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_MotorJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _MotorJoggingResponse MotorJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _MotorJoggingResponse
+{
+  ProtobufCMessage base;
+};
+#define MOTOR_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&motor_jogging_response__descriptor) \
+     }
+
+
+/* MotorJoggingResponse methods */
+void   motor_jogging_response__init
+                     (MotorJoggingResponse         *message);
+size_t motor_jogging_response__get_packed_size
+                     (const MotorJoggingResponse   *message);
+size_t motor_jogging_response__pack
+                     (const MotorJoggingResponse   *message,
+                      uint8_t             *out);
+size_t motor_jogging_response__pack_to_buffer
+                     (const MotorJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+MotorJoggingResponse *
+       motor_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   motor_jogging_response__free_unpacked
+                     (MotorJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*MotorJoggingResponse_Closure)
+                 (const MotorJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor motor_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_MotorJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.c
index 51b490620..c34913fae 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.c
@@ -52,7 +52,7 @@ void   push_diagnostics_response__free_unpacked
   assert(message->base.descriptor == &push_diagnostics_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor push_diagnostics_response__field_descriptors[4] =
+static const ProtobufCFieldDescriptor push_diagnostics_response__field_descriptors[16] =
 {
   {
     "Dancer1Angle",
@@ -102,17 +102,173 @@ static const ProtobufCFieldDescriptor push_diagnostics_response__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "Dispenser1MotorFrequency",
+    5,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser1motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser1motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser2MotorFrequency",
+    6,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser2motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser2motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser3MotorFrequency",
+    7,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser3motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser3motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser4MotorFrequency",
+    8,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser4motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser4motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser5MotorFrequency",
+    9,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser5motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser5motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser6MotorFrequency",
+    10,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser6motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser6motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser7MotorFrequency",
+    11,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser7motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser7motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Dispenser8MotorFrequency",
+    12,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(PushDiagnosticsResponse, n_dispenser8motorfrequency),
+    offsetof(PushDiagnosticsResponse, dispenser8motorfrequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "DigitalPins",
+    13,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(PushDiagnosticsResponse, n_digitalpins),
+    offsetof(PushDiagnosticsResponse, digitalpins),
+    &digital_pin__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Version",
+    14,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(PushDiagnosticsResponse, version),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "VersionName",
+    15,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(PushDiagnosticsResponse, versionname),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "VersionBuildDate",
+    16,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(PushDiagnosticsResponse, versionbuilddate),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned push_diagnostics_response__field_indices_by_name[] = {
   0,   /* field[0] = Dancer1Angle */
   1,   /* field[1] = Dancer2Angle */
   2,   /* field[2] = Dancer3Angle */
+  12,   /* field[12] = DigitalPins */
+  4,   /* field[4] = Dispenser1MotorFrequency */
+  5,   /* field[5] = Dispenser2MotorFrequency */
+  6,   /* field[6] = Dispenser3MotorFrequency */
+  7,   /* field[7] = Dispenser4MotorFrequency */
+  8,   /* field[8] = Dispenser5MotorFrequency */
+  9,   /* field[9] = Dispenser6MotorFrequency */
+  10,   /* field[10] = Dispenser7MotorFrequency */
+  11,   /* field[11] = Dispenser8MotorFrequency */
   3,   /* field[3] = DispensersMotorsFrequency */
+  13,   /* field[13] = Version */
+  15,   /* field[15] = VersionBuildDate */
+  14,   /* field[14] = VersionName */
 };
 static const ProtobufCIntRange push_diagnostics_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 16 }
 };
 const ProtobufCMessageDescriptor push_diagnostics_response__descriptor =
 {
@@ -122,7 +278,7 @@ const ProtobufCMessageDescriptor push_diagnostics_response__descriptor =
   "PushDiagnosticsResponse",
   "",
   sizeof(PushDiagnosticsResponse),
-  4,
+  16,
   push_diagnostics_response__field_descriptors,
   push_diagnostics_response__field_indices_by_name,
   1,  push_diagnostics_response__number_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.h
index d3082c489..40f7d616b 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/PushDiagnosticsResponse.pb-c.h
@@ -15,6 +15,7 @@ PROTOBUF_C__BEGIN_DECLS
 #endif
 
 #include "DoubleArray.pb-c.h"
+#include "DigitalPin.pb-c.h"
 
 typedef struct _PushDiagnosticsResponse PushDiagnosticsResponse;
 
@@ -35,10 +36,31 @@ struct  _PushDiagnosticsResponse
   double *dancer3angle;
   size_t n_dispensersmotorsfrequency;
   DoubleArray **dispensersmotorsfrequency;
+  size_t n_dispenser1motorfrequency;
+  double *dispenser1motorfrequency;
+  size_t n_dispenser2motorfrequency;
+  double *dispenser2motorfrequency;
+  size_t n_dispenser3motorfrequency;
+  double *dispenser3motorfrequency;
+  size_t n_dispenser4motorfrequency;
+  double *dispenser4motorfrequency;
+  size_t n_dispenser5motorfrequency;
+  double *dispenser5motorfrequency;
+  size_t n_dispenser6motorfrequency;
+  double *dispenser6motorfrequency;
+  size_t n_dispenser7motorfrequency;
+  double *dispenser7motorfrequency;
+  size_t n_dispenser8motorfrequency;
+  double *dispenser8motorfrequency;
+  size_t n_digitalpins;
+  DigitalPin **digitalpins;
+  char *version;
+  char *versionname;
+  char *versionbuilddate;
 };
 #define PUSH_DIAGNOSTICS_RESPONSE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&push_diagnostics_response__descriptor) \
-    , 0,NULL, 0,NULL, 0,NULL, 0,NULL }
+    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, NULL, NULL, NULL }
 
 
 /* PushDiagnosticsResponse methods */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.c
new file mode 100644
index 000000000..060449149
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetDigitalOutRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "SetDigitalOutRequest.pb-c.h"
+void   set_digital_out_request__init
+                     (SetDigitalOutRequest         *message)
+{
+  static const SetDigitalOutRequest init_value = SET_DIGITAL_OUT_REQUEST__INIT;
+  *message = init_value;
+}
+size_t set_digital_out_request__get_packed_size
+                     (const SetDigitalOutRequest *message)
+{
+  assert(message->base.descriptor == &set_digital_out_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t set_digital_out_request__pack
+                     (const SetDigitalOutRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &set_digital_out_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t set_digital_out_request__pack_to_buffer
+                     (const SetDigitalOutRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &set_digital_out_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+SetDigitalOutRequest *
+       set_digital_out_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (SetDigitalOutRequest *)
+     protobuf_c_message_unpack (&set_digital_out_request__descriptor,
+                                allocator, len, data);
+}
+void   set_digital_out_request__free_unpacked
+                     (SetDigitalOutRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &set_digital_out_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor set_digital_out_request__field_descriptors[2] =
+{
+  {
+    "Port",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(SetDigitalOutRequest, has_port),
+    offsetof(SetDigitalOutRequest, port),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Value",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(SetDigitalOutRequest, has_value),
+    offsetof(SetDigitalOutRequest, value),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned set_digital_out_request__field_indices_by_name[] = {
+  0,   /* field[0] = Port */
+  1,   /* field[1] = Value */
+};
+static const ProtobufCIntRange set_digital_out_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor set_digital_out_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "SetDigitalOutRequest",
+  "SetDigitalOutRequest",
+  "SetDigitalOutRequest",
+  "",
+  sizeof(SetDigitalOutRequest),
+  2,
+  set_digital_out_request__field_descriptors,
+  set_digital_out_request__field_indices_by_name,
+  1,  set_digital_out_request__number_ranges,
+  (ProtobufCMessageInit) set_digital_out_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.h
new file mode 100644
index 000000000..302b41749
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutRequest.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetDigitalOutRequest.proto */
+
+#ifndef PROTOBUF_C_SetDigitalOutRequest_2eproto__INCLUDED
+#define PROTOBUF_C_SetDigitalOutRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _SetDigitalOutRequest SetDigitalOutRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _SetDigitalOutRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_port;
+  int32_t port;
+  protobuf_c_boolean has_value;
+  protobuf_c_boolean value;
+};
+#define SET_DIGITAL_OUT_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&set_digital_out_request__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* SetDigitalOutRequest methods */
+void   set_digital_out_request__init
+                     (SetDigitalOutRequest         *message);
+size_t set_digital_out_request__get_packed_size
+                     (const SetDigitalOutRequest   *message);
+size_t set_digital_out_request__pack
+                     (const SetDigitalOutRequest   *message,
+                      uint8_t             *out);
+size_t set_digital_out_request__pack_to_buffer
+                     (const SetDigitalOutRequest   *message,
+                      ProtobufCBuffer     *buffer);
+SetDigitalOutRequest *
+       set_digital_out_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   set_digital_out_request__free_unpacked
+                     (SetDigitalOutRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*SetDigitalOutRequest_Closure)
+                 (const SetDigitalOutRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor set_digital_out_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_SetDigitalOutRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.c
new file mode 100644
index 000000000..eff7f8973
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetDigitalOutResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "SetDigitalOutResponse.pb-c.h"
+void   set_digital_out_response__init
+                     (SetDigitalOutResponse         *message)
+{
+  static const SetDigitalOutResponse init_value = SET_DIGITAL_OUT_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t set_digital_out_response__get_packed_size
+                     (const SetDigitalOutResponse *message)
+{
+  assert(message->base.descriptor == &set_digital_out_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t set_digital_out_response__pack
+                     (const SetDigitalOutResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &set_digital_out_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t set_digital_out_response__pack_to_buffer
+                     (const SetDigitalOutResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &set_digital_out_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+SetDigitalOutResponse *
+       set_digital_out_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (SetDigitalOutResponse *)
+     protobuf_c_message_unpack (&set_digital_out_response__descriptor,
+                                allocator, len, data);
+}
+void   set_digital_out_response__free_unpacked
+                     (SetDigitalOutResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &set_digital_out_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define set_digital_out_response__field_descriptors NULL
+#define set_digital_out_response__field_indices_by_name NULL
+#define set_digital_out_response__number_ranges NULL
+const ProtobufCMessageDescriptor set_digital_out_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "SetDigitalOutResponse",
+  "SetDigitalOutResponse",
+  "SetDigitalOutResponse",
+  "",
+  sizeof(SetDigitalOutResponse),
+  0,
+  set_digital_out_response__field_descriptors,
+  set_digital_out_response__field_indices_by_name,
+  0,  set_digital_out_response__number_ranges,
+  (ProtobufCMessageInit) set_digital_out_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.h
new file mode 100644
index 000000000..00696e359
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/SetDigitalOutResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetDigitalOutResponse.proto */
+
+#ifndef PROTOBUF_C_SetDigitalOutResponse_2eproto__INCLUDED
+#define PROTOBUF_C_SetDigitalOutResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _SetDigitalOutResponse SetDigitalOutResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _SetDigitalOutResponse
+{
+  ProtobufCMessage base;
+};
+#define SET_DIGITAL_OUT_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&set_digital_out_response__descriptor) \
+     }
+
+
+/* SetDigitalOutResponse methods */
+void   set_digital_out_response__init
+                     (SetDigitalOutResponse         *message);
+size_t set_digital_out_response__get_packed_size
+                     (const SetDigitalOutResponse   *message);
+size_t set_digital_out_response__pack
+                     (const SetDigitalOutResponse   *message,
+                      uint8_t             *out);
+size_t set_digital_out_response__pack_to_buffer
+                     (const SetDigitalOutResponse   *message,
+                      ProtobufCBuffer     *buffer);
+SetDigitalOutResponse *
+       set_digital_out_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   set_digital_out_response__free_unpacked
+                     (SetDigitalOutResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*SetDigitalOutResponse_Closure)
+                 (const SetDigitalOutResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor set_digital_out_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_SetDigitalOutResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.c
new file mode 100644
index 000000000..1e1f22bcc
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadAbortJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ThreadAbortJoggingRequest.pb-c.h"
+void   thread_abort_jogging_request__init
+                     (ThreadAbortJoggingRequest         *message)
+{
+  static const ThreadAbortJoggingRequest init_value = THREAD_ABORT_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t thread_abort_jogging_request__get_packed_size
+                     (const ThreadAbortJoggingRequest *message)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t thread_abort_jogging_request__pack
+                     (const ThreadAbortJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t thread_abort_jogging_request__pack_to_buffer
+                     (const ThreadAbortJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ThreadAbortJoggingRequest *
+       thread_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ThreadAbortJoggingRequest *)
+     protobuf_c_message_unpack (&thread_abort_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   thread_abort_jogging_request__free_unpacked
+                     (ThreadAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &thread_abort_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define thread_abort_jogging_request__field_descriptors NULL
+#define thread_abort_jogging_request__field_indices_by_name NULL
+#define thread_abort_jogging_request__number_ranges NULL
+const ProtobufCMessageDescriptor thread_abort_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "ThreadAbortJoggingRequest",
+  "ThreadAbortJoggingRequest",
+  "ThreadAbortJoggingRequest",
+  "",
+  sizeof(ThreadAbortJoggingRequest),
+  0,
+  thread_abort_jogging_request__field_descriptors,
+  thread_abort_jogging_request__field_indices_by_name,
+  0,  thread_abort_jogging_request__number_ranges,
+  (ProtobufCMessageInit) thread_abort_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.h
new file mode 100644
index 000000000..4bc112122
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingRequest.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadAbortJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_ThreadAbortJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_ThreadAbortJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _ThreadAbortJoggingRequest ThreadAbortJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ThreadAbortJoggingRequest
+{
+  ProtobufCMessage base;
+};
+#define THREAD_ABORT_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&thread_abort_jogging_request__descriptor) \
+     }
+
+
+/* ThreadAbortJoggingRequest methods */
+void   thread_abort_jogging_request__init
+                     (ThreadAbortJoggingRequest         *message);
+size_t thread_abort_jogging_request__get_packed_size
+                     (const ThreadAbortJoggingRequest   *message);
+size_t thread_abort_jogging_request__pack
+                     (const ThreadAbortJoggingRequest   *message,
+                      uint8_t             *out);
+size_t thread_abort_jogging_request__pack_to_buffer
+                     (const ThreadAbortJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+ThreadAbortJoggingRequest *
+       thread_abort_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   thread_abort_jogging_request__free_unpacked
+                     (ThreadAbortJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ThreadAbortJoggingRequest_Closure)
+                 (const ThreadAbortJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor thread_abort_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ThreadAbortJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.c
new file mode 100644
index 000000000..4142dfc18
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadAbortJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ThreadAbortJoggingResponse.pb-c.h"
+void   thread_abort_jogging_response__init
+                     (ThreadAbortJoggingResponse         *message)
+{
+  static const ThreadAbortJoggingResponse init_value = THREAD_ABORT_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t thread_abort_jogging_response__get_packed_size
+                     (const ThreadAbortJoggingResponse *message)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t thread_abort_jogging_response__pack
+                     (const ThreadAbortJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t thread_abort_jogging_response__pack_to_buffer
+                     (const ThreadAbortJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &thread_abort_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ThreadAbortJoggingResponse *
+       thread_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ThreadAbortJoggingResponse *)
+     protobuf_c_message_unpack (&thread_abort_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   thread_abort_jogging_response__free_unpacked
+                     (ThreadAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &thread_abort_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define thread_abort_jogging_response__field_descriptors NULL
+#define thread_abort_jogging_response__field_indices_by_name NULL
+#define thread_abort_jogging_response__number_ranges NULL
+const ProtobufCMessageDescriptor thread_abort_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "ThreadAbortJoggingResponse",
+  "ThreadAbortJoggingResponse",
+  "ThreadAbortJoggingResponse",
+  "",
+  sizeof(ThreadAbortJoggingResponse),
+  0,
+  thread_abort_jogging_response__field_descriptors,
+  thread_abort_jogging_response__field_indices_by_name,
+  0,  thread_abort_jogging_response__number_ranges,
+  (ProtobufCMessageInit) thread_abort_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.h
new file mode 100644
index 000000000..7d3d7e82a
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadAbortJoggingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadAbortJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_ThreadAbortJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_ThreadAbortJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _ThreadAbortJoggingResponse ThreadAbortJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ThreadAbortJoggingResponse
+{
+  ProtobufCMessage base;
+};
+#define THREAD_ABORT_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&thread_abort_jogging_response__descriptor) \
+     }
+
+
+/* ThreadAbortJoggingResponse methods */
+void   thread_abort_jogging_response__init
+                     (ThreadAbortJoggingResponse         *message);
+size_t thread_abort_jogging_response__get_packed_size
+                     (const ThreadAbortJoggingResponse   *message);
+size_t thread_abort_jogging_response__pack
+                     (const ThreadAbortJoggingResponse   *message,
+                      uint8_t             *out);
+size_t thread_abort_jogging_response__pack_to_buffer
+                     (const ThreadAbortJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+ThreadAbortJoggingResponse *
+       thread_abort_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   thread_abort_jogging_response__free_unpacked
+                     (ThreadAbortJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ThreadAbortJoggingResponse_Closure)
+                 (const ThreadAbortJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor thread_abort_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ThreadAbortJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.c
new file mode 100644
index 000000000..f0b387414
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.c
@@ -0,0 +1,106 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadJoggingRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ThreadJoggingRequest.pb-c.h"
+void   thread_jogging_request__init
+                     (ThreadJoggingRequest         *message)
+{
+  static const ThreadJoggingRequest init_value = THREAD_JOGGING_REQUEST__INIT;
+  *message = init_value;
+}
+size_t thread_jogging_request__get_packed_size
+                     (const ThreadJoggingRequest *message)
+{
+  assert(message->base.descriptor == &thread_jogging_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t thread_jogging_request__pack
+                     (const ThreadJoggingRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &thread_jogging_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t thread_jogging_request__pack_to_buffer
+                     (const ThreadJoggingRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &thread_jogging_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ThreadJoggingRequest *
+       thread_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ThreadJoggingRequest *)
+     protobuf_c_message_unpack (&thread_jogging_request__descriptor,
+                                allocator, len, data);
+}
+void   thread_jogging_request__free_unpacked
+                     (ThreadJoggingRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &thread_jogging_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor thread_jogging_request__field_descriptors[2] =
+{
+  {
+    "Direction",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(ThreadJoggingRequest, has_direction),
+    offsetof(ThreadJoggingRequest, direction),
+    &motor_direction__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Speed",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ThreadJoggingRequest, has_speed),
+    offsetof(ThreadJoggingRequest, speed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned thread_jogging_request__field_indices_by_name[] = {
+  0,   /* field[0] = Direction */
+  1,   /* field[1] = Speed */
+};
+static const ProtobufCIntRange thread_jogging_request__number_ranges[2 + 1] =
+{
+  { 1, 0 },
+  { 3, 1 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor thread_jogging_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "ThreadJoggingRequest",
+  "ThreadJoggingRequest",
+  "ThreadJoggingRequest",
+  "",
+  sizeof(ThreadJoggingRequest),
+  2,
+  thread_jogging_request__field_descriptors,
+  thread_jogging_request__field_indices_by_name,
+  2,  thread_jogging_request__number_ranges,
+  (ProtobufCMessageInit) thread_jogging_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.h
new file mode 100644
index 000000000..7669215aa
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingRequest.pb-c.h
@@ -0,0 +1,75 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadJoggingRequest.proto */
+
+#ifndef PROTOBUF_C_ThreadJoggingRequest_2eproto__INCLUDED
+#define PROTOBUF_C_ThreadJoggingRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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 "MotorDirection.pb-c.h"
+
+typedef struct _ThreadJoggingRequest ThreadJoggingRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ThreadJoggingRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_direction;
+  MotorDirection direction;
+  protobuf_c_boolean has_speed;
+  double speed;
+};
+#define THREAD_JOGGING_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&thread_jogging_request__descriptor) \
+    , 0, MOTOR_DIRECTION__Forward, 0, 0 }
+
+
+/* ThreadJoggingRequest methods */
+void   thread_jogging_request__init
+                     (ThreadJoggingRequest         *message);
+size_t thread_jogging_request__get_packed_size
+                     (const ThreadJoggingRequest   *message);
+size_t thread_jogging_request__pack
+                     (const ThreadJoggingRequest   *message,
+                      uint8_t             *out);
+size_t thread_jogging_request__pack_to_buffer
+                     (const ThreadJoggingRequest   *message,
+                      ProtobufCBuffer     *buffer);
+ThreadJoggingRequest *
+       thread_jogging_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   thread_jogging_request__free_unpacked
+                     (ThreadJoggingRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ThreadJoggingRequest_Closure)
+                 (const ThreadJoggingRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor thread_jogging_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ThreadJoggingRequest_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.c
new file mode 100644
index 000000000..c54896825
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadJoggingResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ThreadJoggingResponse.pb-c.h"
+void   thread_jogging_response__init
+                     (ThreadJoggingResponse         *message)
+{
+  static const ThreadJoggingResponse init_value = THREAD_JOGGING_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t thread_jogging_response__get_packed_size
+                     (const ThreadJoggingResponse *message)
+{
+  assert(message->base.descriptor == &thread_jogging_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t thread_jogging_response__pack
+                     (const ThreadJoggingResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &thread_jogging_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t thread_jogging_response__pack_to_buffer
+                     (const ThreadJoggingResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &thread_jogging_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ThreadJoggingResponse *
+       thread_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ThreadJoggingResponse *)
+     protobuf_c_message_unpack (&thread_jogging_response__descriptor,
+                                allocator, len, data);
+}
+void   thread_jogging_response__free_unpacked
+                     (ThreadJoggingResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &thread_jogging_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define thread_jogging_response__field_descriptors NULL
+#define thread_jogging_response__field_indices_by_name NULL
+#define thread_jogging_response__number_ranges NULL
+const ProtobufCMessageDescriptor thread_jogging_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "ThreadJoggingResponse",
+  "ThreadJoggingResponse",
+  "ThreadJoggingResponse",
+  "",
+  sizeof(ThreadJoggingResponse),
+  0,
+  thread_jogging_response__field_descriptors,
+  thread_jogging_response__field_indices_by_name,
+  0,  thread_jogging_response__number_ranges,
+  (ProtobufCMessageInit) thread_jogging_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.h
new file mode 100644
index 000000000..669b0a7b4
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/Diagnostics/ThreadJoggingResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadJoggingResponse.proto */
+
+#ifndef PROTOBUF_C_ThreadJoggingResponse_2eproto__INCLUDED
+#define PROTOBUF_C_ThreadJoggingResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# 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
+
+
+typedef struct _ThreadJoggingResponse ThreadJoggingResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ThreadJoggingResponse
+{
+  ProtobufCMessage base;
+};
+#define THREAD_JOGGING_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&thread_jogging_response__descriptor) \
+     }
+
+
+/* ThreadJoggingResponse methods */
+void   thread_jogging_response__init
+                     (ThreadJoggingResponse         *message);
+size_t thread_jogging_response__get_packed_size
+                     (const ThreadJoggingResponse   *message);
+size_t thread_jogging_response__pack
+                     (const ThreadJoggingResponse   *message,
+                      uint8_t             *out);
+size_t thread_jogging_response__pack_to_buffer
+                     (const ThreadJoggingResponse   *message,
+                      ProtobufCBuffer     *buffer);
+ThreadJoggingResponse *
+       thread_jogging_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   thread_jogging_response__free_unpacked
+                     (ThreadJoggingResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ThreadJoggingResponse_Closure)
+                 (const ThreadJoggingResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor thread_jogging_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ThreadJoggingResponse_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
index 710e54be6..4b6946228 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
@@ -154,8 +154,11 @@
     <ClInclude Include="PMR\ColorLab\ColorSpace.pb-c.h" />
     <ClInclude Include="PMR\ColorLab\ConversionInput.pb-c.h" />
     <ClInclude Include="PMR\ColorLab\ConversionOutput.pb-c.h" />
-    <ClInclude Include="PMR\ColorLab\InputColor.pb-c.h" />
-    <ClInclude Include="PMR\ColorLab\OutputColor.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\InputCoordinates.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\InputLiquid.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\LiquidType.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\OutputCoordinates.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\OutputLiquid.pb-c.h" />
     <ClInclude Include="Tester.h" />
     <ClInclude Include="PMR\Stubs\CalculateRequest.pb-c.h" />
     <ClInclude Include="PMR\Stubs\CalculateResponse.pb-c.h" />
@@ -170,8 +173,11 @@
     <ClCompile Include="PMR\ColorLab\ColorSpace.pb-c.c" />
     <ClCompile Include="PMR\ColorLab\ConversionInput.pb-c.c" />
     <ClCompile Include="PMR\ColorLab\ConversionOutput.pb-c.c" />
-    <ClCompile Include="PMR\ColorLab\InputColor.pb-c.c" />
-    <ClCompile Include="PMR\ColorLab\OutputColor.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\InputCoordinates.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\InputLiquid.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\LiquidType.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\OutputCoordinates.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\OutputLiquid.pb-c.c" />
     <ClCompile Include="Tester.cpp" />
     <ClCompile Include="PMR\Stubs\CalculateRequest.pb-c.c" />
     <ClCompile Include="PMR\Stubs\CalculateResponse.pb-c.c" />
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
index 32b8b436d..4b2415b0e 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
@@ -48,12 +48,6 @@
     <ClInclude Include="PMR\ColorLab\ConversionOutput.pb-c.h">
       <Filter>PMR</Filter>
     </ClInclude>
-    <ClInclude Include="PMR\ColorLab\InputColor.pb-c.h">
-      <Filter>PMR</Filter>
-    </ClInclude>
-    <ClInclude Include="PMR\ColorLab\OutputColor.pb-c.h">
-      <Filter>PMR</Filter>
-    </ClInclude>
     <ClInclude Include="PMR\ColorLab\CalibrationPoint.pb-c.h">
       <Filter>PMR</Filter>
     </ClInclude>
@@ -63,6 +57,21 @@
     <ClInclude Include="protobuf-c\protobuf-c.h">
       <Filter>Protobuf</Filter>
     </ClInclude>
+    <ClInclude Include="PMR\ColorLab\InputLiquid.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
+    <ClInclude Include="PMR\ColorLab\LiquidType.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
+    <ClInclude Include="PMR\ColorLab\OutputLiquid.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
+    <ClInclude Include="PMR\ColorLab\InputCoordinates.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
+    <ClInclude Include="PMR\ColorLab\OutputCoordinates.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="PMR\Stubs\CalculateRequest.pb-c.c">
@@ -86,12 +95,6 @@
     <ClCompile Include="PMR\ColorLab\ConversionOutput.pb-c.c">
       <Filter>PMR</Filter>
     </ClCompile>
-    <ClCompile Include="PMR\ColorLab\InputColor.pb-c.c">
-      <Filter>PMR</Filter>
-    </ClCompile>
-    <ClCompile Include="PMR\ColorLab\OutputColor.pb-c.c">
-      <Filter>PMR</Filter>
-    </ClCompile>
     <ClCompile Include="PMR\ColorLab\CalibrationPoint.pb-c.c">
       <Filter>PMR</Filter>
     </ClCompile>
@@ -104,5 +107,20 @@
     <ClCompile Include="protobuf-c\protobuf-c.c">
       <Filter>Protobuf</Filter>
     </ClCompile>
+    <ClCompile Include="PMR\ColorLab\LiquidType.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
+    <ClCompile Include="PMR\ColorLab\OutputLiquid.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
+    <ClCompile Include="PMR\ColorLab\InputLiquid.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
+    <ClCompile Include="PMR\ColorLab\InputCoordinates.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
+    <ClCompile Include="PMR\ColorLab\OutputCoordinates.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/LiquidTypeExtensions.cs b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/LiquidTypeExtensions.cs
new file mode 100644
index 000000000..89d71d148
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/LiquidTypeExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.PMR.ColorLab;
+using Tango.Integration.Observables;
+
+public static class LiquidTypeExtensions
+{
+    public static Tango.PMR.ColorLab.LiquidType ToColorLibLiquidType(this Tango.Integration.Observables.LiquidType liquidType)
+    {
+        return (Tango.PMR.ColorLab.LiquidType)liquidType.Code;
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index dd6f8b99e..31da09264 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -161,6 +161,7 @@
     <Compile Include="Observables\Enumerations\Sensors.cs" />
     <Compile Include="Observables\Enumerations\WindingMethods.cs" />
     <Compile Include="Observables\ExtensionMethods\ConfigurationExtensions.cs" />
+    <Compile Include="Observables\ExtensionMethods\LiquidTypeExtensions.cs" />
     <Compile Include="Observables\ExtensionMethods\ObservableEntityExtensions.cs" />
     <Compile Include="Observables\ExtensionMethods\ProcessParametersTablesGroupExtensions.cs" />
     <Compile Include="Observables\IObservableEntity.cs" />
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/CalibrationData.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/CalibrationData.cs
index 8af16441b..2cb3063bf 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/CalibrationData.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/CalibrationData.cs
@@ -23,14 +23,15 @@ namespace Tango.PMR.ColorLab {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChVDYWxpYnJhdGlvbkRhdGEucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
-            "Q2FsaWJyYXRpb25Qb2ludC5wcm90byJSCg9DYWxpYnJhdGlvbkRhdGESPwoR",
-            "Q2FsaWJyYXRpb25Qb2ludHMYASADKAsyJC5UYW5nby5QTVIuQ29sb3JMYWIu",
-            "Q2FsaWJyYXRpb25Qb2ludEIeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9y",
-            "bGFiYgZwcm90bzM="));
+            "Q2FsaWJyYXRpb25Qb2ludC5wcm90bxoQTGlxdWlkVHlwZS5wcm90byKGAQoP",
+            "Q2FsaWJyYXRpb25EYXRhEjIKCkxpcXVpZFR5cGUYASABKA4yHi5UYW5nby5Q",
+            "TVIuQ29sb3JMYWIuTGlxdWlkVHlwZRI/ChFDYWxpYnJhdGlvblBvaW50cxgC",
+            "IAMoCzIkLlRhbmdvLlBNUi5Db2xvckxhYi5DYWxpYnJhdGlvblBvaW50Qh4K",
+            "HGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.CalibrationPointReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.CalibrationPointReflection.Descriptor, global::Tango.PMR.ColorLab.LiquidTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.CalibrationData), global::Tango.PMR.ColorLab.CalibrationData.Parser, new[]{ "CalibrationPoints" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.CalibrationData), global::Tango.PMR.ColorLab.CalibrationData.Parser, new[]{ "LiquidType", "CalibrationPoints" }, null, null, null)
           }));
     }
     #endregion
@@ -61,6 +62,7 @@ namespace Tango.PMR.ColorLab {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public CalibrationData(CalibrationData other) : this() {
+      liquidType_ = other.liquidType_;
       calibrationPoints_ = other.calibrationPoints_.Clone();
     }
 
@@ -69,10 +71,21 @@ namespace Tango.PMR.ColorLab {
       return new CalibrationData(this);
     }
 
+    /// <summary>Field number for the "LiquidType" field.</summary>
+    public const int LiquidTypeFieldNumber = 1;
+    private global::Tango.PMR.ColorLab.LiquidType liquidType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.LiquidType LiquidType {
+      get { return liquidType_; }
+      set {
+        liquidType_ = value;
+      }
+    }
+
     /// <summary>Field number for the "CalibrationPoints" field.</summary>
-    public const int CalibrationPointsFieldNumber = 1;
+    public const int CalibrationPointsFieldNumber = 2;
     private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.CalibrationPoint> _repeated_calibrationPoints_codec
-        = pb::FieldCodec.ForMessage(10, global::Tango.PMR.ColorLab.CalibrationPoint.Parser);
+        = pb::FieldCodec.ForMessage(18, global::Tango.PMR.ColorLab.CalibrationPoint.Parser);
     private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.CalibrationPoint> calibrationPoints_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.CalibrationPoint>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pbc::RepeatedField<global::Tango.PMR.ColorLab.CalibrationPoint> CalibrationPoints {
@@ -92,6 +105,7 @@ namespace Tango.PMR.ColorLab {
       if (ReferenceEquals(other, this)) {
         return true;
       }
+      if (LiquidType != other.LiquidType) return false;
       if(!calibrationPoints_.Equals(other.calibrationPoints_)) return false;
       return true;
     }
@@ -99,6 +113,7 @@ namespace Tango.PMR.ColorLab {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
+      if (LiquidType != 0) hash ^= LiquidType.GetHashCode();
       hash ^= calibrationPoints_.GetHashCode();
       return hash;
     }
@@ -110,12 +125,19 @@ namespace Tango.PMR.ColorLab {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
+      if (LiquidType != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) LiquidType);
+      }
       calibrationPoints_.WriteTo(output, _repeated_calibrationPoints_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
+      if (LiquidType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) LiquidType);
+      }
       size += calibrationPoints_.CalculateSize(_repeated_calibrationPoints_codec);
       return size;
     }
@@ -125,6 +147,9 @@ namespace Tango.PMR.ColorLab {
       if (other == null) {
         return;
       }
+      if (other.LiquidType != 0) {
+        LiquidType = other.LiquidType;
+      }
       calibrationPoints_.Add(other.calibrationPoints_);
     }
 
@@ -136,7 +161,11 @@ namespace Tango.PMR.ColorLab {
           default:
             input.SkipLastField();
             break;
-          case 10: {
+          case 8: {
+            liquidType_ = (global::Tango.PMR.ColorLab.LiquidType) input.ReadEnum();
+            break;
+          }
+          case 18: {
             calibrationPoints_.AddEntriesFrom(input, _repeated_calibrationPoints_codec);
             break;
           }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index e2d7342b2..20f133b7c 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -22,19 +22,19 @@ namespace Tango.PMR.ColorLab {
     static ConversionInputReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoQ",
-            "SW5wdXRDb2xvci5wcm90bxoVQ2FsaWJyYXRpb25EYXRhLnByb3RvIvIBCg9D",
-            "b252ZXJzaW9uSW5wdXQSDwoHVGhyZWFkTBgBIAEoARIPCgdUaHJlYWRBGAIg",
-            "ASgBEg8KB1RocmVhZEIYAyABKAESLQoFSW5wdXQYBCABKAsyHi5UYW5nby5Q",
-            "TVIuQ29sb3JMYWIuSW5wdXRDb2xvchITCgtGb3J3YXJkRGF0YRgFIAEoDBIT",
-            "CgtJbnZlcnNlRGF0YRgGIAEoDBI8Cg9DYWxpYnJhdGlvbkRhdGEYByABKAsy",
-            "Iy5UYW5nby5QTVIuQ29sb3JMYWIuQ2FsaWJyYXRpb25EYXRhEhUKDVNlZ21l",
-            "bnRMZW5ndGgYCCABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxh",
-            "YmIGcHJvdG8z"));
+            "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
+            "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90byL5AQoP",
+            "Q29udmVyc2lvbklucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFkQRgC",
+            "IAEoARIPCgdUaHJlYWRCGAMgASgBEjIKCkNvbG9yU3BhY2UYBCABKA4yHi5U",
+            "YW5nby5QTVIuQ29sb3JMYWIuQ29sb3JTcGFjZRI+ChBJbnB1dENvb3JkaW5h",
+            "dGVzGAUgASgLMiQuVGFuZ28uUE1SLkNvbG9yTGFiLklucHV0Q29vcmRpbmF0",
+            "ZXMSEwoLRm9yd2FyZERhdGEYBiABKAwSEwoLSW52ZXJzZURhdGEYByABKAwS",
+            "FQoNU2VnbWVudExlbmd0aBgIIAEoAUIeChxjb20udHdpbmUudGFuZ28ucG1y",
+            "LmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputColorReflection.Descriptor, global::Tango.PMR.ColorLab.CalibrationDataReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "Input", "ForwardData", "InverseData", "CalibrationData", "SegmentLength" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength" }, null, null, null)
           }));
     }
     #endregion
@@ -68,10 +68,10 @@ namespace Tango.PMR.ColorLab {
       threadL_ = other.threadL_;
       threadA_ = other.threadA_;
       threadB_ = other.threadB_;
-      Input = other.input_ != null ? other.Input.Clone() : null;
+      colorSpace_ = other.colorSpace_;
+      InputCoordinates = other.inputCoordinates_ != null ? other.InputCoordinates.Clone() : null;
       forwardData_ = other.forwardData_;
       inverseData_ = other.inverseData_;
-      CalibrationData = other.calibrationData_ != null ? other.CalibrationData.Clone() : null;
       segmentLength_ = other.segmentLength_;
     }
 
@@ -113,19 +113,30 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
-    /// <summary>Field number for the "Input" field.</summary>
-    public const int InputFieldNumber = 4;
-    private global::Tango.PMR.ColorLab.InputColor input_;
+    /// <summary>Field number for the "ColorSpace" field.</summary>
+    public const int ColorSpaceFieldNumber = 4;
+    private global::Tango.PMR.ColorLab.ColorSpace colorSpace_ = 0;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.ColorLab.InputColor Input {
-      get { return input_; }
+    public global::Tango.PMR.ColorLab.ColorSpace ColorSpace {
+      get { return colorSpace_; }
       set {
-        input_ = value;
+        colorSpace_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "InputCoordinates" field.</summary>
+    public const int InputCoordinatesFieldNumber = 5;
+    private global::Tango.PMR.ColorLab.InputCoordinates inputCoordinates_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.InputCoordinates InputCoordinates {
+      get { return inputCoordinates_; }
+      set {
+        inputCoordinates_ = value;
       }
     }
 
     /// <summary>Field number for the "ForwardData" field.</summary>
-    public const int ForwardDataFieldNumber = 5;
+    public const int ForwardDataFieldNumber = 6;
     private pb::ByteString forwardData_ = pb::ByteString.Empty;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pb::ByteString ForwardData {
@@ -136,7 +147,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "InverseData" field.</summary>
-    public const int InverseDataFieldNumber = 6;
+    public const int InverseDataFieldNumber = 7;
     private pb::ByteString inverseData_ = pb::ByteString.Empty;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pb::ByteString InverseData {
@@ -146,17 +157,6 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
-    /// <summary>Field number for the "CalibrationData" field.</summary>
-    public const int CalibrationDataFieldNumber = 7;
-    private global::Tango.PMR.ColorLab.CalibrationData calibrationData_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.ColorLab.CalibrationData CalibrationData {
-      get { return calibrationData_; }
-      set {
-        calibrationData_ = value;
-      }
-    }
-
     /// <summary>Field number for the "SegmentLength" field.</summary>
     public const int SegmentLengthFieldNumber = 8;
     private double segmentLength_;
@@ -184,10 +184,10 @@ namespace Tango.PMR.ColorLab {
       if (ThreadL != other.ThreadL) return false;
       if (ThreadA != other.ThreadA) return false;
       if (ThreadB != other.ThreadB) return false;
-      if (!object.Equals(Input, other.Input)) return false;
+      if (ColorSpace != other.ColorSpace) return false;
+      if (!object.Equals(InputCoordinates, other.InputCoordinates)) return false;
       if (ForwardData != other.ForwardData) return false;
       if (InverseData != other.InverseData) return false;
-      if (!object.Equals(CalibrationData, other.CalibrationData)) return false;
       if (SegmentLength != other.SegmentLength) return false;
       return true;
     }
@@ -198,10 +198,10 @@ namespace Tango.PMR.ColorLab {
       if (ThreadL != 0D) hash ^= ThreadL.GetHashCode();
       if (ThreadA != 0D) hash ^= ThreadA.GetHashCode();
       if (ThreadB != 0D) hash ^= ThreadB.GetHashCode();
-      if (input_ != null) hash ^= Input.GetHashCode();
+      if (ColorSpace != 0) hash ^= ColorSpace.GetHashCode();
+      if (inputCoordinates_ != null) hash ^= InputCoordinates.GetHashCode();
       if (ForwardData.Length != 0) hash ^= ForwardData.GetHashCode();
       if (InverseData.Length != 0) hash ^= InverseData.GetHashCode();
-      if (calibrationData_ != null) hash ^= CalibrationData.GetHashCode();
       if (SegmentLength != 0D) hash ^= SegmentLength.GetHashCode();
       return hash;
     }
@@ -225,21 +225,21 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(25);
         output.WriteDouble(ThreadB);
       }
-      if (input_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(Input);
+      if (ColorSpace != 0) {
+        output.WriteRawTag(32);
+        output.WriteEnum((int) ColorSpace);
       }
-      if (ForwardData.Length != 0) {
+      if (inputCoordinates_ != null) {
         output.WriteRawTag(42);
-        output.WriteBytes(ForwardData);
+        output.WriteMessage(InputCoordinates);
       }
-      if (InverseData.Length != 0) {
+      if (ForwardData.Length != 0) {
         output.WriteRawTag(50);
-        output.WriteBytes(InverseData);
+        output.WriteBytes(ForwardData);
       }
-      if (calibrationData_ != null) {
+      if (InverseData.Length != 0) {
         output.WriteRawTag(58);
-        output.WriteMessage(CalibrationData);
+        output.WriteBytes(InverseData);
       }
       if (SegmentLength != 0D) {
         output.WriteRawTag(65);
@@ -259,8 +259,11 @@ namespace Tango.PMR.ColorLab {
       if (ThreadB != 0D) {
         size += 1 + 8;
       }
-      if (input_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Input);
+      if (ColorSpace != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ColorSpace);
+      }
+      if (inputCoordinates_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(InputCoordinates);
       }
       if (ForwardData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(ForwardData);
@@ -268,9 +271,6 @@ namespace Tango.PMR.ColorLab {
       if (InverseData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(InverseData);
       }
-      if (calibrationData_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(CalibrationData);
-      }
       if (SegmentLength != 0D) {
         size += 1 + 8;
       }
@@ -291,11 +291,14 @@ namespace Tango.PMR.ColorLab {
       if (other.ThreadB != 0D) {
         ThreadB = other.ThreadB;
       }
-      if (other.input_ != null) {
-        if (input_ == null) {
-          input_ = new global::Tango.PMR.ColorLab.InputColor();
+      if (other.ColorSpace != 0) {
+        ColorSpace = other.ColorSpace;
+      }
+      if (other.inputCoordinates_ != null) {
+        if (inputCoordinates_ == null) {
+          inputCoordinates_ = new global::Tango.PMR.ColorLab.InputCoordinates();
         }
-        Input.MergeFrom(other.Input);
+        InputCoordinates.MergeFrom(other.InputCoordinates);
       }
       if (other.ForwardData.Length != 0) {
         ForwardData = other.ForwardData;
@@ -303,12 +306,6 @@ namespace Tango.PMR.ColorLab {
       if (other.InverseData.Length != 0) {
         InverseData = other.InverseData;
       }
-      if (other.calibrationData_ != null) {
-        if (calibrationData_ == null) {
-          calibrationData_ = new global::Tango.PMR.ColorLab.CalibrationData();
-        }
-        CalibrationData.MergeFrom(other.CalibrationData);
-      }
       if (other.SegmentLength != 0D) {
         SegmentLength = other.SegmentLength;
       }
@@ -334,26 +331,23 @@ namespace Tango.PMR.ColorLab {
             ThreadB = input.ReadDouble();
             break;
           }
-          case 34: {
-            if (input_ == null) {
-              input_ = new global::Tango.PMR.ColorLab.InputColor();
-            }
-            input.ReadMessage(input_);
+          case 32: {
+            colorSpace_ = (global::Tango.PMR.ColorLab.ColorSpace) input.ReadEnum();
             break;
           }
           case 42: {
-            ForwardData = input.ReadBytes();
+            if (inputCoordinates_ == null) {
+              inputCoordinates_ = new global::Tango.PMR.ColorLab.InputCoordinates();
+            }
+            input.ReadMessage(inputCoordinates_);
             break;
           }
           case 50: {
-            InverseData = input.ReadBytes();
+            ForwardData = input.ReadBytes();
             break;
           }
           case 58: {
-            if (calibrationData_ == null) {
-              calibrationData_ = new global::Tango.PMR.ColorLab.CalibrationData();
-            }
-            input.ReadMessage(calibrationData_);
+            InverseData = input.ReadBytes();
             break;
           }
           case 65: {
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionOutput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionOutput.cs
index 818a88771..350cf09d4 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionOutput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionOutput.cs
@@ -23,14 +23,17 @@ namespace Tango.PMR.ColorLab {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChZDb252ZXJzaW9uT3V0cHV0LnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIa",
-            "EU91dHB1dENvbG9yLnByb3RvIlwKEENvbnZlcnNpb25PdXRwdXQSNAoLU3Vn",
-            "Z2VzdGlvbnMYASADKAsyHy5UYW5nby5QTVIuQ29sb3JMYWIuT3V0cHV0Q29s",
-            "b3ISEgoKT3V0T2ZHYW11dBgCIAEoCEIeChxjb20udHdpbmUudGFuZ28ucG1y",
-            "LmNvbG9ybGFiYgZwcm90bzM="));
+            "F091dHB1dENvb3JkaW5hdGVzLnByb3RvIuoBChBDb252ZXJzaW9uT3V0cHV0",
+            "Ej4KD0hpdmVDb29yZGluYXRlcxgBIAMoCzIlLlRhbmdvLlBNUi5Db2xvckxh",
+            "Yi5PdXRwdXRDb29yZGluYXRlcxJAChFUcmlwbGVDb29yZGluYXRlcxgCIAMo",
+            "CzIlLlRhbmdvLlBNUi5Db2xvckxhYi5PdXRwdXRDb29yZGluYXRlcxJAChFT",
+            "aW5nbGVDb29yZGluYXRlcxgDIAEoCzIlLlRhbmdvLlBNUi5Db2xvckxhYi5P",
+            "dXRwdXRDb29yZGluYXRlcxISCgpPdXRPZkdhbXV0GAUgASgIQh4KHGNvbS50",
+            "d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.OutputColorReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.OutputCoordinatesReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionOutput), global::Tango.PMR.ColorLab.ConversionOutput.Parser, new[]{ "Suggestions", "OutOfGamut" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionOutput), global::Tango.PMR.ColorLab.ConversionOutput.Parser, new[]{ "HiveCoordinates", "TripleCoordinates", "SingleCoordinates", "OutOfGamut" }, null, null, null)
           }));
     }
     #endregion
@@ -61,7 +64,9 @@ namespace Tango.PMR.ColorLab {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public ConversionOutput(ConversionOutput other) : this() {
-      suggestions_ = other.suggestions_.Clone();
+      hiveCoordinates_ = other.hiveCoordinates_.Clone();
+      tripleCoordinates_ = other.tripleCoordinates_.Clone();
+      SingleCoordinates = other.singleCoordinates_ != null ? other.SingleCoordinates.Clone() : null;
       outOfGamut_ = other.outOfGamut_;
     }
 
@@ -70,18 +75,39 @@ namespace Tango.PMR.ColorLab {
       return new ConversionOutput(this);
     }
 
-    /// <summary>Field number for the "Suggestions" field.</summary>
-    public const int SuggestionsFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.OutputColor> _repeated_suggestions_codec
-        = pb::FieldCodec.ForMessage(10, global::Tango.PMR.ColorLab.OutputColor.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputColor> suggestions_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputColor>();
+    /// <summary>Field number for the "HiveCoordinates" field.</summary>
+    public const int HiveCoordinatesFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.OutputCoordinates> _repeated_hiveCoordinates_codec
+        = pb::FieldCodec.ForMessage(10, global::Tango.PMR.ColorLab.OutputCoordinates.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates> hiveCoordinates_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputColor> Suggestions {
-      get { return suggestions_; }
+    public pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates> HiveCoordinates {
+      get { return hiveCoordinates_; }
+    }
+
+    /// <summary>Field number for the "TripleCoordinates" field.</summary>
+    public const int TripleCoordinatesFieldNumber = 2;
+    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.OutputCoordinates> _repeated_tripleCoordinates_codec
+        = pb::FieldCodec.ForMessage(18, global::Tango.PMR.ColorLab.OutputCoordinates.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates> tripleCoordinates_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputCoordinates> TripleCoordinates {
+      get { return tripleCoordinates_; }
+    }
+
+    /// <summary>Field number for the "SingleCoordinates" field.</summary>
+    public const int SingleCoordinatesFieldNumber = 3;
+    private global::Tango.PMR.ColorLab.OutputCoordinates singleCoordinates_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.OutputCoordinates SingleCoordinates {
+      get { return singleCoordinates_; }
+      set {
+        singleCoordinates_ = value;
+      }
     }
 
     /// <summary>Field number for the "OutOfGamut" field.</summary>
-    public const int OutOfGamutFieldNumber = 2;
+    public const int OutOfGamutFieldNumber = 5;
     private bool outOfGamut_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public bool OutOfGamut {
@@ -104,7 +130,9 @@ namespace Tango.PMR.ColorLab {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if(!suggestions_.Equals(other.suggestions_)) return false;
+      if(!hiveCoordinates_.Equals(other.hiveCoordinates_)) return false;
+      if(!tripleCoordinates_.Equals(other.tripleCoordinates_)) return false;
+      if (!object.Equals(SingleCoordinates, other.SingleCoordinates)) return false;
       if (OutOfGamut != other.OutOfGamut) return false;
       return true;
     }
@@ -112,7 +140,9 @@ namespace Tango.PMR.ColorLab {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      hash ^= suggestions_.GetHashCode();
+      hash ^= hiveCoordinates_.GetHashCode();
+      hash ^= tripleCoordinates_.GetHashCode();
+      if (singleCoordinates_ != null) hash ^= SingleCoordinates.GetHashCode();
       if (OutOfGamut != false) hash ^= OutOfGamut.GetHashCode();
       return hash;
     }
@@ -124,9 +154,14 @@ namespace Tango.PMR.ColorLab {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      suggestions_.WriteTo(output, _repeated_suggestions_codec);
+      hiveCoordinates_.WriteTo(output, _repeated_hiveCoordinates_codec);
+      tripleCoordinates_.WriteTo(output, _repeated_tripleCoordinates_codec);
+      if (singleCoordinates_ != null) {
+        output.WriteRawTag(26);
+        output.WriteMessage(SingleCoordinates);
+      }
       if (OutOfGamut != false) {
-        output.WriteRawTag(16);
+        output.WriteRawTag(40);
         output.WriteBool(OutOfGamut);
       }
     }
@@ -134,7 +169,11 @@ namespace Tango.PMR.ColorLab {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      size += suggestions_.CalculateSize(_repeated_suggestions_codec);
+      size += hiveCoordinates_.CalculateSize(_repeated_hiveCoordinates_codec);
+      size += tripleCoordinates_.CalculateSize(_repeated_tripleCoordinates_codec);
+      if (singleCoordinates_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SingleCoordinates);
+      }
       if (OutOfGamut != false) {
         size += 1 + 1;
       }
@@ -146,7 +185,14 @@ namespace Tango.PMR.ColorLab {
       if (other == null) {
         return;
       }
-      suggestions_.Add(other.suggestions_);
+      hiveCoordinates_.Add(other.hiveCoordinates_);
+      tripleCoordinates_.Add(other.tripleCoordinates_);
+      if (other.singleCoordinates_ != null) {
+        if (singleCoordinates_ == null) {
+          singleCoordinates_ = new global::Tango.PMR.ColorLab.OutputCoordinates();
+        }
+        SingleCoordinates.MergeFrom(other.SingleCoordinates);
+      }
       if (other.OutOfGamut != false) {
         OutOfGamut = other.OutOfGamut;
       }
@@ -161,10 +207,21 @@ namespace Tango.PMR.ColorLab {
             input.SkipLastField();
             break;
           case 10: {
-            suggestions_.AddEntriesFrom(input, _repeated_suggestions_codec);
+            hiveCoordinates_.AddEntriesFrom(input, _repeated_hiveCoordinates_codec);
+            break;
+          }
+          case 18: {
+            tripleCoordinates_.AddEntriesFrom(input, _repeated_tripleCoordinates_codec);
+            break;
+          }
+          case 26: {
+            if (singleCoordinates_ == null) {
+              singleCoordinates_ = new global::Tango.PMR.ColorLab.OutputCoordinates();
+            }
+            input.ReadMessage(singleCoordinates_);
             break;
           }
-          case 16: {
+          case 40: {
             OutOfGamut = input.ReadBool();
             break;
           }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/InputColor.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/InputCoordinates.cs
index 0ac5d1b0d..943b01ed1 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/InputColor.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/InputCoordinates.cs
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: InputColor.proto
+// source: InputCoordinates.proto
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -9,47 +9,45 @@ using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
 namespace Tango.PMR.ColorLab {
 
-  /// <summary>Holder for reflection information generated from InputColor.proto</summary>
-  public static partial class InputColorReflection {
+  /// <summary>Holder for reflection information generated from InputCoordinates.proto</summary>
+  public static partial class InputCoordinatesReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for InputColor.proto</summary>
+    /// <summary>File descriptor for InputCoordinates.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static InputColorReflection() {
+    static InputCoordinatesReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBJbnB1dENvbG9yLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIaEENvbG9y",
-            "U3BhY2UucHJvdG8izQIKCklucHV0Q29sb3ISMgoKQ29sb3JTcGFjZRgBIAEo",
-            "DjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNwYWNlEg4KBkxlbmd0aBgC",
-            "IAEoARILCgNSZWQYAyABKAUSDQoFR3JlZW4YBCABKAUSDAoEQmx1ZRgFIAEo",
-            "BRIMCgRDeWFuGAYgASgBEg8KB01hZ2VudGEYByABKAESDgoGWWVsbG93GAgg",
-            "ASgBEg0KBUJsYWNrGAkgASgBEgkKAUwYCiABKAESCQoBQRgLIAEoARIJCgFC",
-            "GAwgASgBEgoKAkNWGA0gASgBEgoKAk1WGA4gASgBEgoKAllWGA8gASgBEgoK",
-            "AktWGBAgASgBEgoKAlY0GBEgASgBEgoKAlY1GBIgASgBEgoKAlY2GBMgASgB",
-            "EgoKAlY3GBQgASgBEhIKClBhbnRvbkNvZGUYFSABKAVCHgocY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "ChZJbnB1dENvb3JkaW5hdGVzLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIa",
+            "EUlucHV0TGlxdWlkLnByb3RvIvQBChBJbnB1dENvb3JkaW5hdGVzEg4KBkxl",
+            "bmd0aBgBIAEoARILCgNSZWQYAiABKAUSDQoFR3JlZW4YAyABKAUSDAoEQmx1",
+            "ZRgEIAEoBRIMCgRDeWFuGAUgASgBEg8KB01hZ2VudGEYBiABKAESDgoGWWVs",
+            "bG93GAcgASgBEgsKA0tleRgIIAEoARIJCgFMGAkgASgBEgkKAUEYCiABKAES",
+            "CQoBQhgLIAEoARISCgpQYW50b25Db2RlGAwgASgFEjUKDElucHV0TGlxdWlk",
+            "cxgNIAMoCzIfLlRhbmdvLlBNUi5Db2xvckxhYi5JbnB1dExpcXVpZEIeChxj",
+            "b20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.InputColor), global::Tango.PMR.ColorLab.InputColor.Parser, new[]{ "ColorSpace", "Length", "Red", "Green", "Blue", "Cyan", "Magenta", "Yellow", "Black", "L", "A", "B", "CV", "MV", "YV", "KV", "V4", "V5", "V6", "V7", "PantonCode" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.InputCoordinates), global::Tango.PMR.ColorLab.InputCoordinates.Parser, new[]{ "Length", "Red", "Green", "Blue", "Cyan", "Magenta", "Yellow", "Key", "L", "A", "B", "PantonCode", "InputLiquids" }, null, null, null)
           }));
     }
     #endregion
 
   }
   #region Messages
-  public sealed partial class InputColor : pb::IMessage<InputColor> {
-    private static readonly pb::MessageParser<InputColor> _parser = new pb::MessageParser<InputColor>(() => new InputColor());
+  public sealed partial class InputCoordinates : pb::IMessage<InputCoordinates> {
+    private static readonly pb::MessageParser<InputCoordinates> _parser = new pb::MessageParser<InputCoordinates>(() => new InputCoordinates());
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<InputColor> Parser { get { return _parser; } }
+    public static pb::MessageParser<InputCoordinates> Parser { get { return _parser; } }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.ColorLab.InputColorReflection.Descriptor.MessageTypes[0]; }
+      get { return global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -58,15 +56,14 @@ namespace Tango.PMR.ColorLab {
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public InputColor() {
+    public InputCoordinates() {
       OnConstruction();
     }
 
     partial void OnConstruction();
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public InputColor(InputColor other) : this() {
-      colorSpace_ = other.colorSpace_;
+    public InputCoordinates(InputCoordinates other) : this() {
       length_ = other.length_;
       red_ = other.red_;
       green_ = other.green_;
@@ -74,39 +71,21 @@ namespace Tango.PMR.ColorLab {
       cyan_ = other.cyan_;
       magenta_ = other.magenta_;
       yellow_ = other.yellow_;
-      black_ = other.black_;
+      key_ = other.key_;
       l_ = other.l_;
       a_ = other.a_;
       b_ = other.b_;
-      cV_ = other.cV_;
-      mV_ = other.mV_;
-      yV_ = other.yV_;
-      kV_ = other.kV_;
-      v4_ = other.v4_;
-      v5_ = other.v5_;
-      v6_ = other.v6_;
-      v7_ = other.v7_;
       pantonCode_ = other.pantonCode_;
+      inputLiquids_ = other.inputLiquids_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public InputColor Clone() {
-      return new InputColor(this);
-    }
-
-    /// <summary>Field number for the "ColorSpace" field.</summary>
-    public const int ColorSpaceFieldNumber = 1;
-    private global::Tango.PMR.ColorLab.ColorSpace colorSpace_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.ColorLab.ColorSpace ColorSpace {
-      get { return colorSpace_; }
-      set {
-        colorSpace_ = value;
-      }
+    public InputCoordinates Clone() {
+      return new InputCoordinates(this);
     }
 
     /// <summary>Field number for the "Length" field.</summary>
-    public const int LengthFieldNumber = 2;
+    public const int LengthFieldNumber = 1;
     private double length_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Length {
@@ -117,7 +96,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Red" field.</summary>
-    public const int RedFieldNumber = 3;
+    public const int RedFieldNumber = 2;
     private int red_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int Red {
@@ -128,7 +107,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Green" field.</summary>
-    public const int GreenFieldNumber = 4;
+    public const int GreenFieldNumber = 3;
     private int green_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int Green {
@@ -139,7 +118,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Blue" field.</summary>
-    public const int BlueFieldNumber = 5;
+    public const int BlueFieldNumber = 4;
     private int blue_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int Blue {
@@ -150,7 +129,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Cyan" field.</summary>
-    public const int CyanFieldNumber = 6;
+    public const int CyanFieldNumber = 5;
     private double cyan_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Cyan {
@@ -161,7 +140,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Magenta" field.</summary>
-    public const int MagentaFieldNumber = 7;
+    public const int MagentaFieldNumber = 6;
     private double magenta_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Magenta {
@@ -172,7 +151,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "Yellow" field.</summary>
-    public const int YellowFieldNumber = 8;
+    public const int YellowFieldNumber = 7;
     private double yellow_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Yellow {
@@ -182,19 +161,19 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
-    /// <summary>Field number for the "Black" field.</summary>
-    public const int BlackFieldNumber = 9;
-    private double black_;
+    /// <summary>Field number for the "Key" field.</summary>
+    public const int KeyFieldNumber = 8;
+    private double key_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Black {
-      get { return black_; }
+    public double Key {
+      get { return key_; }
       set {
-        black_ = value;
+        key_ = value;
       }
     }
 
     /// <summary>Field number for the "L" field.</summary>
-    public const int LFieldNumber = 10;
+    public const int LFieldNumber = 9;
     private double l_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double L {
@@ -205,7 +184,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "A" field.</summary>
-    public const int AFieldNumber = 11;
+    public const int AFieldNumber = 10;
     private double a_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double A {
@@ -216,7 +195,7 @@ namespace Tango.PMR.ColorLab {
     }
 
     /// <summary>Field number for the "B" field.</summary>
-    public const int BFieldNumber = 12;
+    public const int BFieldNumber = 11;
     private double b_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double B {
@@ -226,96 +205,8 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
-    /// <summary>Field number for the "CV" field.</summary>
-    public const int CVFieldNumber = 13;
-    private double cV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double CV {
-      get { return cV_; }
-      set {
-        cV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "MV" field.</summary>
-    public const int MVFieldNumber = 14;
-    private double mV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double MV {
-      get { return mV_; }
-      set {
-        mV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "YV" field.</summary>
-    public const int YVFieldNumber = 15;
-    private double yV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double YV {
-      get { return yV_; }
-      set {
-        yV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "KV" field.</summary>
-    public const int KVFieldNumber = 16;
-    private double kV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double KV {
-      get { return kV_; }
-      set {
-        kV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V4" field.</summary>
-    public const int V4FieldNumber = 17;
-    private double v4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V4 {
-      get { return v4_; }
-      set {
-        v4_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V5" field.</summary>
-    public const int V5FieldNumber = 18;
-    private double v5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V5 {
-      get { return v5_; }
-      set {
-        v5_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V6" field.</summary>
-    public const int V6FieldNumber = 19;
-    private double v6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V6 {
-      get { return v6_; }
-      set {
-        v6_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V7" field.</summary>
-    public const int V7FieldNumber = 20;
-    private double v7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V7 {
-      get { return v7_; }
-      set {
-        v7_ = value;
-      }
-    }
-
     /// <summary>Field number for the "PantonCode" field.</summary>
-    public const int PantonCodeFieldNumber = 21;
+    public const int PantonCodeFieldNumber = 12;
     private int pantonCode_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int PantonCode {
@@ -325,20 +216,29 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "InputLiquids" field.</summary>
+    public const int InputLiquidsFieldNumber = 13;
+    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.InputLiquid> _repeated_inputLiquids_codec
+        = pb::FieldCodec.ForMessage(106, global::Tango.PMR.ColorLab.InputLiquid.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.InputLiquid> inputLiquids_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.InputLiquid>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.ColorLab.InputLiquid> InputLiquids {
+      get { return inputLiquids_; }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
-      return Equals(other as InputColor);
+      return Equals(other as InputCoordinates);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(InputColor other) {
+    public bool Equals(InputCoordinates other) {
       if (ReferenceEquals(other, null)) {
         return false;
       }
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (ColorSpace != other.ColorSpace) return false;
       if (Length != other.Length) return false;
       if (Red != other.Red) return false;
       if (Green != other.Green) return false;
@@ -346,26 +246,18 @@ namespace Tango.PMR.ColorLab {
       if (Cyan != other.Cyan) return false;
       if (Magenta != other.Magenta) return false;
       if (Yellow != other.Yellow) return false;
-      if (Black != other.Black) return false;
+      if (Key != other.Key) return false;
       if (L != other.L) return false;
       if (A != other.A) return false;
       if (B != other.B) return false;
-      if (CV != other.CV) return false;
-      if (MV != other.MV) return false;
-      if (YV != other.YV) return false;
-      if (KV != other.KV) return false;
-      if (V4 != other.V4) return false;
-      if (V5 != other.V5) return false;
-      if (V6 != other.V6) return false;
-      if (V7 != other.V7) return false;
       if (PantonCode != other.PantonCode) return false;
+      if(!inputLiquids_.Equals(other.inputLiquids_)) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (ColorSpace != 0) hash ^= ColorSpace.GetHashCode();
       if (Length != 0D) hash ^= Length.GetHashCode();
       if (Red != 0) hash ^= Red.GetHashCode();
       if (Green != 0) hash ^= Green.GetHashCode();
@@ -373,19 +265,12 @@ namespace Tango.PMR.ColorLab {
       if (Cyan != 0D) hash ^= Cyan.GetHashCode();
       if (Magenta != 0D) hash ^= Magenta.GetHashCode();
       if (Yellow != 0D) hash ^= Yellow.GetHashCode();
-      if (Black != 0D) hash ^= Black.GetHashCode();
+      if (Key != 0D) hash ^= Key.GetHashCode();
       if (L != 0D) hash ^= L.GetHashCode();
       if (A != 0D) hash ^= A.GetHashCode();
       if (B != 0D) hash ^= B.GetHashCode();
-      if (CV != 0D) hash ^= CV.GetHashCode();
-      if (MV != 0D) hash ^= MV.GetHashCode();
-      if (YV != 0D) hash ^= YV.GetHashCode();
-      if (KV != 0D) hash ^= KV.GetHashCode();
-      if (V4 != 0D) hash ^= V4.GetHashCode();
-      if (V5 != 0D) hash ^= V5.GetHashCode();
-      if (V6 != 0D) hash ^= V6.GetHashCode();
-      if (V7 != 0D) hash ^= V7.GetHashCode();
       if (PantonCode != 0) hash ^= PantonCode.GetHashCode();
+      hash ^= inputLiquids_.GetHashCode();
       return hash;
     }
 
@@ -396,98 +281,60 @@ namespace Tango.PMR.ColorLab {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (ColorSpace != 0) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) ColorSpace);
-      }
       if (Length != 0D) {
-        output.WriteRawTag(17);
+        output.WriteRawTag(9);
         output.WriteDouble(Length);
       }
       if (Red != 0) {
-        output.WriteRawTag(24);
+        output.WriteRawTag(16);
         output.WriteInt32(Red);
       }
       if (Green != 0) {
-        output.WriteRawTag(32);
+        output.WriteRawTag(24);
         output.WriteInt32(Green);
       }
       if (Blue != 0) {
-        output.WriteRawTag(40);
+        output.WriteRawTag(32);
         output.WriteInt32(Blue);
       }
       if (Cyan != 0D) {
-        output.WriteRawTag(49);
+        output.WriteRawTag(41);
         output.WriteDouble(Cyan);
       }
       if (Magenta != 0D) {
-        output.WriteRawTag(57);
+        output.WriteRawTag(49);
         output.WriteDouble(Magenta);
       }
       if (Yellow != 0D) {
-        output.WriteRawTag(65);
+        output.WriteRawTag(57);
         output.WriteDouble(Yellow);
       }
-      if (Black != 0D) {
-        output.WriteRawTag(73);
-        output.WriteDouble(Black);
+      if (Key != 0D) {
+        output.WriteRawTag(65);
+        output.WriteDouble(Key);
       }
       if (L != 0D) {
-        output.WriteRawTag(81);
+        output.WriteRawTag(73);
         output.WriteDouble(L);
       }
       if (A != 0D) {
-        output.WriteRawTag(89);
+        output.WriteRawTag(81);
         output.WriteDouble(A);
       }
       if (B != 0D) {
-        output.WriteRawTag(97);
+        output.WriteRawTag(89);
         output.WriteDouble(B);
       }
-      if (CV != 0D) {
-        output.WriteRawTag(105);
-        output.WriteDouble(CV);
-      }
-      if (MV != 0D) {
-        output.WriteRawTag(113);
-        output.WriteDouble(MV);
-      }
-      if (YV != 0D) {
-        output.WriteRawTag(121);
-        output.WriteDouble(YV);
-      }
-      if (KV != 0D) {
-        output.WriteRawTag(129, 1);
-        output.WriteDouble(KV);
-      }
-      if (V4 != 0D) {
-        output.WriteRawTag(137, 1);
-        output.WriteDouble(V4);
-      }
-      if (V5 != 0D) {
-        output.WriteRawTag(145, 1);
-        output.WriteDouble(V5);
-      }
-      if (V6 != 0D) {
-        output.WriteRawTag(153, 1);
-        output.WriteDouble(V6);
-      }
-      if (V7 != 0D) {
-        output.WriteRawTag(161, 1);
-        output.WriteDouble(V7);
-      }
       if (PantonCode != 0) {
-        output.WriteRawTag(168, 1);
+        output.WriteRawTag(96);
         output.WriteInt32(PantonCode);
       }
+      inputLiquids_.WriteTo(output, _repeated_inputLiquids_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (ColorSpace != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ColorSpace);
-      }
       if (Length != 0D) {
         size += 1 + 8;
       }
@@ -509,7 +356,7 @@ namespace Tango.PMR.ColorLab {
       if (Yellow != 0D) {
         size += 1 + 8;
       }
-      if (Black != 0D) {
+      if (Key != 0D) {
         size += 1 + 8;
       }
       if (L != 0D) {
@@ -521,44 +368,18 @@ namespace Tango.PMR.ColorLab {
       if (B != 0D) {
         size += 1 + 8;
       }
-      if (CV != 0D) {
-        size += 1 + 8;
-      }
-      if (MV != 0D) {
-        size += 1 + 8;
-      }
-      if (YV != 0D) {
-        size += 1 + 8;
-      }
-      if (KV != 0D) {
-        size += 2 + 8;
-      }
-      if (V4 != 0D) {
-        size += 2 + 8;
-      }
-      if (V5 != 0D) {
-        size += 2 + 8;
-      }
-      if (V6 != 0D) {
-        size += 2 + 8;
-      }
-      if (V7 != 0D) {
-        size += 2 + 8;
-      }
       if (PantonCode != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(PantonCode);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PantonCode);
       }
+      size += inputLiquids_.CalculateSize(_repeated_inputLiquids_codec);
       return size;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(InputColor other) {
+    public void MergeFrom(InputCoordinates other) {
       if (other == null) {
         return;
       }
-      if (other.ColorSpace != 0) {
-        ColorSpace = other.ColorSpace;
-      }
       if (other.Length != 0D) {
         Length = other.Length;
       }
@@ -580,8 +401,8 @@ namespace Tango.PMR.ColorLab {
       if (other.Yellow != 0D) {
         Yellow = other.Yellow;
       }
-      if (other.Black != 0D) {
-        Black = other.Black;
+      if (other.Key != 0D) {
+        Key = other.Key;
       }
       if (other.L != 0D) {
         L = other.L;
@@ -592,33 +413,10 @@ namespace Tango.PMR.ColorLab {
       if (other.B != 0D) {
         B = other.B;
       }
-      if (other.CV != 0D) {
-        CV = other.CV;
-      }
-      if (other.MV != 0D) {
-        MV = other.MV;
-      }
-      if (other.YV != 0D) {
-        YV = other.YV;
-      }
-      if (other.KV != 0D) {
-        KV = other.KV;
-      }
-      if (other.V4 != 0D) {
-        V4 = other.V4;
-      }
-      if (other.V5 != 0D) {
-        V5 = other.V5;
-      }
-      if (other.V6 != 0D) {
-        V6 = other.V6;
-      }
-      if (other.V7 != 0D) {
-        V7 = other.V7;
-      }
       if (other.PantonCode != 0) {
         PantonCode = other.PantonCode;
       }
+      inputLiquids_.Add(other.inputLiquids_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -629,88 +427,56 @@ namespace Tango.PMR.ColorLab {
           default:
             input.SkipLastField();
             break;
-          case 8: {
-            colorSpace_ = (global::Tango.PMR.ColorLab.ColorSpace) input.ReadEnum();
-            break;
-          }
-          case 17: {
+          case 9: {
             Length = input.ReadDouble();
             break;
           }
-          case 24: {
+          case 16: {
             Red = input.ReadInt32();
             break;
           }
-          case 32: {
+          case 24: {
             Green = input.ReadInt32();
             break;
           }
-          case 40: {
+          case 32: {
             Blue = input.ReadInt32();
             break;
           }
-          case 49: {
+          case 41: {
             Cyan = input.ReadDouble();
             break;
           }
-          case 57: {
+          case 49: {
             Magenta = input.ReadDouble();
             break;
           }
-          case 65: {
+          case 57: {
             Yellow = input.ReadDouble();
             break;
           }
-          case 73: {
-            Black = input.ReadDouble();
+          case 65: {
+            Key = input.ReadDouble();
             break;
           }
-          case 81: {
+          case 73: {
             L = input.ReadDouble();
             break;
           }
-          case 89: {
+          case 81: {
             A = input.ReadDouble();
             break;
           }
-          case 97: {
+          case 89: {
             B = input.ReadDouble();
             break;
           }
-          case 105: {
-            CV = input.ReadDouble();
-            break;
-          }
-          case 113: {
-            MV = input.ReadDouble();
-            break;
-          }
-          case 121: {
-            YV = input.ReadDouble();
-            break;
-          }
-          case 129: {
-            KV = input.ReadDouble();
-            break;
-          }
-          case 137: {
-            V4 = input.ReadDouble();
-            break;
-          }
-          case 145: {
-            V5 = input.ReadDouble();
-            break;
-          }
-          case 153: {
-            V6 = input.ReadDouble();
-            break;
-          }
-          case 161: {
-            V7 = input.ReadDouble();
+          case 96: {
+            PantonCode = input.ReadInt32();
             break;
           }
-          case 168: {
-            PantonCode = input.ReadInt32();
+          case 106: {
+            inputLiquids_.AddEntriesFrom(input, _repeated_inputLiquids_codec);
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/InputLiquid.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/InputLiquid.cs
new file mode 100644
index 000000000..f45261825
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/InputLiquid.cs
@@ -0,0 +1,253 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InputLiquid.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ColorLab {
+
+  /// <summary>Holder for reflection information generated from InputLiquid.proto</summary>
+  public static partial class InputLiquidReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for InputLiquid.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static InputLiquidReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChFJbnB1dExpcXVpZC5wcm90bxISVGFuZ28uUE1SLkNvbG9yTGFiGhBMaXF1",
+            "aWRUeXBlLnByb3RvGhVDYWxpYnJhdGlvbkRhdGEucHJvdG8isgEKC0lucHV0",
+            "TGlxdWlkEjIKCkxpcXVpZFR5cGUYASABKA4yHi5UYW5nby5QTVIuQ29sb3JM",
+            "YWIuTGlxdWlkVHlwZRI8Cg9DYWxpYnJhdGlvbkRhdGEYAiABKAsyIy5UYW5n",
+            "by5QTVIuQ29sb3JMYWIuQ2FsaWJyYXRpb25EYXRhEiEKGU1heE5hbm9saXRl",
+            "clBlckNlbnRpbWV0ZXIYAyABKAESDgoGVm9sdW1lGAQgASgBQh4KHGNvbS50",
+            "d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.LiquidTypeReflection.Descriptor, global::Tango.PMR.ColorLab.CalibrationDataReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.InputLiquid), global::Tango.PMR.ColorLab.InputLiquid.Parser, new[]{ "LiquidType", "CalibrationData", "MaxNanoliterPerCentimeter", "Volume" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class InputLiquid : pb::IMessage<InputLiquid> {
+    private static readonly pb::MessageParser<InputLiquid> _parser = new pb::MessageParser<InputLiquid>(() => new InputLiquid());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<InputLiquid> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InputLiquid() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InputLiquid(InputLiquid other) : this() {
+      liquidType_ = other.liquidType_;
+      CalibrationData = other.calibrationData_ != null ? other.CalibrationData.Clone() : null;
+      maxNanoliterPerCentimeter_ = other.maxNanoliterPerCentimeter_;
+      volume_ = other.volume_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InputLiquid Clone() {
+      return new InputLiquid(this);
+    }
+
+    /// <summary>Field number for the "LiquidType" field.</summary>
+    public const int LiquidTypeFieldNumber = 1;
+    private global::Tango.PMR.ColorLab.LiquidType liquidType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.LiquidType LiquidType {
+      get { return liquidType_; }
+      set {
+        liquidType_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CalibrationData" field.</summary>
+    public const int CalibrationDataFieldNumber = 2;
+    private global::Tango.PMR.ColorLab.CalibrationData calibrationData_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.CalibrationData CalibrationData {
+      get { return calibrationData_; }
+      set {
+        calibrationData_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "MaxNanoliterPerCentimeter" field.</summary>
+    public const int MaxNanoliterPerCentimeterFieldNumber = 3;
+    private double maxNanoliterPerCentimeter_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double MaxNanoliterPerCentimeter {
+      get { return maxNanoliterPerCentimeter_; }
+      set {
+        maxNanoliterPerCentimeter_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Volume" field.</summary>
+    public const int VolumeFieldNumber = 4;
+    private double volume_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double Volume {
+      get { return volume_; }
+      set {
+        volume_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as InputLiquid);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(InputLiquid other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (LiquidType != other.LiquidType) return false;
+      if (!object.Equals(CalibrationData, other.CalibrationData)) return false;
+      if (MaxNanoliterPerCentimeter != other.MaxNanoliterPerCentimeter) return false;
+      if (Volume != other.Volume) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (LiquidType != 0) hash ^= LiquidType.GetHashCode();
+      if (calibrationData_ != null) hash ^= CalibrationData.GetHashCode();
+      if (MaxNanoliterPerCentimeter != 0D) hash ^= MaxNanoliterPerCentimeter.GetHashCode();
+      if (Volume != 0D) hash ^= Volume.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (LiquidType != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) LiquidType);
+      }
+      if (calibrationData_ != null) {
+        output.WriteRawTag(18);
+        output.WriteMessage(CalibrationData);
+      }
+      if (MaxNanoliterPerCentimeter != 0D) {
+        output.WriteRawTag(25);
+        output.WriteDouble(MaxNanoliterPerCentimeter);
+      }
+      if (Volume != 0D) {
+        output.WriteRawTag(33);
+        output.WriteDouble(Volume);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (LiquidType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) LiquidType);
+      }
+      if (calibrationData_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(CalibrationData);
+      }
+      if (MaxNanoliterPerCentimeter != 0D) {
+        size += 1 + 8;
+      }
+      if (Volume != 0D) {
+        size += 1 + 8;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(InputLiquid other) {
+      if (other == null) {
+        return;
+      }
+      if (other.LiquidType != 0) {
+        LiquidType = other.LiquidType;
+      }
+      if (other.calibrationData_ != null) {
+        if (calibrationData_ == null) {
+          calibrationData_ = new global::Tango.PMR.ColorLab.CalibrationData();
+        }
+        CalibrationData.MergeFrom(other.CalibrationData);
+      }
+      if (other.MaxNanoliterPerCentimeter != 0D) {
+        MaxNanoliterPerCentimeter = other.MaxNanoliterPerCentimeter;
+      }
+      if (other.Volume != 0D) {
+        Volume = other.Volume;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            liquidType_ = (global::Tango.PMR.ColorLab.LiquidType) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            if (calibrationData_ == null) {
+              calibrationData_ = new global::Tango.PMR.ColorLab.CalibrationData();
+            }
+            input.ReadMessage(calibrationData_);
+            break;
+          }
+          case 25: {
+            MaxNanoliterPerCentimeter = input.ReadDouble();
+            break;
+          }
+          case 33: {
+            Volume = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
new file mode 100644
index 000000000..e0465307b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
@@ -0,0 +1,49 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: LiquidType.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ColorLab {
+
+  /// <summary>Holder for reflection information generated from LiquidType.proto</summary>
+  public static partial class LiquidTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for LiquidType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static LiquidTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqTgoKTGlx",
+            "dWlkVHlwZRIICgRDeWFuEAASCwoHTWFnZW50YRABEgoKBlllbGxvdxACEgkK",
+            "BUJsYWNrEAMSEgoOVHJhbnNwYXJlbnRJbmsQBEIeChxjb20udHdpbmUudGFu",
+            "Z28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum LiquidType {
+    [pbr::OriginalName("Cyan")] Cyan = 0,
+    [pbr::OriginalName("Magenta")] Magenta = 1,
+    [pbr::OriginalName("Yellow")] Yellow = 2,
+    [pbr::OriginalName("Black")] Black = 3,
+    [pbr::OriginalName("TransparentInk")] TransparentInk = 4,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutputColor.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutputColor.cs
deleted file mode 100644
index 48cb82582..000000000
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/OutputColor.cs
+++ /dev/null
@@ -1,499 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: OutputColor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.ColorLab {
-
-  /// <summary>Holder for reflection information generated from OutputColor.proto</summary>
-  public static partial class OutputColorReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for OutputColor.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static OutputColorReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFPdXRwdXRDb2xvci5wcm90bxISVGFuZ28uUE1SLkNvbG9yTGFiIswBCgtP",
-            "dXRwdXRDb2xvchILCgNSZWQYASABKAUSDQoFR3JlZW4YAiABKAUSDAoEQmx1",
-            "ZRgDIAEoBRIKCgJDVhgEIAEoARIKCgJNVhgFIAEoARIKCgJZVhgGIAEoARIK",
-            "CgJLVhgHIAEoARIKCgJWNBgIIAEoARIKCgJWNRgJIAEoARIKCgJWNhgKIAEo",
-            "ARIKCgJWNxgLIAEoARIOCgZMZW5ndGgYDCABKAESIwobUHJvY2Vzc1BhcmFt",
-            "ZXRlcnNUYWJsZUluZGV4GA0gASgFQh4KHGNvbS50d2luZS50YW5nby5wbXIu",
-            "Y29sb3JsYWJiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutputColor), global::Tango.PMR.ColorLab.OutputColor.Parser, new[]{ "Red", "Green", "Blue", "CV", "MV", "YV", "KV", "V4", "V5", "V6", "V7", "Length", "ProcessParametersTableIndex" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class OutputColor : pb::IMessage<OutputColor> {
-    private static readonly pb::MessageParser<OutputColor> _parser = new pb::MessageParser<OutputColor>(() => new OutputColor());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<OutputColor> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.ColorLab.OutputColorReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public OutputColor() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public OutputColor(OutputColor other) : this() {
-      red_ = other.red_;
-      green_ = other.green_;
-      blue_ = other.blue_;
-      cV_ = other.cV_;
-      mV_ = other.mV_;
-      yV_ = other.yV_;
-      kV_ = other.kV_;
-      v4_ = other.v4_;
-      v5_ = other.v5_;
-      v6_ = other.v6_;
-      v7_ = other.v7_;
-      length_ = other.length_;
-      processParametersTableIndex_ = other.processParametersTableIndex_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public OutputColor Clone() {
-      return new OutputColor(this);
-    }
-
-    /// <summary>Field number for the "Red" field.</summary>
-    public const int RedFieldNumber = 1;
-    private int red_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Red {
-      get { return red_; }
-      set {
-        red_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Green" field.</summary>
-    public const int GreenFieldNumber = 2;
-    private int green_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Green {
-      get { return green_; }
-      set {
-        green_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Blue" field.</summary>
-    public const int BlueFieldNumber = 3;
-    private int blue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Blue {
-      get { return blue_; }
-      set {
-        blue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "CV" field.</summary>
-    public const int CVFieldNumber = 4;
-    private double cV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double CV {
-      get { return cV_; }
-      set {
-        cV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "MV" field.</summary>
-    public const int MVFieldNumber = 5;
-    private double mV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double MV {
-      get { return mV_; }
-      set {
-        mV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "YV" field.</summary>
-    public const int YVFieldNumber = 6;
-    private double yV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double YV {
-      get { return yV_; }
-      set {
-        yV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "KV" field.</summary>
-    public const int KVFieldNumber = 7;
-    private double kV_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double KV {
-      get { return kV_; }
-      set {
-        kV_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V4" field.</summary>
-    public const int V4FieldNumber = 8;
-    private double v4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V4 {
-      get { return v4_; }
-      set {
-        v4_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V5" field.</summary>
-    public const int V5FieldNumber = 9;
-    private double v5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V5 {
-      get { return v5_; }
-      set {
-        v5_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V6" field.</summary>
-    public const int V6FieldNumber = 10;
-    private double v6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V6 {
-      get { return v6_; }
-      set {
-        v6_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "V7" field.</summary>
-    public const int V7FieldNumber = 11;
-    private double v7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double V7 {
-      get { return v7_; }
-      set {
-        v7_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Length" field.</summary>
-    public const int LengthFieldNumber = 12;
-    private double length_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Length {
-      get { return length_; }
-      set {
-        length_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "ProcessParametersTableIndex" field.</summary>
-    public const int ProcessParametersTableIndexFieldNumber = 13;
-    private int processParametersTableIndex_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int ProcessParametersTableIndex {
-      get { return processParametersTableIndex_; }
-      set {
-        processParametersTableIndex_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as OutputColor);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(OutputColor other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Red != other.Red) return false;
-      if (Green != other.Green) return false;
-      if (Blue != other.Blue) return false;
-      if (CV != other.CV) return false;
-      if (MV != other.MV) return false;
-      if (YV != other.YV) return false;
-      if (KV != other.KV) return false;
-      if (V4 != other.V4) return false;
-      if (V5 != other.V5) return false;
-      if (V6 != other.V6) return false;
-      if (V7 != other.V7) return false;
-      if (Length != other.Length) return false;
-      if (ProcessParametersTableIndex != other.ProcessParametersTableIndex) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Red != 0) hash ^= Red.GetHashCode();
-      if (Green != 0) hash ^= Green.GetHashCode();
-      if (Blue != 0) hash ^= Blue.GetHashCode();
-      if (CV != 0D) hash ^= CV.GetHashCode();
-      if (MV != 0D) hash ^= MV.GetHashCode();
-      if (YV != 0D) hash ^= YV.GetHashCode();
-      if (KV != 0D) hash ^= KV.GetHashCode();
-      if (V4 != 0D) hash ^= V4.GetHashCode();
-      if (V5 != 0D) hash ^= V5.GetHashCode();
-      if (V6 != 0D) hash ^= V6.GetHashCode();
-      if (V7 != 0D) hash ^= V7.GetHashCode();
-      if (Length != 0D) hash ^= Length.GetHashCode();
-      if (ProcessParametersTableIndex != 0) hash ^= ProcessParametersTableIndex.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Red != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Red);
-      }
-      if (Green != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Green);
-      }
-      if (Blue != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Blue);
-      }
-      if (CV != 0D) {
-        output.WriteRawTag(33);
-        output.WriteDouble(CV);
-      }
-      if (MV != 0D) {
-        output.WriteRawTag(41);
-        output.WriteDouble(MV);
-      }
-      if (YV != 0D) {
-        output.WriteRawTag(49);
-        output.WriteDouble(YV);
-      }
-      if (KV != 0D) {
-        output.WriteRawTag(57);
-        output.WriteDouble(KV);
-      }
-      if (V4 != 0D) {
-        output.WriteRawTag(65);
-        output.WriteDouble(V4);
-      }
-      if (V5 != 0D) {
-        output.WriteRawTag(73);
-        output.WriteDouble(V5);
-      }
-      if (V6 != 0D) {
-        output.WriteRawTag(81);
-        output.WriteDouble(V6);
-      }
-      if (V7 != 0D) {
-        output.WriteRawTag(89);
-        output.WriteDouble(V7);
-      }
-      if (Length != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(Length);
-      }
-      if (ProcessParametersTableIndex != 0) {
-        output.WriteRawTag(104);
-        output.WriteInt32(ProcessParametersTableIndex);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Red != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Red);
-      }
-      if (Green != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Green);
-      }
-      if (Blue != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Blue);
-      }
-      if (CV != 0D) {
-        size += 1 + 8;
-      }
-      if (MV != 0D) {
-        size += 1 + 8;
-      }
-      if (YV != 0D) {
-        size += 1 + 8;
-      }
-      if (KV != 0D) {
-        size += 1 + 8;
-      }
-      if (V4 != 0D) {
-        size += 1 + 8;
-      }
-      if (V5 != 0D) {
-        size += 1 + 8;
-      }
-      if (V6 != 0D) {
-        size += 1 + 8;
-      }
-      if (V7 != 0D) {
-        size += 1 + 8;
-      }
-      if (Length != 0D) {
-        size += 1 + 8;
-      }
-      if (ProcessParametersTableIndex != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(ProcessParametersTableIndex);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(OutputColor other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Red != 0) {
-        Red = other.Red;
-      }
-      if (other.Green != 0) {
-        Green = other.Green;
-      }
-      if (other.Blue != 0) {
-        Blue = other.Blue;
-      }
-      if (other.CV != 0D) {
-        CV = other.CV;
-      }
-      if (other.MV != 0D) {
-        MV = other.MV;
-      }
-      if (other.YV != 0D) {
-        YV = other.YV;
-      }
-      if (other.KV != 0D) {
-        KV = other.KV;
-      }
-      if (other.V4 != 0D) {
-        V4 = other.V4;
-      }
-      if (other.V5 != 0D) {
-        V5 = other.V5;
-      }
-      if (other.V6 != 0D) {
-        V6 = other.V6;
-      }
-      if (other.V7 != 0D) {
-        V7 = other.V7;
-      }
-      if (other.Length != 0D) {
-        Length = other.Length;
-      }
-      if (other.ProcessParametersTableIndex != 0) {
-        ProcessParametersTableIndex = other.ProcessParametersTableIndex;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            Red = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Green = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Blue = input.ReadInt32();
-            break;
-          }
-          case 33: {
-            CV = input.ReadDouble();
-            break;
-          }
-          case 41: {
-            MV = input.ReadDouble();
-            break;
-          }
-          case 49: {
-            YV = input.ReadDouble();
-            break;
-          }
-          case 57: {
-            KV = input.ReadDouble();
-            break;
-          }
-          case 65: {
-            V4 = input.ReadDouble();
-            break;
-          }
-          case 73: {
-            V5 = input.ReadDouble();
-            break;
-          }
-          case 81: {
-            V6 = input.ReadDouble();
-            break;
-          }
-          case 89: {
-            V7 = input.ReadDouble();
-            break;
-          }
-          case 97: {
-            Length = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            ProcessParametersTableIndex = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutputCoordinates.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutputCoordinates.cs
new file mode 100644
index 000000000..b43aa9f29
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutputCoordinates.cs
@@ -0,0 +1,266 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: OutputCoordinates.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ColorLab {
+
+  /// <summary>Holder for reflection information generated from OutputCoordinates.proto</summary>
+  public static partial class OutputCoordinatesReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for OutputCoordinates.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static OutputCoordinatesReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChdPdXRwdXRDb29yZGluYXRlcy5wcm90bxISVGFuZ28uUE1SLkNvbG9yTGFi",
+            "GhJPdXRwdXRMaXF1aWQucHJvdG8imwEKEU91dHB1dENvb3JkaW5hdGVzEgsK",
+            "A1JlZBgBIAEoBRINCgVHcmVlbhgCIAEoBRIMCgRCbHVlGAMgASgFEjcKDU91",
+            "dHB1dExpcXVpZHMYBCADKAsyIC5UYW5nby5QTVIuQ29sb3JMYWIuT3V0cHV0",
+            "TGlxdWlkEiMKG1Byb2Nlc3NQYXJhbWV0ZXJzVGFibGVJbmRleBgFIAEoBUIe",
+            "Chxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.OutputLiquidReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutputCoordinates), global::Tango.PMR.ColorLab.OutputCoordinates.Parser, new[]{ "Red", "Green", "Blue", "OutputLiquids", "ProcessParametersTableIndex" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class OutputCoordinates : pb::IMessage<OutputCoordinates> {
+    private static readonly pb::MessageParser<OutputCoordinates> _parser = new pb::MessageParser<OutputCoordinates>(() => new OutputCoordinates());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<OutputCoordinates> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.ColorLab.OutputCoordinatesReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputCoordinates() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputCoordinates(OutputCoordinates other) : this() {
+      red_ = other.red_;
+      green_ = other.green_;
+      blue_ = other.blue_;
+      outputLiquids_ = other.outputLiquids_.Clone();
+      processParametersTableIndex_ = other.processParametersTableIndex_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputCoordinates Clone() {
+      return new OutputCoordinates(this);
+    }
+
+    /// <summary>Field number for the "Red" field.</summary>
+    public const int RedFieldNumber = 1;
+    private int red_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Red {
+      get { return red_; }
+      set {
+        red_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Green" field.</summary>
+    public const int GreenFieldNumber = 2;
+    private int green_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Green {
+      get { return green_; }
+      set {
+        green_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Blue" field.</summary>
+    public const int BlueFieldNumber = 3;
+    private int blue_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Blue {
+      get { return blue_; }
+      set {
+        blue_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "OutputLiquids" field.</summary>
+    public const int OutputLiquidsFieldNumber = 4;
+    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.OutputLiquid> _repeated_outputLiquids_codec
+        = pb::FieldCodec.ForMessage(34, global::Tango.PMR.ColorLab.OutputLiquid.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputLiquid> outputLiquids_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputLiquid>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.ColorLab.OutputLiquid> OutputLiquids {
+      get { return outputLiquids_; }
+    }
+
+    /// <summary>Field number for the "ProcessParametersTableIndex" field.</summary>
+    public const int ProcessParametersTableIndexFieldNumber = 5;
+    private int processParametersTableIndex_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int ProcessParametersTableIndex {
+      get { return processParametersTableIndex_; }
+      set {
+        processParametersTableIndex_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as OutputCoordinates);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(OutputCoordinates other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Red != other.Red) return false;
+      if (Green != other.Green) return false;
+      if (Blue != other.Blue) return false;
+      if(!outputLiquids_.Equals(other.outputLiquids_)) return false;
+      if (ProcessParametersTableIndex != other.ProcessParametersTableIndex) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Red != 0) hash ^= Red.GetHashCode();
+      if (Green != 0) hash ^= Green.GetHashCode();
+      if (Blue != 0) hash ^= Blue.GetHashCode();
+      hash ^= outputLiquids_.GetHashCode();
+      if (ProcessParametersTableIndex != 0) hash ^= ProcessParametersTableIndex.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (Red != 0) {
+        output.WriteRawTag(8);
+        output.WriteInt32(Red);
+      }
+      if (Green != 0) {
+        output.WriteRawTag(16);
+        output.WriteInt32(Green);
+      }
+      if (Blue != 0) {
+        output.WriteRawTag(24);
+        output.WriteInt32(Blue);
+      }
+      outputLiquids_.WriteTo(output, _repeated_outputLiquids_codec);
+      if (ProcessParametersTableIndex != 0) {
+        output.WriteRawTag(40);
+        output.WriteInt32(ProcessParametersTableIndex);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (Red != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Red);
+      }
+      if (Green != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Green);
+      }
+      if (Blue != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Blue);
+      }
+      size += outputLiquids_.CalculateSize(_repeated_outputLiquids_codec);
+      if (ProcessParametersTableIndex != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(ProcessParametersTableIndex);
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(OutputCoordinates other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Red != 0) {
+        Red = other.Red;
+      }
+      if (other.Green != 0) {
+        Green = other.Green;
+      }
+      if (other.Blue != 0) {
+        Blue = other.Blue;
+      }
+      outputLiquids_.Add(other.outputLiquids_);
+      if (other.ProcessParametersTableIndex != 0) {
+        ProcessParametersTableIndex = other.ProcessParametersTableIndex;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            Red = input.ReadInt32();
+            break;
+          }
+          case 16: {
+            Green = input.ReadInt32();
+            break;
+          }
+          case 24: {
+            Blue = input.ReadInt32();
+            break;
+          }
+          case 34: {
+            outputLiquids_.AddEntriesFrom(input, _repeated_outputLiquids_codec);
+            break;
+          }
+          case 40: {
+            ProcessParametersTableIndex = input.ReadInt32();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutputLiquid.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutputLiquid.cs
new file mode 100644
index 000000000..9944790ad
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutputLiquid.cs
@@ -0,0 +1,189 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: OutputLiquid.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ColorLab {
+
+  /// <summary>Holder for reflection information generated from OutputLiquid.proto</summary>
+  public static partial class OutputLiquidReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for OutputLiquid.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static OutputLiquidReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChJPdXRwdXRMaXF1aWQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoQTGlx",
+            "dWlkVHlwZS5wcm90byJSCgxPdXRwdXRMaXF1aWQSMgoKTGlxdWlkVHlwZRgB",
+            "IAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5MaXF1aWRUeXBlEg4KBlZvbHVt",
+            "ZRgEIAEoAUIeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90",
+            "bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.LiquidTypeReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutputLiquid), global::Tango.PMR.ColorLab.OutputLiquid.Parser, new[]{ "LiquidType", "Volume" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class OutputLiquid : pb::IMessage<OutputLiquid> {
+    private static readonly pb::MessageParser<OutputLiquid> _parser = new pb::MessageParser<OutputLiquid>(() => new OutputLiquid());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<OutputLiquid> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.ColorLab.OutputLiquidReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputLiquid() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputLiquid(OutputLiquid other) : this() {
+      liquidType_ = other.liquidType_;
+      volume_ = other.volume_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public OutputLiquid Clone() {
+      return new OutputLiquid(this);
+    }
+
+    /// <summary>Field number for the "LiquidType" field.</summary>
+    public const int LiquidTypeFieldNumber = 1;
+    private global::Tango.PMR.ColorLab.LiquidType liquidType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.LiquidType LiquidType {
+      get { return liquidType_; }
+      set {
+        liquidType_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Volume" field.</summary>
+    public const int VolumeFieldNumber = 4;
+    private double volume_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double Volume {
+      get { return volume_; }
+      set {
+        volume_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as OutputLiquid);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(OutputLiquid other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (LiquidType != other.LiquidType) return false;
+      if (Volume != other.Volume) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (LiquidType != 0) hash ^= LiquidType.GetHashCode();
+      if (Volume != 0D) hash ^= Volume.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (LiquidType != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) LiquidType);
+      }
+      if (Volume != 0D) {
+        output.WriteRawTag(33);
+        output.WriteDouble(Volume);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (LiquidType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) LiquidType);
+      }
+      if (Volume != 0D) {
+        size += 1 + 8;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(OutputLiquid other) {
+      if (other == null) {
+        return;
+      }
+      if (other.LiquidType != 0) {
+        LiquidType = other.LiquidType;
+      }
+      if (other.Volume != 0D) {
+        Volume = other.Volume;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            liquidType_ = (global::Tango.PMR.ColorLab.LiquidType) input.ReadEnum();
+            break;
+          }
+          case 33: {
+            Volume = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 0d4034767..3674c3e73 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -52,8 +52,11 @@
     <Compile Include="ColorLab\ColorSpace.cs" />
     <Compile Include="ColorLab\ConversionInput.cs" />
     <Compile Include="ColorLab\ConversionOutput.cs" />
-    <Compile Include="ColorLab\InputColor.cs" />
-    <Compile Include="ColorLab\OutputColor.cs" />
+    <Compile Include="ColorLab\InputCoordinates.cs" />
+    <Compile Include="ColorLab\InputLiquid.cs" />
+    <Compile Include="ColorLab\LiquidType.cs" />
+    <Compile Include="ColorLab\OutputCoordinates.cs" />
+    <Compile Include="ColorLab\OutputLiquid.cs" />
     <Compile Include="Diagnostics\DataFileFrame.cs" />
     <Compile Include="Diagnostics\DigitalPin.cs" />
     <Compile Include="Diagnostics\DispenserAbortHomingRequest.cs" />
diff --git a/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
index e5ef944e5..f4940cdac 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
@@ -7,6 +7,7 @@ using Tango.Integration.Observables;
 using System.Linq;
 using Google.Protobuf;
 using Tango.PMR;
+using System.Collections.Generic;
 
 namespace Tango.UnitTesting
 {
@@ -14,24 +15,22 @@ namespace Tango.UnitTesting
     [TestCategory("Color Lab")]
     public class ColorLib_TST
     {
-        [DllImport("Tango.ColorLib.dll", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ForwardConvert")]
-        public static extern int ForwardConvert(IntPtr data, int size, ref IntPtr output);
-
-        [DllImport("Tango.ColorLib.dll", CallingConvention = CallingConvention.Cdecl, EntryPoint = "InverseConvert")]
-        public static extern int InverseConvert(IntPtr data, int size, ref IntPtr output);
+        [DllImport("Tango.ColorLib.dll", CallingConvention = CallingConvention.Cdecl, EntryPoint = "Convert")]
+        public static extern int Convert(IntPtr data, int size, ref IntPtr output);
 
         [TestMethod]
         public void Convert_Color_To_Volumes()
         {
             ConversionInput conversionInput = new ConversionInput();
 
-            conversionInput.Input = new InputColor();
+            conversionInput.ColorSpace = PMR.ColorLab.ColorSpace.Rgb;
+            conversionInput.InputCoordinates = new InputCoordinates();
 
             conversionInput.SegmentLength = 100;
 
-            conversionInput.Input.Red = 255;
-            conversionInput.Input.Green = 0;
-            conversionInput.Input.Blue = 0;
+            conversionInput.InputCoordinates.Red = 50;
+            conversionInput.InputCoordinates.Green = 100;
+            conversionInput.InputCoordinates.Blue = 200;
 
             conversionInput.ThreadL = 100;
             conversionInput.ThreadA = 0.00526049995830391;
@@ -46,18 +45,36 @@ namespace Tango.UnitTesting
                 conversionInput.ForwardData = ByteString.CopyFrom(cct.ForwardData);
                 conversionInput.InverseData = ByteString.CopyFrom(cct.InverseData);
 
-                var cat = db.Cats.FirstOrDefault();
+                var machine = db.Machines.FirstOrDefault();
+                Assert.IsNotNull(machine);
+
+                var configuration = machine.Configuration;
+                var rml = db.Rmls.FirstOrDefault();
+
+                Assert.IsNotNull(rml);
+
+                List<LiquidTypesRml> factors = configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == RML.Guid).ToList();
+
+                foreach (var idsPack in configuration.IdsPacks.OrderBy(x => x.PackIndex))
+                {
+                    InputLiquid inputLiquid = new InputLiquid();
+                    inputLiquid.LiquidType = idsPack.LiquidType.ToColorLibLiquidType();
+
+                    Assert.IsFalse(configuration.IdsPacks.IndexOf(idsPack) > factors.Count - 1);
 
-                Assert.IsNotNull(cat);
+                    inputLiquid.MaxNanoliterPerCentimeter = factors[configuration.IdsPacks.IndexOf(idsPack)].MaxNlPerCm;
 
-                conversionInput.CalibrationData = cat.CreateDemoCalibrationData();
+                    inputLiquid.CalibrationData = GenerateCalibrationData(inputLiquid.LiquidType);
+
+                    conversionInput.InputCoordinates.InputLiquids.Add(inputLiquid);
+                }
             }
 
 
-            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(ForwardConvert);
+            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(Convert);
             ConversionOutput output = nativePMR.Invoke(conversionInput);
 
-            Assert.IsTrue(output.Suggestions.Count > 0);
+            Assert.IsTrue(output.SingleCoordinates.OutputLiquids.Count == conversionInput.InputCoordinates.InputLiquids.Count);
         }
 
         [TestMethod]
@@ -65,14 +82,11 @@ namespace Tango.UnitTesting
         {
             ConversionInput conversionInput = new ConversionInput();
 
-            conversionInput.Input = new InputColor();
+            conversionInput.ColorSpace = PMR.ColorLab.ColorSpace.Volume;
 
-            conversionInput.SegmentLength = 100;
+            conversionInput.InputCoordinates = new InputCoordinates();
 
-            conversionInput.Input.CV = 10;
-            conversionInput.Input.MV = 20;
-            conversionInput.Input.YV = 30;
-            conversionInput.Input.KV = 0;
+            conversionInput.SegmentLength = 100;
 
             conversionInput.ThreadL = 100;
             conversionInput.ThreadA = 0.00526049995830391;
@@ -87,18 +101,55 @@ namespace Tango.UnitTesting
                 conversionInput.ForwardData = ByteString.CopyFrom(cct.ForwardData);
                 conversionInput.InverseData = ByteString.CopyFrom(cct.InverseData);
 
-                var cat = db.Cats.FirstOrDefault();
+                var machine = db.Machines.FirstOrDefault();
+                Assert.IsNotNull(machine);
+
+                var configuration = machine.Configuration;
+                var rml = db.Rmls.FirstOrDefault();
+
+                Assert.IsNotNull(rml);
+
+                List<LiquidTypesRml> factors = configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == RML.Guid).ToList();
 
-                Assert.IsNotNull(cat);
+                foreach (var idsPack in configuration.IdsPacks.OrderBy(x => x.PackIndex))
+                {
+                    InputLiquid inputLiquid = new InputLiquid();
+                    inputLiquid.LiquidType = idsPack.LiquidType.ToColorLibLiquidType();
 
-                conversionInput.CalibrationData = cat.CreateDemoCalibrationData();
+                    Assert.IsFalse(configuration.IdsPacks.IndexOf(idsPack) > factors.Count - 1);
+
+                    inputLiquid.MaxNanoliterPerCentimeter = factors[configuration.IdsPacks.IndexOf(idsPack)].MaxNlPerCm;
+
+                    inputLiquid.CalibrationData = GenerateCalibrationData(inputLiquid.LiquidType);
+
+                    inputLiquid.Volume = new Random().Next(0, 100);
+
+                    conversionInput.InputCoordinates.InputLiquids.Add(inputLiquid);
+                }
             }
 
 
-            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(InverseConvert);
+            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(Convert);
             ConversionOutput output = nativePMR.Invoke(conversionInput);
 
-            Assert.IsTrue(output.Suggestions.Count > 0);
+            Assert.IsTrue(output.SingleCoordinates.OutputLiquids.Count == conversionInput.InputCoordinates.InputLiquids.Count);
+        }
+
+        private static CalibrationData GenerateCalibrationData(PMR.ColorLab.LiquidType liquidType)
+        {
+            CalibrationData data = new CalibrationData();
+            data.LiquidType = liquidType;
+
+            for (int i = 0; i < 100; i++)
+            {
+                data.CalibrationPoints.Add(new CalibrationPoint()
+                {
+                    X = i,
+                    Y = i,
+                });
+            }
+
+            return data;
         }
     }
 }