New Extra Inks DB, PMR, BL.

2 files changed, 107 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
index 94d2f20b3..f40415159 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
@@ -22,14 +22,28 @@ namespace Tango.PMR.ColorLab {
     static LiquidTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqhQIKCkxp",
+            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIq4gYKCkxp",
             "cXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2VudGEQARIKCgZZZWxsb3cQAhIJ",
             "CgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5rEAQSDQoJTHVicmljYW50EAUS",
             "CwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAI",
             "Eg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EAoSCAoEQmx1ZRALEg0KCUxp",
             "Z2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xpZ2h0T3JhbmdlEA4SCgoGUnVi",
-            "aW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBFCHgocY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "aW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBESFAoQVFdUcmFuc3Bh",
+            "cmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5YW4QbhIPCgtUV0xpZ2h0Q3lh",
+            "bhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGlnaHRNYWdlbnRhEHkSDQoIVFdZ",
+            "ZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCDARINCghDMVllbGxvdxCHARIS",
+            "Cg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxhY2sQjAESDQoIVFdWaW9sZXQQ",
+            "lgESEgoNVFdMaWdodFZpb2xldBCXARILCgZDVEJsdWUQ0gESEAoLQ1RMaWdo",
+            "dEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoNQ1RMaWdodFJ1YmluZRDdARIN",
+            "CghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3JhbmdlEOcBEgsKBkNUTmF2eRDw",
+            "ARILCgZIREJsdWUQtgISEAoLSERMaWdodEJsdWUQtwISDQoISERSdWJpbmUQ",
+            "wAISEgoNSERMaWdodFJ1YmluZRDBAhINCghIRE9yYW5nZRDKAhISCg1IRExp",
+            "Z2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQCgtIRExpZ2h0TmF2eRDVAhIL",
+            "CgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQmwMSCgoFQU1SZWQQpAMSDwoK",
+            "QU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCuAxISCg1BTUxpZ2h0T3Jhbmdl",
+            "EK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGlnaHRZZWxsb3cQuQMSDAoHQU1C",
+            "bGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90",
+            "bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null));
@@ -57,6 +71,43 @@ namespace Tango.PMR.ColorLab {
     [pbr::OriginalName("Rubine")] Rubine = 15,
     [pbr::OriginalName("LightRubine")] LightRubine = 16,
     [pbr::OriginalName("Navy")] Navy = 17,
+    [pbr::OriginalName("TWTransparentInk")] TwtransparentInk = 100,
+    [pbr::OriginalName("C1TI")] C1Ti = 105,
+    [pbr::OriginalName("TWCyan")] Twcyan = 110,
+    [pbr::OriginalName("TWLightCyan")] TwlightCyan = 111,
+    [pbr::OriginalName("TWMagenta")] Twmagenta = 120,
+    [pbr::OriginalName("TWLightMagenta")] TwlightMagenta = 121,
+    [pbr::OriginalName("TWYellow")] Twyellow = 130,
+    [pbr::OriginalName("TWLightYellow")] TwlightYellow = 131,
+    [pbr::OriginalName("C1Yellow")] C1Yellow = 135,
+    [pbr::OriginalName("C1LightYellow")] C1LightYellow = 136,
+    [pbr::OriginalName("TWBlack")] Twblack = 140,
+    [pbr::OriginalName("TWViolet")] Twviolet = 150,
+    [pbr::OriginalName("TWLightViolet")] TwlightViolet = 151,
+    [pbr::OriginalName("CTBlue")] Ctblue = 210,
+    [pbr::OriginalName("CTLightBlue")] CtlightBlue = 211,
+    [pbr::OriginalName("CTRubine")] Ctrubine = 220,
+    [pbr::OriginalName("CTLightRubine")] CtlightRubine = 221,
+    [pbr::OriginalName("CTOrange")] Ctorange = 230,
+    [pbr::OriginalName("CTLightOrange")] CtlightOrange = 231,
+    [pbr::OriginalName("CTNavy")] Ctnavy = 240,
+    [pbr::OriginalName("HDBlue")] Hdblue = 310,
+    [pbr::OriginalName("HDLightBlue")] HdlightBlue = 311,
+    [pbr::OriginalName("HDRubine")] Hdrubine = 320,
+    [pbr::OriginalName("HDLightRubine")] HdlightRubine = 321,
+    [pbr::OriginalName("HDOrange")] Hdorange = 330,
+    [pbr::OriginalName("HDLightOrange")] HdlightOrange = 331,
+    [pbr::OriginalName("HDNavy")] Hdnavy = 340,
+    [pbr::OriginalName("HDLightNavy")] HdlightNavy = 341,
+    [pbr::OriginalName("AMBlue")] Amblue = 410,
+    [pbr::OriginalName("AMLightBlue")] AmlightBlue = 411,
+    [pbr::OriginalName("AMRed")] Amred = 420,
+    [pbr::OriginalName("AMLightRed")] AmlightRed = 421,
+    [pbr::OriginalName("AMOrange")] Amorange = 430,
+    [pbr::OriginalName("AMLightOrange")] AmlightOrange = 431,
+    [pbr::OriginalName("AMYellow")] Amyellow = 440,
+    [pbr::OriginalName("AMLightYellow")] AmlightYellow = 441,
+    [pbr::OriginalName("AMBlack")] Amblack = 450,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
index fb3b5820c..8066298cf 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
@@ -23,13 +23,27 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlEaXNwZW5zZXJMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuUHJpbnRp",
-            "bmcqjgIKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
+            "bmcq6wYKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
             "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5r",
             "EAQSDQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAH",
             "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0",
             "EAoSCAoEQmx1ZRALEg0KCUxpZ2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xp",
             "Z2h0T3JhbmdlEA4SCgoGUnViaW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgRO",
-            "YXZ5EBFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
+            "YXZ5EBESFAoQVFdUcmFuc3BhcmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5",
+            "YW4QbhIPCgtUV0xpZ2h0Q3lhbhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGln",
+            "aHRNYWdlbnRhEHkSDQoIVFdZZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCD",
+            "ARINCghDMVllbGxvdxCHARISCg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxh",
+            "Y2sQjAESDQoIVFdWaW9sZXQQlgESEgoNVFdMaWdodFZpb2xldBCXARILCgZD",
+            "VEJsdWUQ0gESEAoLQ1RMaWdodEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoN",
+            "Q1RMaWdodFJ1YmluZRDdARINCghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3Jh",
+            "bmdlEOcBEgsKBkNUTmF2eRDwARILCgZIREJsdWUQtgISEAoLSERMaWdodEJs",
+            "dWUQtwISDQoISERSdWJpbmUQwAISEgoNSERMaWdodFJ1YmluZRDBAhINCghI",
+            "RE9yYW5nZRDKAhISCg1IRExpZ2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQ",
+            "CgtIRExpZ2h0TmF2eRDVAhILCgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQ",
+            "mwMSCgoFQU1SZWQQpAMSDwoKQU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCu",
+            "AxISCg1BTUxpZ2h0T3JhbmdlEK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGln",
+            "aHRZZWxsb3cQuQMSDAoHQU1CbGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28u",
+            "cG1yLnByaW50aW5nYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.DispenserLiquidType), }, null));
@@ -57,6 +71,43 @@ namespace Tango.PMR.Printing {
     [pbr::OriginalName("Rubine")] Rubine = 15,
     [pbr::OriginalName("LightRubine")] LightRubine = 16,
     [pbr::OriginalName("Navy")] Navy = 17,
+    [pbr::OriginalName("TWTransparentInk")] TwtransparentInk = 100,
+    [pbr::OriginalName("C1TI")] C1Ti = 105,
+    [pbr::OriginalName("TWCyan")] Twcyan = 110,
+    [pbr::OriginalName("TWLightCyan")] TwlightCyan = 111,
+    [pbr::OriginalName("TWMagenta")] Twmagenta = 120,
+    [pbr::OriginalName("TWLightMagenta")] TwlightMagenta = 121,
+    [pbr::OriginalName("TWYellow")] Twyellow = 130,
+    [pbr::OriginalName("TWLightYellow")] TwlightYellow = 131,
+    [pbr::OriginalName("C1Yellow")] C1Yellow = 135,
+    [pbr::OriginalName("C1LightYellow")] C1LightYellow = 136,
+    [pbr::OriginalName("TWBlack")] Twblack = 140,
+    [pbr::OriginalName("TWViolet")] Twviolet = 150,
+    [pbr::OriginalName("TWLightViolet")] TwlightViolet = 151,
+    [pbr::OriginalName("CTBlue")] Ctblue = 210,
+    [pbr::OriginalName("CTLightBlue")] CtlightBlue = 211,
+    [pbr::OriginalName("CTRubine")] Ctrubine = 220,
+    [pbr::OriginalName("CTLightRubine")] CtlightRubine = 221,
+    [pbr::OriginalName("CTOrange")] Ctorange = 230,
+    [pbr::OriginalName("CTLightOrange")] CtlightOrange = 231,
+    [pbr::OriginalName("CTNavy")] Ctnavy = 240,
+    [pbr::OriginalName("HDBlue")] Hdblue = 310,
+    [pbr::OriginalName("HDLightBlue")] HdlightBlue = 311,
+    [pbr::OriginalName("HDRubine")] Hdrubine = 320,
+    [pbr::OriginalName("HDLightRubine")] HdlightRubine = 321,
+    [pbr::OriginalName("HDOrange")] Hdorange = 330,
+    [pbr::OriginalName("HDLightOrange")] HdlightOrange = 331,
+    [pbr::OriginalName("HDNavy")] Hdnavy = 340,
+    [pbr::OriginalName("HDLightNavy")] HdlightNavy = 341,
+    [pbr::OriginalName("AMBlue")] Amblue = 410,
+    [pbr::OriginalName("AMLightBlue")] AmlightBlue = 411,
+    [pbr::OriginalName("AMRed")] Amred = 420,
+    [pbr::OriginalName("AMLightRed")] AmlightRed = 421,
+    [pbr::OriginalName("AMOrange")] Amorange = 430,
+    [pbr::OriginalName("AMLightOrange")] AmlightOrange = 431,
+    [pbr::OriginalName("AMYellow")] Amyellow = 440,
+    [pbr::OriginalName("AMLightYellow")] AmlightYellow = 441,
+    [pbr::OriginalName("AMBlack")] Amblack = 450,
   }
 
   #endregion