diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-23 15:05:29 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-23 15:05:29 +0200 |
| commit | 65020c312f6f8b0792e2ab7c96341d6034ffc640 (patch) | |
| tree | 393648349b3572cf2aa5baffe8492d9175f2da3f /Software | |
| parent | 14b1b42a4dd14f0fbe44cdf4b5072e4d38ba6f63 (diff) | |
| download | Tango-65020c312f6f8b0792e2ab7c96341d6034ffc640.tar.gz Tango-65020c312f6f8b0792e2ab7c96341d6034ffc640.zip | |
Minimal support for light inks on MS.
Color to int generator util.
Diffstat (limited to 'Software')
26 files changed, 1297 insertions, 228 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex db2b6ccf6..51f78e15c 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 7d54a95db..ccadf3e2f 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 c1d5231ce..f1b996ed6 100644 --- a/Software/PMR/Messages/ColorLab/LiquidType.proto +++ b/Software/PMR/Messages/ColorLab/LiquidType.proto @@ -30,4 +30,10 @@ enum LiquidType Cleaner = 6; + LightCyan = 7; + + LightMagenta = 8; + + LightYellow = 9; + } diff --git a/Software/PMR/Messages/Printing/DispenserLiquidType.proto b/Software/PMR/Messages/Printing/DispenserLiquidType.proto index 72970efa3..fdc61996e 100644 --- a/Software/PMR/Messages/Printing/DispenserLiquidType.proto +++ b/Software/PMR/Messages/Printing/DispenserLiquidType.proto @@ -30,4 +30,10 @@ enum DispenserLiquidType Cleaner = 6; + LightCyan = 7; + + LightMagenta = 8; + + LightYellow = 9; + } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 68c4b4ae2..0f439c83d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -476,7 +476,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels ActiveMachineAdapter.ApplicationOsVersions = (await ActiveMachineAdapter.Context.ApplicationOsVersions.ToListAsync()).ToObservableCollection(); ActiveMachineAdapter.EmbeddedFirmwareVersions = (await ActiveMachineAdapter.Context.EmbeddedFirmwareVersions.ToListAsync()).ToObservableCollection(); ActiveMachineAdapter.DispenserTypes = (await ActiveMachineAdapter.Context.DispenserTypes.ToListAsync()).ToObservableCollection(); - ActiveMachineAdapter.LiquidTypes = (await ActiveMachineAdapter.Context.LiquidTypes.ToListAsync()).ToObservableCollection(); + ActiveMachineAdapter.LiquidTypes = (await ActiveMachineAdapter.Context.LiquidTypes.ToListAsync()).OrderBy(x => x.PreferredIndex).ToObservableCollection(); ActiveMachineAdapter.MidTankTypes = (await ActiveMachineAdapter.Context.MidTankTypes.ToListAsync()).ToObservableCollection(); ActiveMachineAdapter.CartridgeTypes = (await ActiveMachineAdapter.Context.CartridgeTypes.ToListAsync()).ToObservableCollection(); ActiveMachineAdapter.IdsPackFormulas = (await ActiveMachineAdapter.Context.IdsPackFormulas.ToListAsync()).ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs index e8dc67695..0f72ebbd0 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs @@ -20,6 +20,12 @@ namespace Tango.BL.Enumerations { /// <summary> + /// (Light Cyan) + /// </summary> + [Description("Light Cyan")] + LightCyan = 7, + + /// <summary> /// (Cyan) /// </summary> [Description("Cyan")] @@ -44,6 +50,18 @@ namespace Tango.BL.Enumerations Lubricant = 5, /// <summary> + /// (Light Magenta) + /// </summary> + [Description("Light Magenta")] + LightMagenta = 8, + + /// <summary> + /// (Light Yellow) + /// </summary> + [Description("Light Yellow")] + LightYellow = 9, + + /// <summary> /// (Yellow) /// </summary> [Description("Yellow")] diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs index 51e98f6f4..231bc4a5e 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs @@ -308,15 +308,15 @@ namespace Tango.BL.Enumerations DataStoreRead = 1026, /// <summary> - /// (Allows writing to data store items) + /// (Allows writing to local data store items) /// </summary> - [Description("Allows writing to data store items")] + [Description("Allows writing to local data store items")] DataStoreWrite = 1027, /// <summary> - /// (Allows creating data store items and collections) + /// (Allows creating local data store items and collections) /// </summary> - [Description("Allows creating data store items and collections")] + [Description("Allows creating local data store items and collections")] DataStoreCreate = 1028, /// <summary> @@ -332,9 +332,9 @@ namespace Tango.BL.Enumerations FSE_ResetMachineDeviceRegistration = 1030, /// <summary> - /// (Allows creating creating and editing the global data store) + /// (Allows creating and writing global data store items and collections) /// </summary> - [Description("Allows creating creating and editing the global data store")] + [Description("Allows creating and writing global data store items and collections")] DataStoreCreateWriteGlobal = 1031, } diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs index 1b1b633c7..6773455bb 100644 --- a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs +++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs @@ -22,11 +22,12 @@ namespace Tango.PMR.ColorLab { static LiquidTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqagoKTGlx", - "dWlkVHlwZRIICgRDeWFuEAASCwoHTWFnZW50YRABEgoKBlllbGxvdxACEgkK", - "BUJsYWNrEAMSEgoOVHJhbnNwYXJlbnRJbmsQBBINCglMdWJyaWNhbnQQBRIL", - "CgdDbGVhbmVyEAZCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIG", - "cHJvdG8z")); + "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqnAEKCkxp", + "cXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2VudGEQARIKCgZZZWxsb3cQAhIJ", + "CgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5rEAQSDQoJTHVicmljYW50EAUS", + "CwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAI", + "Eg8KC0xpZ2h0WWVsbG93EAlCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xv", + "cmxhYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null)); @@ -43,6 +44,9 @@ namespace Tango.PMR.ColorLab { [pbr::OriginalName("TransparentInk")] TransparentInk = 4, [pbr::OriginalName("Lubricant")] Lubricant = 5, [pbr::OriginalName("Cleaner")] Cleaner = 6, + [pbr::OriginalName("LightCyan")] LightCyan = 7, + [pbr::OriginalName("LightMagenta")] LightMagenta = 8, + [pbr::OriginalName("LightYellow")] LightYellow = 9, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index b6a27fe23..8c8b838f0 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Common { static MessageTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiroPgoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirOPwoLTWVz", "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj", "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n", "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh", @@ -96,113 +96,115 @@ namespace Tango.PMR.Common { "ZWFkUmVzcG9uc2UQbhIiCh5TdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlcXVl", "c3QQbxIjCh9TdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlc3BvbnNlEHASGQoV", "U3R1YkhlYWRFRXByb21SZXF1ZXN0EHESGgoWU3R1YkhlYWRFRXByb21SZXNw", - "b25zZRByEiUKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292ZXJ5UGFja2V0EOgH", - "Eh8KGkV4dGVybmFsQnJpZGdlTG9naW5SZXF1ZXN0EOkHEiAKG0V4dGVybmFs", - "QnJpZGdlTG9naW5SZXNwb25zZRDqBxIgChtFeHRlcm5hbEJyaWRnZUxvZ291", - "dFJlcXVlc3QQ6wcSIQocRXh0ZXJuYWxCcmlkZ2VMb2dvdXRSZXNwb25zZRDs", - "BxIhChxEaXJlY3RTeW5jaHJvbml6YXRpb25SZXF1ZXN0EO0HEiIKHURpcmVj", - "dFN5bmNocm9uaXphdGlvblJlc3BvbnNlEO4HEhwKF092ZXJyaWRlRGF0YUJh", - "c2VSZXF1ZXN0EO8HEh0KGE92ZXJyaWRlRGF0YUJhc2VSZXNwb25zZRDwBxIg", - "ChtTdGFydEFwcGxpY2F0aW9uTG9nc1JlcXVlc3QQ8QcSIQocU3RhcnRBcHBs", - "aWNhdGlvbkxvZ3NSZXNwb25zZRDyBxIfChpTdG9wQXBwbGljYXRpb25Mb2dz", - "UmVxdWVzdBDzBxIgChtTdG9wQXBwbGljYXRpb25Mb2dzUmVzcG9uc2UQ9AcS", - "GAoTQ29sb3JQcm9maWxlUmVxdWVzdBD1BxIZChRDb2xvclByb2ZpbGVSZXNw", - "b25zZRD2BxIYChNVcGRhdGVTdGF0dXNSZXF1ZXN0EPcHEhkKFFVwZGF0ZVN0", - "YXR1c1Jlc3BvbnNlEPgHEhMKDkdlbmVyaWNSZXF1ZXN0EPkHEhQKD0dlbmVy", - "aWNSZXNwb25zZRD6BxIdChhDb25maWd1cmVQcm90b2NvbFJlcXVlc3QQ+wcS", - "HgoZQ29uZmlndXJlUHJvdG9jb2xSZXNwb25zZRD8BxIcChdTdGFydERpYWdu", - "b3N0aWNzUmVxdWVzdBDQDxIdChhTdGFydERpYWdub3N0aWNzUmVzcG9uc2UQ", - "0Q8SHAoXTW90b3JBYm9ydEhvbWluZ1JlcXVlc3QQ0g8SHQoYTW90b3JBYm9y", - "dEhvbWluZ1Jlc3BvbnNlENMPEhcKEk1vdG9ySG9taW5nUmVxdWVzdBDUDxIY", - "ChNNb3RvckhvbWluZ1Jlc3BvbnNlENUPEhgKE01vdG9ySm9nZ2luZ1JlcXVl", - "c3QQ1g8SGQoUTW90b3JKb2dnaW5nUmVzcG9uc2UQ1w8SHQoYTW90b3JBYm9y", - "dEpvZ2dpbmdSZXF1ZXN0ENgPEh4KGU1vdG9yQWJvcnRKb2dnaW5nUmVzcG9u", - "c2UQ2Q8SIAobRGlzcGVuc2VyQWJvcnRIb21pbmdSZXF1ZXN0ENoPEiEKHERp", - "c3BlbnNlckFib3J0SG9taW5nUmVzcG9uc2UQ2w8SGwoWRGlzcGVuc2VySG9t", - "aW5nUmVxdWVzdBDcDxIcChdEaXNwZW5zZXJIb21pbmdSZXNwb25zZRDdDxIc", - "ChdEaXNwZW5zZXJKb2dnaW5nUmVxdWVzdBDeDxIdChhEaXNwZW5zZXJKb2dn", - "aW5nUmVzcG9uc2UQ3w8SIQocRGlzcGVuc2VyQWJvcnRKb2dnaW5nUmVxdWVz", - "dBDgDxIiCh1EaXNwZW5zZXJBYm9ydEpvZ2dpbmdSZXNwb25zZRDhDxIZChRT", - "ZXREaWdpdGFsT3V0UmVxdWVzdBDiDxIaChVTZXREaWdpdGFsT3V0UmVzcG9u", - "c2UQ4w8SGQoUVGhyZWFkSm9nZ2luZ1JlcXVlc3QQ5A8SGgoVVGhyZWFkSm9n", - "Z2luZ1Jlc3BvbnNlEOUPEh4KGVRocmVhZEFib3J0Sm9nZ2luZ1JlcXVlc3QQ", - "5g8SHwoaVGhyZWFkQWJvcnRKb2dnaW5nUmVzcG9uc2UQ5w8SHQoYU2V0Q29t", - "cG9uZW50VmFsdWVSZXF1ZXN0EOgPEh4KGVNldENvbXBvbmVudFZhbHVlUmVz", - "cG9uc2UQ6Q8SGAoTUmVzb2x2ZUV2ZW50UmVxdWVzdBDqDxIZChRSZXNvbHZl", - "RXZlbnRSZXNwb25zZRDrDxIbChZTdG9wRGlhZ25vc3RpY3NSZXF1ZXN0EOwP", - "EhwKF1N0b3BEaWFnbm9zdGljc1Jlc3BvbnNlEO0PEiMKHlN0YXJ0RXZlbnRz", - "Tm90aWZpY2F0aW9uUmVxdWVzdBDuDxIkCh9TdGFydEV2ZW50c05vdGlmaWNh", - "dGlvblJlc3BvbnNlEO8PEiIKHVN0b3BFdmVudHNOb3RpZmljYXRpb25SZXF1", - "ZXN0EPAPEiMKHlN0b3BFdmVudHNOb3RpZmljYXRpb25SZXNwb25zZRDxDxIa", - "ChVTZXRIZWF0ZXJTdGF0ZVJlcXVlc3QQ8g8SGwoWU2V0SGVhdGVyU3RhdGVS", - "ZXNwb25zZRDzDxIaChVTZXRCbG93ZXJTdGF0ZVJlcXVlc3QQ9A8SGwoWU2V0", - "Qmxvd2VyU3RhdGVSZXNwb25zZRD1DxIZChRTZXRWYWx2ZVN0YXRlUmVxdWVz", - "dBD2DxIaChVTZXRWYWx2ZVN0YXRlUmVzcG9uc2UQ9w8SHwoaQ2FydHJpZGdl", - "VmFsaWRhdGlvblJlcXVlc3QQ/A8SIAobQ2FydHJpZGdlVmFsaWRhdGlvblJl", - "c3BvbnNlEP0PEg8KCkpvYlJlcXVlc3QQuBcSEAoLSm9iUmVzcG9uc2UQuRcS", - "FAoPQWJvcnRKb2JSZXF1ZXN0ELoXEhUKEEFib3J0Sm9iUmVzcG9uc2UQuxcS", - "IwoeVXBsb2FkUHJvY2Vzc1BhcmFtZXRlcnNSZXF1ZXN0ELwXEiQKH1VwbG9h", - "ZFByb2Nlc3NQYXJhbWV0ZXJzUmVzcG9uc2UQvRcSFgoRQ3VycmVudEpvYlJl", - "cXVlc3QQvhcSFwoSQ3VycmVudEpvYlJlc3BvbnNlEL8XEhwKF1Jlc3VtZUN1", - "cnJlbnRKb2JSZXF1ZXN0EMAXEh0KGFJlc3VtZUN1cnJlbnRKb2JSZXNwb25z", - "ZRDBFxIdChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QQwhcSHgoZU3RhcnRI", - "ZWFkQ2xlYW5pbmdSZXNwb25zZRDDFxIdChhBYm9ydEhlYWRDbGVhbmluZ1Jl", - "cXVlc3QQxBcSHgoZQWJvcnRIZWFkQ2xlYW5pbmdSZXNwb25zZRDFFxIZChRT", - "dGFydERlYnVnTG9nUmVxdWVzdBCgHxIaChVTdGFydERlYnVnTG9nUmVzcG9u", - "c2UQoR8SGAoTU3RvcERlYnVnTG9nUmVxdWVzdBCiHxIZChRTdG9wRGVidWdM", - "b2dSZXNwb25zZRCjHxIfChpTZXREZWJ1Z0xvZ0NhdGVnb3J5UmVxdWVzdBCk", - "HxIgChtTZXREZWJ1Z0xvZ0NhdGVnb3J5UmVzcG9uc2UQpR8SIQocU2V0dXBE", - "ZWJ1Z0Rpc3JpYnV0b3JzUmVxdWVzdBCmHxIiCh1TZXR1cERlYnVnRGlzcmli", - "dXRvcnNSZXNwb25zZRCnHxInCiJVcGxvYWRIYXJkd2FyZUNvbmZpZ3VyYXRp", - "b25SZXF1ZXN0EIgnEigKI1VwbG9hZEhhcmR3YXJlQ29uZmlndXJhdGlvblJl", - "c3BvbnNlEIknEhcKElN5c3RlbVJlc2V0UmVxdWVzdBCKJxIYChNTeXN0ZW1S", - "ZXNldFJlc3BvbnNlEIsnEhUKEEtlZXBBbGl2ZVJlcXVlc3QQ8C4SFgoRS2Vl", - "cEFsaXZlUmVzcG9uc2UQ8S4SEwoOQ29ubmVjdFJlcXVlc3QQ8i4SFAoPQ29u", - "bmVjdFJlc3BvbnNlEPMuEhYKEURpc2Nvbm5lY3RSZXF1ZXN0EPQuEhcKEkRp", - "c2Nvbm5lY3RSZXNwb25zZRD1LhIWChFGaWxlVXBsb2FkUmVxdWVzdBDYNhIX", - "ChJGaWxlVXBsb2FkUmVzcG9uc2UQ2TYSGwoWRmlsZUNodW5rVXBsb2FkUmVx", - "dWVzdBDaNhIcChdGaWxlQ2h1bmtVcGxvYWRSZXNwb25zZRDbNhIaChVFeGVj", - "dXRlUHJvY2Vzc1JlcXVlc3QQ3DYSGwoWRXhlY3V0ZVByb2Nlc3NSZXNwb25z", - "ZRDdNhIXChJLaWxsUHJvY2Vzc1JlcXVlc3QQ3jYSGAoTS2lsbFByb2Nlc3NS", - "ZXNwb25zZRDfNhISCg1DcmVhdGVSZXF1ZXN0EOA2EhMKDkNyZWF0ZVJlc3Bv", - "bnNlEOE2EhIKDURlbGV0ZVJlcXVlc3QQ4jYSEwoORGVsZXRlUmVzcG9uc2UQ", - "4zYSGgoVR2V0U3RvcmFnZUluZm9SZXF1ZXN0EOQ2EhsKFkdldFN0b3JhZ2VJ", - "bmZvUmVzcG9uc2UQ5TYSFAoPR2V0RmlsZXNSZXF1ZXN0EOY2EhUKEEdldEZp", - "bGVzUmVzcG9uc2UQ5zYSGAoTRmlsZURvd25sb2FkUmVxdWVzdBDoNhIZChRG", - "aWxlRG93bmxvYWRSZXNwb25zZRDpNhIdChhGaWxlQ2h1bmtEb3dubG9hZFJl", - "cXVlc3QQ6jYSHgoZRmlsZUNodW5rRG93bmxvYWRSZXNwb25zZRDrNhIbChZW", - "YWxpZGF0ZVZlcnNpb25SZXF1ZXN0EOw2EhwKF1ZhbGlkYXRlVmVyc2lvblJl", - "c3BvbnNlEO02EhsKFkFjdGl2YXRlVmVyc2lvblJlcXVlc3QQ7jYSHAoXQWN0", - "aXZhdGVWZXJzaW9uUmVzcG9uc2UQ7zYSGQoURGlzcGVuc2VyRGF0YVJlcXVl", - "c3QQwD4SGgoVRGlzcGVuc2VyRGF0YVJlc3BvbnNlEME+EhwKF01pZFRhbmtE", - "YXRhU2V0dXBSZXF1ZXN0EMI+Eh0KGE1pZFRhbmtEYXRhU2V0dXBSZXNwb25z", - "ZRDDPhIiCh1NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVxdWVzdBDEPhIjCh5N", - "YWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UQxT4SHgoZTWFpbkNhcmRT", - "dG9yZWREYXRhUmVxdWVzdBDGPhIfChpNYWluQ2FyZFN0b3JlZERhdGFSZXNw", - "b25zZRDHPhIkCh9TdGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXF1ZXN0EKhG", - "EiUKIFN0YXJ0TWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKlGEiMKHlN0", - "b3BNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCqRhIkCh9TdG9wTWFjaGlu", - "ZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtGEhoKFVN0YXJ0UG93ZXJEb3duUmVx", - "dWVzdBCQThIbChZTdGFydFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0", - "UG93ZXJEb3duUmVxdWVzdBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNl", - "EJNOEhgKE1N0YXJ0UG93ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVw", - "UmVzcG9uc2UQlU4SGAoTQWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9y", - "dFBvd2VyVXBSZXNwb25zZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9T", - "dGFuZEJ5UmVzcG9uc2UQmU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVz", - "dBD4VRIfChpTdGFydFRocmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250", - "aW51ZVRocmVhZExvYWRpbmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFk", - "TG9hZGluZ1Jlc3BvbnNlEPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVz", - "dBD8VRIeChlTdG9wVGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRo", - "cmVhZExvYWRpbmdSZXF1ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNw", - "b25zZRD/VRIgChtBdHRlbXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQoc", - "QXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXNwb25zZRCBVhIhChxTdGFydElua0Zp", - "bGxpbmdTdGF0dXNSZXF1ZXN0EOBdEiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1", - "c1Jlc3BvbnNlEOFdEhwKF1B1dERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMhlEh0K", - "GFB1dERhdGFTdG9yZUl0ZW1SZXNwb25zZRDJZRIcChdHZXREYXRhU3RvcmVJ", - "dGVtUmVxdWVzdBDKZRIdChhHZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQy2US", - "IQocRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVxdWVzdBDMZRIiCh1EYXRhU3Rv", - "cmVJdGVtTW9kaWZpZWRSZXNwb25zZRDNZUIcChpjb20udHdpbmUudGFuZ28u", - "cG1yLmNvbW1vbmIGcHJvdG8z")); + "b25zZRByEhQKEFByb2NlZHVyZVJlcXVlc3QQcxIVChFQcm9jZWR1cmVSZXNw", + "b25zZRB0EhoKFlN0dWJBbGxIYXJkd2FyZVJlcXVlc3QQdRIbChdTdHViQWxs", + "SGFyZHdhcmVSZXNwb25zZRB2EiUKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292", + "ZXJ5UGFja2V0EOgHEh8KGkV4dGVybmFsQnJpZGdlTG9naW5SZXF1ZXN0EOkH", + "EiAKG0V4dGVybmFsQnJpZGdlTG9naW5SZXNwb25zZRDqBxIgChtFeHRlcm5h", + "bEJyaWRnZUxvZ291dFJlcXVlc3QQ6wcSIQocRXh0ZXJuYWxCcmlkZ2VMb2dv", + "dXRSZXNwb25zZRDsBxIhChxEaXJlY3RTeW5jaHJvbml6YXRpb25SZXF1ZXN0", + "EO0HEiIKHURpcmVjdFN5bmNocm9uaXphdGlvblJlc3BvbnNlEO4HEhwKF092", + "ZXJyaWRlRGF0YUJhc2VSZXF1ZXN0EO8HEh0KGE92ZXJyaWRlRGF0YUJhc2VS", + "ZXNwb25zZRDwBxIgChtTdGFydEFwcGxpY2F0aW9uTG9nc1JlcXVlc3QQ8QcS", + "IQocU3RhcnRBcHBsaWNhdGlvbkxvZ3NSZXNwb25zZRDyBxIfChpTdG9wQXBw", + "bGljYXRpb25Mb2dzUmVxdWVzdBDzBxIgChtTdG9wQXBwbGljYXRpb25Mb2dz", + "UmVzcG9uc2UQ9AcSGAoTQ29sb3JQcm9maWxlUmVxdWVzdBD1BxIZChRDb2xv", + "clByb2ZpbGVSZXNwb25zZRD2BxIYChNVcGRhdGVTdGF0dXNSZXF1ZXN0EPcH", + "EhkKFFVwZGF0ZVN0YXR1c1Jlc3BvbnNlEPgHEhMKDkdlbmVyaWNSZXF1ZXN0", + "EPkHEhQKD0dlbmVyaWNSZXNwb25zZRD6BxIdChhDb25maWd1cmVQcm90b2Nv", + "bFJlcXVlc3QQ+wcSHgoZQ29uZmlndXJlUHJvdG9jb2xSZXNwb25zZRD8BxIc", + "ChdTdGFydERpYWdub3N0aWNzUmVxdWVzdBDQDxIdChhTdGFydERpYWdub3N0", + "aWNzUmVzcG9uc2UQ0Q8SHAoXTW90b3JBYm9ydEhvbWluZ1JlcXVlc3QQ0g8S", + "HQoYTW90b3JBYm9ydEhvbWluZ1Jlc3BvbnNlENMPEhcKEk1vdG9ySG9taW5n", + "UmVxdWVzdBDUDxIYChNNb3RvckhvbWluZ1Jlc3BvbnNlENUPEhgKE01vdG9y", + "Sm9nZ2luZ1JlcXVlc3QQ1g8SGQoUTW90b3JKb2dnaW5nUmVzcG9uc2UQ1w8S", + "HQoYTW90b3JBYm9ydEpvZ2dpbmdSZXF1ZXN0ENgPEh4KGU1vdG9yQWJvcnRK", + "b2dnaW5nUmVzcG9uc2UQ2Q8SIAobRGlzcGVuc2VyQWJvcnRIb21pbmdSZXF1", + "ZXN0ENoPEiEKHERpc3BlbnNlckFib3J0SG9taW5nUmVzcG9uc2UQ2w8SGwoW", + "RGlzcGVuc2VySG9taW5nUmVxdWVzdBDcDxIcChdEaXNwZW5zZXJIb21pbmdS", + "ZXNwb25zZRDdDxIcChdEaXNwZW5zZXJKb2dnaW5nUmVxdWVzdBDeDxIdChhE", + "aXNwZW5zZXJKb2dnaW5nUmVzcG9uc2UQ3w8SIQocRGlzcGVuc2VyQWJvcnRK", + "b2dnaW5nUmVxdWVzdBDgDxIiCh1EaXNwZW5zZXJBYm9ydEpvZ2dpbmdSZXNw", + "b25zZRDhDxIZChRTZXREaWdpdGFsT3V0UmVxdWVzdBDiDxIaChVTZXREaWdp", + "dGFsT3V0UmVzcG9uc2UQ4w8SGQoUVGhyZWFkSm9nZ2luZ1JlcXVlc3QQ5A8S", + "GgoVVGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEOUPEh4KGVRocmVhZEFib3J0Sm9n", + "Z2luZ1JlcXVlc3QQ5g8SHwoaVGhyZWFkQWJvcnRKb2dnaW5nUmVzcG9uc2UQ", + "5w8SHQoYU2V0Q29tcG9uZW50VmFsdWVSZXF1ZXN0EOgPEh4KGVNldENvbXBv", + "bmVudFZhbHVlUmVzcG9uc2UQ6Q8SGAoTUmVzb2x2ZUV2ZW50UmVxdWVzdBDq", + "DxIZChRSZXNvbHZlRXZlbnRSZXNwb25zZRDrDxIbChZTdG9wRGlhZ25vc3Rp", + "Y3NSZXF1ZXN0EOwPEhwKF1N0b3BEaWFnbm9zdGljc1Jlc3BvbnNlEO0PEiMK", + "HlN0YXJ0RXZlbnRzTm90aWZpY2F0aW9uUmVxdWVzdBDuDxIkCh9TdGFydEV2", + "ZW50c05vdGlmaWNhdGlvblJlc3BvbnNlEO8PEiIKHVN0b3BFdmVudHNOb3Rp", + "ZmljYXRpb25SZXF1ZXN0EPAPEiMKHlN0b3BFdmVudHNOb3RpZmljYXRpb25S", + "ZXNwb25zZRDxDxIaChVTZXRIZWF0ZXJTdGF0ZVJlcXVlc3QQ8g8SGwoWU2V0", + "SGVhdGVyU3RhdGVSZXNwb25zZRDzDxIaChVTZXRCbG93ZXJTdGF0ZVJlcXVl", + "c3QQ9A8SGwoWU2V0Qmxvd2VyU3RhdGVSZXNwb25zZRD1DxIZChRTZXRWYWx2", + "ZVN0YXRlUmVxdWVzdBD2DxIaChVTZXRWYWx2ZVN0YXRlUmVzcG9uc2UQ9w8S", + "HwoaQ2FydHJpZGdlVmFsaWRhdGlvblJlcXVlc3QQ/A8SIAobQ2FydHJpZGdl", + "VmFsaWRhdGlvblJlc3BvbnNlEP0PEg8KCkpvYlJlcXVlc3QQuBcSEAoLSm9i", + "UmVzcG9uc2UQuRcSFAoPQWJvcnRKb2JSZXF1ZXN0ELoXEhUKEEFib3J0Sm9i", + "UmVzcG9uc2UQuxcSIwoeVXBsb2FkUHJvY2Vzc1BhcmFtZXRlcnNSZXF1ZXN0", + "ELwXEiQKH1VwbG9hZFByb2Nlc3NQYXJhbWV0ZXJzUmVzcG9uc2UQvRcSFgoR", + "Q3VycmVudEpvYlJlcXVlc3QQvhcSFwoSQ3VycmVudEpvYlJlc3BvbnNlEL8X", + "EhwKF1Jlc3VtZUN1cnJlbnRKb2JSZXF1ZXN0EMAXEh0KGFJlc3VtZUN1cnJl", + "bnRKb2JSZXNwb25zZRDBFxIdChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QQ", + "whcSHgoZU3RhcnRIZWFkQ2xlYW5pbmdSZXNwb25zZRDDFxIdChhBYm9ydEhl", + "YWRDbGVhbmluZ1JlcXVlc3QQxBcSHgoZQWJvcnRIZWFkQ2xlYW5pbmdSZXNw", + "b25zZRDFFxIZChRTdGFydERlYnVnTG9nUmVxdWVzdBCgHxIaChVTdGFydERl", + "YnVnTG9nUmVzcG9uc2UQoR8SGAoTU3RvcERlYnVnTG9nUmVxdWVzdBCiHxIZ", + "ChRTdG9wRGVidWdMb2dSZXNwb25zZRCjHxIfChpTZXREZWJ1Z0xvZ0NhdGVn", + "b3J5UmVxdWVzdBCkHxIgChtTZXREZWJ1Z0xvZ0NhdGVnb3J5UmVzcG9uc2UQ", + "pR8SIQocU2V0dXBEZWJ1Z0Rpc3JpYnV0b3JzUmVxdWVzdBCmHxIiCh1TZXR1", + "cERlYnVnRGlzcmlidXRvcnNSZXNwb25zZRCnHxInCiJVcGxvYWRIYXJkd2Fy", + "ZUNvbmZpZ3VyYXRpb25SZXF1ZXN0EIgnEigKI1VwbG9hZEhhcmR3YXJlQ29u", + "ZmlndXJhdGlvblJlc3BvbnNlEIknEhcKElN5c3RlbVJlc2V0UmVxdWVzdBCK", + "JxIYChNTeXN0ZW1SZXNldFJlc3BvbnNlEIsnEhUKEEtlZXBBbGl2ZVJlcXVl", + "c3QQ8C4SFgoRS2VlcEFsaXZlUmVzcG9uc2UQ8S4SEwoOQ29ubmVjdFJlcXVl", + "c3QQ8i4SFAoPQ29ubmVjdFJlc3BvbnNlEPMuEhYKEURpc2Nvbm5lY3RSZXF1", + "ZXN0EPQuEhcKEkRpc2Nvbm5lY3RSZXNwb25zZRD1LhIWChFGaWxlVXBsb2Fk", + "UmVxdWVzdBDYNhIXChJGaWxlVXBsb2FkUmVzcG9uc2UQ2TYSGwoWRmlsZUNo", + "dW5rVXBsb2FkUmVxdWVzdBDaNhIcChdGaWxlQ2h1bmtVcGxvYWRSZXNwb25z", + "ZRDbNhIaChVFeGVjdXRlUHJvY2Vzc1JlcXVlc3QQ3DYSGwoWRXhlY3V0ZVBy", + "b2Nlc3NSZXNwb25zZRDdNhIXChJLaWxsUHJvY2Vzc1JlcXVlc3QQ3jYSGAoT", + "S2lsbFByb2Nlc3NSZXNwb25zZRDfNhISCg1DcmVhdGVSZXF1ZXN0EOA2EhMK", + "DkNyZWF0ZVJlc3BvbnNlEOE2EhIKDURlbGV0ZVJlcXVlc3QQ4jYSEwoORGVs", + "ZXRlUmVzcG9uc2UQ4zYSGgoVR2V0U3RvcmFnZUluZm9SZXF1ZXN0EOQ2EhsK", + "FkdldFN0b3JhZ2VJbmZvUmVzcG9uc2UQ5TYSFAoPR2V0RmlsZXNSZXF1ZXN0", + "EOY2EhUKEEdldEZpbGVzUmVzcG9uc2UQ5zYSGAoTRmlsZURvd25sb2FkUmVx", + "dWVzdBDoNhIZChRGaWxlRG93bmxvYWRSZXNwb25zZRDpNhIdChhGaWxlQ2h1", + "bmtEb3dubG9hZFJlcXVlc3QQ6jYSHgoZRmlsZUNodW5rRG93bmxvYWRSZXNw", + "b25zZRDrNhIbChZWYWxpZGF0ZVZlcnNpb25SZXF1ZXN0EOw2EhwKF1ZhbGlk", + "YXRlVmVyc2lvblJlc3BvbnNlEO02EhsKFkFjdGl2YXRlVmVyc2lvblJlcXVl", + "c3QQ7jYSHAoXQWN0aXZhdGVWZXJzaW9uUmVzcG9uc2UQ7zYSGQoURGlzcGVu", + "c2VyRGF0YVJlcXVlc3QQwD4SGgoVRGlzcGVuc2VyRGF0YVJlc3BvbnNlEME+", + "EhwKF01pZFRhbmtEYXRhU2V0dXBSZXF1ZXN0EMI+Eh0KGE1pZFRhbmtEYXRh", + "U2V0dXBSZXNwb25zZRDDPhIiCh1NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVx", + "dWVzdBDEPhIjCh5NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UQxT4S", + "HgoZTWFpbkNhcmRTdG9yZWREYXRhUmVxdWVzdBDGPhIfChpNYWluQ2FyZFN0", + "b3JlZERhdGFSZXNwb25zZRDHPhIkCh9TdGFydE1hY2hpbmVTdGF0dXNVcGRh", + "dGVSZXF1ZXN0EKhGEiUKIFN0YXJ0TWFjaGluZVN0YXR1c1VwZGF0ZVJlc3Bv", + "bnNlEKlGEiMKHlN0b3BNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCqRhIk", + "Ch9TdG9wTWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtGEhoKFVN0YXJ0", + "UG93ZXJEb3duUmVxdWVzdBCQThIbChZTdGFydFBvd2VyRG93blJlc3BvbnNl", + "EJFOEhoKFUFib3J0UG93ZXJEb3duUmVxdWVzdBCSThIbChZBYm9ydFBvd2Vy", + "RG93blJlc3BvbnNlEJNOEhgKE1N0YXJ0UG93ZXJVcFJlcXVlc3QQlE4SGQoU", + "U3RhcnRQb3dlclVwUmVzcG9uc2UQlU4SGAoTQWJvcnRQb3dlclVwUmVxdWVz", + "dBCWThIZChRBYm9ydFBvd2VyVXBSZXNwb25zZRCXThITCg5TdGFuZEJ5UmVx", + "dWVzdBCYThIUCg9TdGFuZEJ5UmVzcG9uc2UQmU4SHgoZU3RhcnRUaHJlYWRM", + "b2FkaW5nUmVxdWVzdBD4VRIfChpTdGFydFRocmVhZExvYWRpbmdSZXNwb25z", + "ZRD5VRIhChxDb250aW51ZVRocmVhZExvYWRpbmdSZXF1ZXN0EPpVEiIKHUNv", + "bnRpbnVlVGhyZWFkTG9hZGluZ1Jlc3BvbnNlEPtVEh0KGFN0b3BUaHJlYWRM", + "b2FkaW5nUmVxdWVzdBD8VRIeChlTdG9wVGhyZWFkTG9hZGluZ1Jlc3BvbnNl", + "EP1VEhwKF1RyeVRocmVhZExvYWRpbmdSZXF1ZXN0EP5VEh0KGFRyeVRocmVh", + "ZExvYWRpbmdSZXNwb25zZRD/VRIgChtBdHRlbXB0VGhyZWFkSm9nZ2luZ1Jl", + "cXVlc3QQgFYSIQocQXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXNwb25zZRCBVhIh", + "ChxTdGFydElua0ZpbGxpbmdTdGF0dXNSZXF1ZXN0EOBdEiIKHVN0YXJ0SW5r", + "RmlsbGluZ1N0YXR1c1Jlc3BvbnNlEOFdEhwKF1B1dERhdGFTdG9yZUl0ZW1S", + "ZXF1ZXN0EMhlEh0KGFB1dERhdGFTdG9yZUl0ZW1SZXNwb25zZRDJZRIcChdH", + "ZXREYXRhU3RvcmVJdGVtUmVxdWVzdBDKZRIdChhHZXREYXRhU3RvcmVJdGVt", + "UmVzcG9uc2UQy2USIQocRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVxdWVzdBDM", + "ZRIiCh1EYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXNwb25zZRDNZUIcChpjb20u", + "dHdpbmUudGFuZ28ucG1yLmNvbW1vbmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -334,10 +336,14 @@ namespace Tango.PMR.Common { [pbr::OriginalName("StubMainCardEEpromWriteRequest")] StubMainCardEepromWriteRequest = 111, [pbr::OriginalName("StubMainCardEEpromWriteResponse")] StubMainCardEepromWriteResponse = 112, [pbr::OriginalName("StubHeadEEpromRequest")] StubHeadEepromRequest = 113, + [pbr::OriginalName("StubHeadEEpromResponse")] StubHeadEepromResponse = 114, + [pbr::OriginalName("ProcedureRequest")] ProcedureRequest = 115, + [pbr::OriginalName("ProcedureResponse")] ProcedureResponse = 116, + [pbr::OriginalName("StubAllHardwareRequest")] StubAllHardwareRequest = 117, /// <summary> ///------------------------------------ /// </summary> - [pbr::OriginalName("StubHeadEEpromResponse")] StubHeadEepromResponse = 114, + [pbr::OriginalName("StubAllHardwareResponse")] StubAllHardwareResponse = 118, /// <summary> ///Integration /// </summary> diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs index 0d957f6be..25f40a731 100644 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs +++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs @@ -24,21 +24,20 @@ namespace Tango.PMR.EmbeddedParameters { string.Concat( "ChdBbGFybUhhbmRsaW5nSXRlbS5wcm90bxIcVGFuZ28uUE1SLkVtYmVkZGVk", "UGFyYW1ldGVycxoVQWxhcm1Tb3VyY2VUeXBlLnByb3RvGhZEZWJ1Z0xvZ0Nh", - "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8igwMKEUFsYXJtSGFuZGxp", + "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8i2wIKEUFsYXJtSGFuZGxp", "bmdJdGVtEkIKC0FsYXJtU291cmNlGAEgASgOMi0uVGFuZ28uUE1SLkVtYmVk", - "ZGVkUGFyYW1ldGVycy5BbGFybVNvdXJjZVR5cGUSEQoJRnJlcXVlbmN5GAIg", - "ASgNEhAKCERldmljZUlkGAMgASgNEhYKDk1vZHVsZURldmljZUlkGAQgASgN", - "EhIKCkFsYXJtVmFsdWUYBSABKA0SFgoOQWxhcm1EaXJlY3Rpb24YBiABKAgS", - "NwoIU2V2ZXJpdHkYByABKA4yJS5UYW5nby5QTVIuRGVidWdnaW5nLkRlYnVn", - "TG9nQ2F0ZWdvcnkSEwoLUHJlZGVjZXNzb3IYCCABKA0SFQoNRGVib3VuY2VW", - "YWx1ZRgJIAEoDRIzCglFdmVudFR5cGUYCiABKA4yIC5UYW5nby5QTVIuRGlh", - "Z25vc3RpY3MuRXZlbnRUeXBlEhEKCUV2ZW50TmFtZRgLIAEoCRIUCgxJc1Bl", - "cnNpc3RlbnQYDCABKAhCKAomY29tLnR3aW5lLnRhbmdvLnBtci5lbWJlZGRl", - "ZHBhcmFtZXRlcnNiBnByb3RvMw==")); + "ZGVkUGFyYW1ldGVycy5BbGFybVNvdXJjZVR5cGUSEAoIRGV2aWNlSWQYAiAB", + "KA0SFgoOTW9kdWxlRGV2aWNlSWQYAyABKA0SEgoKQWxhcm1WYWx1ZRgEIAEo", + "DRIWCg5BbGFybURpcmVjdGlvbhgFIAEoCBI3CghTZXZlcml0eRgGIAEoDjIl", + "LlRhbmdvLlBNUi5EZWJ1Z2dpbmcuRGVidWdMb2dDYXRlZ29yeRIVCg1EZWJv", + "dW5jZVZhbHVlGAcgASgNEjMKCUV2ZW50VHlwZRgIIAEoDjIgLlRhbmdvLlBN", + "Ui5EaWFnbm9zdGljcy5FdmVudFR5cGUSEQoJRXZlbnROYW1lGAkgASgJEhQK", + "DElzUGVyc2lzdGVudBgKIAEoCEIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVt", + "YmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.AlarmSourceTypeReflection.Descriptor, global::Tango.PMR.Debugging.DebugLogCategoryReflection.Descriptor, global::Tango.PMR.Diagnostics.EventTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem), global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem.Parser, new[]{ "AlarmSource", "Frequency", "DeviceId", "ModuleDeviceId", "AlarmValue", "AlarmDirection", "Severity", "Predecessor", "DebounceValue", "EventType", "EventName", "IsPersistent" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem), global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem.Parser, new[]{ "AlarmSource", "DeviceId", "ModuleDeviceId", "AlarmValue", "AlarmDirection", "Severity", "DebounceValue", "EventType", "EventName", "IsPersistent" }, null, null, null) })); } #endregion @@ -70,13 +69,11 @@ namespace Tango.PMR.EmbeddedParameters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public AlarmHandlingItem(AlarmHandlingItem other) : this() { alarmSource_ = other.alarmSource_; - frequency_ = other.frequency_; deviceId_ = other.deviceId_; moduleDeviceId_ = other.moduleDeviceId_; alarmValue_ = other.alarmValue_; alarmDirection_ = other.alarmDirection_; severity_ = other.severity_; - predecessor_ = other.predecessor_; debounceValue_ = other.debounceValue_; eventType_ = other.eventType_; eventName_ = other.eventName_; @@ -99,22 +96,8 @@ namespace Tango.PMR.EmbeddedParameters { } } - /// <summary>Field number for the "Frequency" field.</summary> - public const int FrequencyFieldNumber = 2; - private uint frequency_; - /// <summary> - ///1/10/100/1000 - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint Frequency { - get { return frequency_; } - set { - frequency_ = value; - } - } - /// <summary>Field number for the "DeviceId" field.</summary> - public const int DeviceIdFieldNumber = 3; + public const int DeviceIdFieldNumber = 2; private uint deviceId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DeviceId { @@ -125,7 +108,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "ModuleDeviceId" field.</summary> - public const int ModuleDeviceIdFieldNumber = 4; + public const int ModuleDeviceIdFieldNumber = 3; private uint moduleDeviceId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint ModuleDeviceId { @@ -136,7 +119,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "AlarmValue" field.</summary> - public const int AlarmValueFieldNumber = 5; + public const int AlarmValueFieldNumber = 4; private uint alarmValue_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint AlarmValue { @@ -147,7 +130,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "AlarmDirection" field.</summary> - public const int AlarmDirectionFieldNumber = 6; + public const int AlarmDirectionFieldNumber = 5; private bool alarmDirection_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public bool AlarmDirection { @@ -158,7 +141,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "Severity" field.</summary> - public const int SeverityFieldNumber = 7; + public const int SeverityFieldNumber = 6; private global::Tango.PMR.Debugging.DebugLogCategory severity_ = 0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Tango.PMR.Debugging.DebugLogCategory Severity { @@ -168,19 +151,8 @@ namespace Tango.PMR.EmbeddedParameters { } } - /// <summary>Field number for the "Predecessor" field.</summary> - public const int PredecessorFieldNumber = 8; - private uint predecessor_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint Predecessor { - get { return predecessor_; } - set { - predecessor_ = value; - } - } - /// <summary>Field number for the "DebounceValue" field.</summary> - public const int DebounceValueFieldNumber = 9; + public const int DebounceValueFieldNumber = 7; private uint debounceValue_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DebounceValue { @@ -191,7 +163,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "EventType" field.</summary> - public const int EventTypeFieldNumber = 10; + public const int EventTypeFieldNumber = 8; private global::Tango.PMR.Diagnostics.EventType eventType_ = 0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Tango.PMR.Diagnostics.EventType EventType { @@ -202,7 +174,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "EventName" field.</summary> - public const int EventNameFieldNumber = 11; + public const int EventNameFieldNumber = 9; private string eventName_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string EventName { @@ -213,7 +185,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "IsPersistent" field.</summary> - public const int IsPersistentFieldNumber = 12; + public const int IsPersistentFieldNumber = 10; private bool isPersistent_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public bool IsPersistent { @@ -237,13 +209,11 @@ namespace Tango.PMR.EmbeddedParameters { return true; } if (AlarmSource != other.AlarmSource) return false; - if (Frequency != other.Frequency) return false; if (DeviceId != other.DeviceId) return false; if (ModuleDeviceId != other.ModuleDeviceId) return false; if (AlarmValue != other.AlarmValue) return false; if (AlarmDirection != other.AlarmDirection) return false; if (Severity != other.Severity) return false; - if (Predecessor != other.Predecessor) return false; if (DebounceValue != other.DebounceValue) return false; if (EventType != other.EventType) return false; if (EventName != other.EventName) return false; @@ -255,13 +225,11 @@ namespace Tango.PMR.EmbeddedParameters { public override int GetHashCode() { int hash = 1; if (AlarmSource != 0) hash ^= AlarmSource.GetHashCode(); - if (Frequency != 0) hash ^= Frequency.GetHashCode(); if (DeviceId != 0) hash ^= DeviceId.GetHashCode(); if (ModuleDeviceId != 0) hash ^= ModuleDeviceId.GetHashCode(); if (AlarmValue != 0) hash ^= AlarmValue.GetHashCode(); if (AlarmDirection != false) hash ^= AlarmDirection.GetHashCode(); if (Severity != 0) hash ^= Severity.GetHashCode(); - if (Predecessor != 0) hash ^= Predecessor.GetHashCode(); if (DebounceValue != 0) hash ^= DebounceValue.GetHashCode(); if (EventType != 0) hash ^= EventType.GetHashCode(); if (EventName.Length != 0) hash ^= EventName.GetHashCode(); @@ -280,48 +248,40 @@ namespace Tango.PMR.EmbeddedParameters { output.WriteRawTag(8); output.WriteEnum((int) AlarmSource); } - if (Frequency != 0) { - output.WriteRawTag(16); - output.WriteUInt32(Frequency); - } if (DeviceId != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteUInt32(DeviceId); } if (ModuleDeviceId != 0) { - output.WriteRawTag(32); + output.WriteRawTag(24); output.WriteUInt32(ModuleDeviceId); } if (AlarmValue != 0) { - output.WriteRawTag(40); + output.WriteRawTag(32); output.WriteUInt32(AlarmValue); } if (AlarmDirection != false) { - output.WriteRawTag(48); + output.WriteRawTag(40); output.WriteBool(AlarmDirection); } if (Severity != 0) { - output.WriteRawTag(56); + output.WriteRawTag(48); output.WriteEnum((int) Severity); } - if (Predecessor != 0) { - output.WriteRawTag(64); - output.WriteUInt32(Predecessor); - } if (DebounceValue != 0) { - output.WriteRawTag(72); + output.WriteRawTag(56); output.WriteUInt32(DebounceValue); } if (EventType != 0) { - output.WriteRawTag(80); + output.WriteRawTag(64); output.WriteEnum((int) EventType); } if (EventName.Length != 0) { - output.WriteRawTag(90); + output.WriteRawTag(74); output.WriteString(EventName); } if (IsPersistent != false) { - output.WriteRawTag(96); + output.WriteRawTag(80); output.WriteBool(IsPersistent); } } @@ -332,9 +292,6 @@ namespace Tango.PMR.EmbeddedParameters { if (AlarmSource != 0) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) AlarmSource); } - if (Frequency != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Frequency); - } if (DeviceId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DeviceId); } @@ -350,9 +307,6 @@ namespace Tango.PMR.EmbeddedParameters { if (Severity != 0) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Severity); } - if (Predecessor != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Predecessor); - } if (DebounceValue != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DebounceValue); } @@ -376,9 +330,6 @@ namespace Tango.PMR.EmbeddedParameters { if (other.AlarmSource != 0) { AlarmSource = other.AlarmSource; } - if (other.Frequency != 0) { - Frequency = other.Frequency; - } if (other.DeviceId != 0) { DeviceId = other.DeviceId; } @@ -394,9 +345,6 @@ namespace Tango.PMR.EmbeddedParameters { if (other.Severity != 0) { Severity = other.Severity; } - if (other.Predecessor != 0) { - Predecessor = other.Predecessor; - } if (other.DebounceValue != 0) { DebounceValue = other.DebounceValue; } @@ -424,46 +372,38 @@ namespace Tango.PMR.EmbeddedParameters { break; } case 16: { - Frequency = input.ReadUInt32(); - break; - } - case 24: { DeviceId = input.ReadUInt32(); break; } - case 32: { + case 24: { ModuleDeviceId = input.ReadUInt32(); break; } - case 40: { + case 32: { AlarmValue = input.ReadUInt32(); break; } - case 48: { + case 40: { AlarmDirection = input.ReadBool(); break; } - case 56: { + case 48: { severity_ = (global::Tango.PMR.Debugging.DebugLogCategory) input.ReadEnum(); break; } - case 64: { - Predecessor = input.ReadUInt32(); - break; - } - case 72: { + case 56: { DebounceValue = input.ReadUInt32(); break; } - case 80: { + case 64: { eventType_ = (global::Tango.PMR.Diagnostics.EventType) input.ReadEnum(); break; } - case 90: { + case 74: { EventName = input.ReadString(); break; } - case 96: { + case 80: { IsPersistent = input.ReadBool(); break; } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs index 7f97d6907..988d26788 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs @@ -23,10 +23,11 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaXNwZW5zZXJMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuUHJpbnRp", - "bmcqcwoTRGlzcGVuc2VyTGlxdWlkVHlwZRIICgRDeWFuEAASCwoHTWFnZW50", - "YRABEgoKBlllbGxvdxACEgkKBUJsYWNrEAMSEgoOVHJhbnNwYXJlbnRJbmsQ", - "BBINCglMdWJyaWNhbnQQBRILCgdDbGVhbmVyEAZCHgocY29tLnR3aW5lLnRh", - "bmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "bmcqpQEKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu", + "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5r", + "EAQSDQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAH", + "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAlCHgocY29tLnR3", + "aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.DispenserLiquidType), }, null)); @@ -43,6 +44,9 @@ namespace Tango.PMR.Printing { [pbr::OriginalName("TransparentInk")] TransparentInk = 4, [pbr::OriginalName("Lubricant")] Lubricant = 5, [pbr::OriginalName("Cleaner")] Cleaner = 6, + [pbr::OriginalName("LightCyan")] LightCyan = 7, + [pbr::OriginalName("LightMagenta")] LightMagenta = 8, + [pbr::OriginalName("LightYellow")] LightYellow = 9, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureRequest.cs new file mode 100644 index 000000000..771aaf4f0 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureRequest.cs @@ -0,0 +1,301 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ProcedureRequest.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.Stubs { + + /// <summary>Holder for reflection information generated from ProcedureRequest.proto</summary> + public static partial class ProcedureRequestReflection { + + #region Descriptor + /// <summary>File descriptor for ProcedureRequest.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static ProcedureRequestReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChZQcm9jZWR1cmVSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIuU3R1YnMicQoQ", + "UHJvY2VkdXJlUmVxdWVzdBIMCgRUeXBlGAEgASgFEg8KB1RpbWVvdXQYAiAB", + "KAUSDgoGUGFyYW0xGAMgASgCEg4KBlBhcmFtMhgEIAEoAhIOCgZQYXJhbTMY", + "BSABKAISDgoGUGFyYW00GAYgASgCQhsKGWNvbS50d2luZS50YW5nby5wbXIu", + "c3R1YnNiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.ProcedureRequest), global::Tango.PMR.Stubs.ProcedureRequest.Parser, new[]{ "Type", "Timeout", "Param1", "Param2", "Param3", "Param4" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class ProcedureRequest : pb::IMessage<ProcedureRequest> { + private static readonly pb::MessageParser<ProcedureRequest> _parser = new pb::MessageParser<ProcedureRequest>(() => new ProcedureRequest()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<ProcedureRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Stubs.ProcedureRequestReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureRequest(ProcedureRequest other) : this() { + type_ = other.type_; + timeout_ = other.timeout_; + param1_ = other.param1_; + param2_ = other.param2_; + param3_ = other.param3_; + param4_ = other.param4_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureRequest Clone() { + return new ProcedureRequest(this); + } + + /// <summary>Field number for the "Type" field.</summary> + public const int TypeFieldNumber = 1; + private int type_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Type { + get { return type_; } + set { + type_ = value; + } + } + + /// <summary>Field number for the "Timeout" field.</summary> + public const int TimeoutFieldNumber = 2; + private int timeout_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Timeout { + get { return timeout_; } + set { + timeout_ = value; + } + } + + /// <summary>Field number for the "Param1" field.</summary> + public const int Param1FieldNumber = 3; + private float param1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float Param1 { + get { return param1_; } + set { + param1_ = value; + } + } + + /// <summary>Field number for the "Param2" field.</summary> + public const int Param2FieldNumber = 4; + private float param2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float Param2 { + get { return param2_; } + set { + param2_ = value; + } + } + + /// <summary>Field number for the "Param3" field.</summary> + public const int Param3FieldNumber = 5; + private float param3_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float Param3 { + get { return param3_; } + set { + param3_ = value; + } + } + + /// <summary>Field number for the "Param4" field.</summary> + public const int Param4FieldNumber = 6; + private float param4_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float Param4 { + get { return param4_; } + set { + param4_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as ProcedureRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(ProcedureRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Type != other.Type) return false; + if (Timeout != other.Timeout) return false; + if (Param1 != other.Param1) return false; + if (Param2 != other.Param2) return false; + if (Param3 != other.Param3) return false; + if (Param4 != other.Param4) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Type != 0) hash ^= Type.GetHashCode(); + if (Timeout != 0) hash ^= Timeout.GetHashCode(); + if (Param1 != 0F) hash ^= Param1.GetHashCode(); + if (Param2 != 0F) hash ^= Param2.GetHashCode(); + if (Param3 != 0F) hash ^= Param3.GetHashCode(); + if (Param4 != 0F) hash ^= Param4.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 (Type != 0) { + output.WriteRawTag(8); + output.WriteInt32(Type); + } + if (Timeout != 0) { + output.WriteRawTag(16); + output.WriteInt32(Timeout); + } + if (Param1 != 0F) { + output.WriteRawTag(29); + output.WriteFloat(Param1); + } + if (Param2 != 0F) { + output.WriteRawTag(37); + output.WriteFloat(Param2); + } + if (Param3 != 0F) { + output.WriteRawTag(45); + output.WriteFloat(Param3); + } + if (Param4 != 0F) { + output.WriteRawTag(53); + output.WriteFloat(Param4); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Type != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Type); + } + if (Timeout != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Timeout); + } + if (Param1 != 0F) { + size += 1 + 4; + } + if (Param2 != 0F) { + size += 1 + 4; + } + if (Param3 != 0F) { + size += 1 + 4; + } + if (Param4 != 0F) { + size += 1 + 4; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(ProcedureRequest other) { + if (other == null) { + return; + } + if (other.Type != 0) { + Type = other.Type; + } + if (other.Timeout != 0) { + Timeout = other.Timeout; + } + if (other.Param1 != 0F) { + Param1 = other.Param1; + } + if (other.Param2 != 0F) { + Param2 = other.Param2; + } + if (other.Param3 != 0F) { + Param3 = other.Param3; + } + if (other.Param4 != 0F) { + Param4 = other.Param4; + } + } + + [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: { + Type = input.ReadInt32(); + break; + } + case 16: { + Timeout = input.ReadInt32(); + break; + } + case 29: { + Param1 = input.ReadFloat(); + break; + } + case 37: { + Param2 = input.ReadFloat(); + break; + } + case 45: { + Param3 = input.ReadFloat(); + break; + } + case 53: { + Param4 = input.ReadFloat(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureResponse.cs new file mode 100644 index 000000000..afbad9a4d --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Stubs/ProcedureResponse.cs @@ -0,0 +1,273 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ProcedureResponse.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.Stubs { + + /// <summary>Holder for reflection information generated from ProcedureResponse.proto</summary> + public static partial class ProcedureResponseReflection { + + #region Descriptor + /// <summary>File descriptor for ProcedureResponse.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static ProcedureResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChdQcm9jZWR1cmVSZXNwb25zZS5wcm90bxIPVGFuZ28uUE1SLlN0dWJzIm4K", + "EVByb2NlZHVyZVJlc3BvbnNlEgwKBFR5cGUYASABKAUSDAoEVGltZRgCIAEo", + "BRITCgtSZXBseVZhbHVlMRgDIAEoAhITCgtSZXBseVZhbHVlMhgEIAEoAhIT", + "CgtSZXBseVZhbHVlMxgFIAEoAkIbChljb20udHdpbmUudGFuZ28ucG1yLnN0", + "dWJzYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.ProcedureResponse), global::Tango.PMR.Stubs.ProcedureResponse.Parser, new[]{ "Type", "Time", "ReplyValue1", "ReplyValue2", "ReplyValue3" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class ProcedureResponse : pb::IMessage<ProcedureResponse> { + private static readonly pb::MessageParser<ProcedureResponse> _parser = new pb::MessageParser<ProcedureResponse>(() => new ProcedureResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<ProcedureResponse> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Stubs.ProcedureResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureResponse(ProcedureResponse other) : this() { + type_ = other.type_; + time_ = other.time_; + replyValue1_ = other.replyValue1_; + replyValue2_ = other.replyValue2_; + replyValue3_ = other.replyValue3_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ProcedureResponse Clone() { + return new ProcedureResponse(this); + } + + /// <summary>Field number for the "Type" field.</summary> + public const int TypeFieldNumber = 1; + private int type_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Type { + get { return type_; } + set { + type_ = value; + } + } + + /// <summary>Field number for the "Time" field.</summary> + public const int TimeFieldNumber = 2; + private int time_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Time { + get { return time_; } + set { + time_ = value; + } + } + + /// <summary>Field number for the "ReplyValue1" field.</summary> + public const int ReplyValue1FieldNumber = 3; + private float replyValue1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float ReplyValue1 { + get { return replyValue1_; } + set { + replyValue1_ = value; + } + } + + /// <summary>Field number for the "ReplyValue2" field.</summary> + public const int ReplyValue2FieldNumber = 4; + private float replyValue2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float ReplyValue2 { + get { return replyValue2_; } + set { + replyValue2_ = value; + } + } + + /// <summary>Field number for the "ReplyValue3" field.</summary> + public const int ReplyValue3FieldNumber = 5; + private float replyValue3_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float ReplyValue3 { + get { return replyValue3_; } + set { + replyValue3_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as ProcedureResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(ProcedureResponse other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Type != other.Type) return false; + if (Time != other.Time) return false; + if (ReplyValue1 != other.ReplyValue1) return false; + if (ReplyValue2 != other.ReplyValue2) return false; + if (ReplyValue3 != other.ReplyValue3) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Type != 0) hash ^= Type.GetHashCode(); + if (Time != 0) hash ^= Time.GetHashCode(); + if (ReplyValue1 != 0F) hash ^= ReplyValue1.GetHashCode(); + if (ReplyValue2 != 0F) hash ^= ReplyValue2.GetHashCode(); + if (ReplyValue3 != 0F) hash ^= ReplyValue3.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 (Type != 0) { + output.WriteRawTag(8); + output.WriteInt32(Type); + } + if (Time != 0) { + output.WriteRawTag(16); + output.WriteInt32(Time); + } + if (ReplyValue1 != 0F) { + output.WriteRawTag(29); + output.WriteFloat(ReplyValue1); + } + if (ReplyValue2 != 0F) { + output.WriteRawTag(37); + output.WriteFloat(ReplyValue2); + } + if (ReplyValue3 != 0F) { + output.WriteRawTag(45); + output.WriteFloat(ReplyValue3); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Type != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Type); + } + if (Time != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Time); + } + if (ReplyValue1 != 0F) { + size += 1 + 4; + } + if (ReplyValue2 != 0F) { + size += 1 + 4; + } + if (ReplyValue3 != 0F) { + size += 1 + 4; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(ProcedureResponse other) { + if (other == null) { + return; + } + if (other.Type != 0) { + Type = other.Type; + } + if (other.Time != 0) { + Time = other.Time; + } + if (other.ReplyValue1 != 0F) { + ReplyValue1 = other.ReplyValue1; + } + if (other.ReplyValue2 != 0F) { + ReplyValue2 = other.ReplyValue2; + } + if (other.ReplyValue3 != 0F) { + ReplyValue3 = other.ReplyValue3; + } + } + + [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: { + Type = input.ReadInt32(); + break; + } + case 16: { + Time = input.ReadInt32(); + break; + } + case 29: { + ReplyValue1 = input.ReadFloat(); + break; + } + case 37: { + ReplyValue2 = input.ReadFloat(); + break; + } + case 45: { + ReplyValue3 = input.ReadFloat(); + 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 5debc8864..2284a2914 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -330,6 +330,8 @@ <Compile Include="Printing\UploadProcessParametersResponse.cs" /> <Compile Include="Printing\WindingMethod.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Stubs\ProcedureRequest.cs" /> + <Compile Include="Stubs\ProcedureResponse.cs" /> <Compile Include="Stubs\StubAllHardwareRequest.cs" /> <Compile Include="Stubs\StubAllHardwareResponse.cs" /> <Compile Include="Stubs\StubDispenserEEpromData.cs" /> @@ -487,7 +489,7 @@ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 2c0063d78..48cb5a993 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -439,6 +439,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DataStore.Web", "Data EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.DPGraphGenerator", "FSE\Tango.FSE.DPGraphGenerator\Tango.FSE.DPGraphGenerator.csproj", "{C57D9D68-336C-4665-9EF4-EC1BDBB84885}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.LiquidColorGenerator.UI", "Utilities\Tango.LiquidColorGenerator.UI\Tango.LiquidColorGenerator.UI.csproj", "{949857A0-777D-4A32-8668-7163E404D800}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -4146,6 +4148,26 @@ Global {C57D9D68-336C-4665-9EF4-EC1BDBB84885}.Release|x64.Build.0 = Release|Any CPU {C57D9D68-336C-4665-9EF4-EC1BDBB84885}.Release|x86.ActiveCfg = Release|Any CPU {C57D9D68-336C-4665-9EF4-EC1BDBB84885}.Release|x86.Build.0 = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|Any CPU.Build.0 = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|ARM.ActiveCfg = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|ARM.Build.0 = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|ARM64.Build.0 = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|x64.ActiveCfg = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|x64.Build.0 = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|x86.ActiveCfg = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Debug|x86.Build.0 = Debug|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|Any CPU.ActiveCfg = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|Any CPU.Build.0 = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|ARM.ActiveCfg = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|ARM.Build.0 = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|ARM64.ActiveCfg = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|ARM64.Build.0 = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|x64.ActiveCfg = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|x64.Build.0 = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|x86.ActiveCfg = Release|Any CPU + {949857A0-777D-4A32-8668-7163E404D800}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4298,14 +4320,15 @@ Global {6189B8C3-7AF9-43DD-8A61-A8A05F526F62} = {3F723D53-3539-42D1-8570-395BF660928D} {A9828548-AF43-4CE4-8B13-50E99F9C9CF7} = {3F723D53-3539-42D1-8570-395BF660928D} {C57D9D68-336C-4665-9EF4-EC1BDBB84885} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013} + {949857A0-777D-4A32-8668-7163E404D800} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs - BuildVersion_StartDate = 2000/1/1 - BuildVersion_UpdateFileVersion = False - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_UpdateFileVersion = False + BuildVersion_StartDate = 2000/1/1 + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.config b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.config new file mode 100644 index 000000000..731f6de6c --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml new file mode 100644 index 000000000..09124c44f --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml @@ -0,0 +1,9 @@ +<Application x:Class="Tango.LiquidColorGenerator.UI.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="clr-namespace:Tango.LiquidColorGenerator.UI" + StartupUri="MainWindow.xaml"> + <Application.Resources> + + </Application.Resources> +</Application> diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml.cs b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml.cs new file mode 100644 index 000000000..aba8ead65 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Tango.LiquidColorGenerator.UI +{ + /// <summary> + /// Interaction logic for App.xaml + /// </summary> + public partial class App : Application + { + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml new file mode 100644 index 000000000..cfdd6de22 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml @@ -0,0 +1,21 @@ +<Window x:Class="Tango.LiquidColorGenerator.UI.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:brush="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker" + xmlns:local="clr-namespace:Tango.LiquidColorGenerator.UI" + mc:Ignorable="d" + Title="MainWindow" Height="300" Width="800"> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="300"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + + <brush:BrushPicker x:Name="picker" VerticalAlignment="Stretch" BrushTypeVisibility="Collapsed" /> + + <TextBox Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" FontSize="30" x:Name="txt"></TextBox> + + </Grid> +</Window> diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml.cs new file mode 100644 index 000000000..6cba6e577 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/MainWindow.xaml.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.LiquidColorGenerator.UI +{ + /// <summary> + /// Interaction logic for MainWindow.xaml + /// </summary> + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + + picker.ColorChanged += Picker_ColorChanged; + txt.TextChanged += Txt_TextChanged; + } + + private void Txt_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + picker.Color = Core.Helpers.ColorHelper.IntegerToColor(int.Parse(txt.Text)); + } + catch { } + } + + private void Picker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e) + { + txt.Text = Core.Helpers.ColorHelper.ColorToInteger(e.Color).ToString(); + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..382030056 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tango.LiquidColorGenerator.UI")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tango.LiquidColorGenerator.UI")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file +//inside a <PropertyGroup>. For example, if you are using US english +//in your source files, set the <UICulture> to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.Designer.cs new file mode 100644 index 000000000..9ce60d611 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.LiquidColorGenerator.UI.Properties +{ + + + /// <summary> + /// A strongly-typed resource class, for looking up localized strings, etc. + /// </summary> + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// <summary> + /// Returns the cached ResourceManager instance used by this class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.LiquidColorGenerator.UI.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.resx b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Resources.resx @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.Designer.cs b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.Designer.cs new file mode 100644 index 000000000..fe9f990ce --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.LiquidColorGenerator.UI.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.settings b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Properties/Settings.settings @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> + <Profiles> + <Profile Name="(Default)" /> + </Profiles> + <Settings /> +</SettingsFile>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Tango.LiquidColorGenerator.UI.csproj b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Tango.LiquidColorGenerator.UI.csproj new file mode 100644 index 000000000..d77bd1cdd --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.LiquidColorGenerator.UI/Tango.LiquidColorGenerator.UI.csproj @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{949857A0-777D-4A32-8668-7163E404D800}</ProjectGuid> + <OutputType>WinExe</OutputType> + <RootNamespace>Tango.LiquidColorGenerator.UI</RootNamespace> + <AssemblyName>Tango.LiquidColorGenerator.UI</AssemblyName> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <WarningLevel>4</WarningLevel> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + <Deterministic>true</Deterministic> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Xaml"> + <RequiredTargetFramework>4.0</RequiredTargetFramework> + </Reference> + <Reference Include="WindowsBase" /> + <Reference Include="PresentationCore" /> + <Reference Include="PresentationFramework" /> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="MainWindow.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + <Compile Include="App.xaml.cs"> + <DependentUpon>App.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + <Compile Include="MainWindow.xaml.cs"> + <DependentUpon>MainWindow.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + </ItemGroup> + <ItemGroup> + <Compile Include="Properties\AssemblyInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="Properties\Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + </Compile> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <None Include="Properties\Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Tango.BrushPicker\Tango.BrushPicker.csproj"> + <Project>{40085232-aced-4cbe-945b-90ba8153c151}</Project> + <Name>Tango.BrushPicker</Name> + </ProjectReference> + <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj"> + <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project> + <Name>Tango.Core</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file |