diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-09-05 02:22:06 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-09-05 02:22:06 +0300 |
| commit | 2718ce44b9dd90ab1e222cba82c0cbe6cac174f0 (patch) | |
| tree | 2b06ad6dcc514104f324802a327f9e95c55f3032 | |
| parent | c19568d8dc2677fe8dd57d55a737535c718f52f5 (diff) | |
| download | Tango-2718ce44b9dd90ab1e222cba82c0cbe6cac174f0.tar.gz Tango-2718ce44b9dd90ab1e222cba82c0cbe6cac174f0.zip | |
Added Violet liquid type to DB, BL and PMR.
| -rw-r--r-- | Software/DB/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/Tango_log.ldf | bin | 22675456 -> 22675456 bytes | |||
| -rw-r--r-- | Software/PMR/Messages/ColorLab/LiquidType.proto | 2 | ||||
| -rw-r--r-- | Software/PMR/Messages/Printing/DispenserLiquidType.proto | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs | 6 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs | 7 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs | 7 |
7 files changed, 18 insertions, 6 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex ba50b7957..c79733166 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 Binary files differindex e430a0d57..b456972d7 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/ColorLab/LiquidType.proto b/Software/PMR/Messages/ColorLab/LiquidType.proto index f1b996ed6..8ca966062 100644 --- a/Software/PMR/Messages/ColorLab/LiquidType.proto +++ b/Software/PMR/Messages/ColorLab/LiquidType.proto @@ -36,4 +36,6 @@ enum LiquidType LightYellow = 9; + Violet = 10; + } diff --git a/Software/PMR/Messages/Printing/DispenserLiquidType.proto b/Software/PMR/Messages/Printing/DispenserLiquidType.proto index fdc61996e..b362b3f00 100644 --- a/Software/PMR/Messages/Printing/DispenserLiquidType.proto +++ b/Software/PMR/Messages/Printing/DispenserLiquidType.proto @@ -36,4 +36,6 @@ enum DispenserLiquidType LightYellow = 9; + Violet = 10; + } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs index 0f72ebbd0..5d84ad683 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs @@ -62,6 +62,12 @@ namespace Tango.BL.Enumerations LightYellow = 9, /// <summary> + /// (Violet) + /// </summary> + [Description("Violet")] + Violet = 10, + + /// <summary> /// (Yellow) /// </summary> [Description("Yellow")] diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs index 6773455bb..9bfbcd947 100644 --- a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs +++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs @@ -22,12 +22,12 @@ namespace Tango.PMR.ColorLab { static LiquidTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqnAEKCkxp", + "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqqAEKCkxp", "cXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2VudGEQARIKCgZZZWxsb3cQAhIJ", "CgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5rEAQSDQoJTHVicmljYW50EAUS", "CwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAI", - "Eg8KC0xpZ2h0WWVsbG93EAlCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xv", - "cmxhYmIGcHJvdG8z")); + "Eg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EApCHgocY29tLnR3aW5lLnRh", + "bmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null)); @@ -47,6 +47,7 @@ namespace Tango.PMR.ColorLab { [pbr::OriginalName("LightCyan")] LightCyan = 7, [pbr::OriginalName("LightMagenta")] LightMagenta = 8, [pbr::OriginalName("LightYellow")] LightYellow = 9, + [pbr::OriginalName("Violet")] Violet = 10, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs index 988d26788..7b03045ec 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs @@ -23,11 +23,11 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaXNwZW5zZXJMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuUHJpbnRp", - "bmcqpQEKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu", + "bmcqsQEKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu", "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5r", "EAQSDQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAH", - "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAlCHgocY29tLnR3", - "aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0", + "EApCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.DispenserLiquidType), }, null)); @@ -47,6 +47,7 @@ namespace Tango.PMR.Printing { [pbr::OriginalName("LightCyan")] LightCyan = 7, [pbr::OriginalName("LightMagenta")] LightMagenta = 8, [pbr::OriginalName("LightYellow")] LightYellow = 9, + [pbr::OriginalName("Violet")] Violet = 10, } #endregion |
