diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-25 17:52:49 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-25 17:52:49 +0200 |
| commit | 9277bbd2fa070c69b83904f8fe5628fab2b947b8 (patch) | |
| tree | 3099f9ce92f04c28517eb13938e913a1e376b3fe /Software/Visual_Studio/Tango.PMR/Hardware | |
| parent | f779e2b6f0bb1dedc7644c64651b59e31ce62c00 (diff) | |
| download | Tango-9277bbd2fa070c69b83904f8fe5628fab2b947b8.tar.gz Tango-9277bbd2fa070c69b83904f8fe5628fab2b947b8.zip | |
Working on job export import to storage.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/Hardware')
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs index caf7f29a8..8138b2d70 100644 --- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs @@ -23,15 +23,15 @@ namespace Tango.PMR.Hardware { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChRIYXJkd2FyZUJsb3dlci5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJlGhhI", - "YXJkd2FyZUJsb3dlclR5cGUucHJvdG8idgoOSGFyZHdhcmVCbG93ZXISQgoS", - "SGFyZHdhcmVCbG93ZXJUeXBlGAEgASgOMiYuVGFuZ28uUE1SLkhhcmR3YXJl", - "LkhhcmR3YXJlQmxvd2VyVHlwZRIPCgdFbmFibGVkGAIgASgIEg8KB1ZvbHRh", - "Z2UYAyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJv", - "dG8z")); + "YXJkd2FyZUJsb3dlclR5cGUucHJvdG8ijgEKDkhhcmR3YXJlQmxvd2VyEkIK", + "EkhhcmR3YXJlQmxvd2VyVHlwZRgBIAEoDjImLlRhbmdvLlBNUi5IYXJkd2Fy", + "ZS5IYXJkd2FyZUJsb3dlclR5cGUSDwoHRW5hYmxlZBgCIAEoCBIPCgdWb2x0", + "YWdlGAMgASgBEhYKDkhlYXRpbmdWb2x0YWdlGAQgASgBQh4KHGNvbS50d2lu", + "ZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareBlowerTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareBlower), global::Tango.PMR.Hardware.HardwareBlower.Parser, new[]{ "HardwareBlowerType", "Enabled", "Voltage" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareBlower), global::Tango.PMR.Hardware.HardwareBlower.Parser, new[]{ "HardwareBlowerType", "Enabled", "Voltage", "HeatingVoltage" }, null, null, null) })); } #endregion @@ -65,6 +65,7 @@ namespace Tango.PMR.Hardware { hardwareBlowerType_ = other.hardwareBlowerType_; enabled_ = other.enabled_; voltage_ = other.voltage_; + heatingVoltage_ = other.heatingVoltage_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -105,6 +106,17 @@ namespace Tango.PMR.Hardware { } } + /// <summary>Field number for the "HeatingVoltage" field.</summary> + public const int HeatingVoltageFieldNumber = 4; + private double heatingVoltage_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeatingVoltage { + get { return heatingVoltage_; } + set { + heatingVoltage_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as HardwareBlower); @@ -121,6 +133,7 @@ namespace Tango.PMR.Hardware { if (HardwareBlowerType != other.HardwareBlowerType) return false; if (Enabled != other.Enabled) return false; if (Voltage != other.Voltage) return false; + if (HeatingVoltage != other.HeatingVoltage) return false; return true; } @@ -130,6 +143,7 @@ namespace Tango.PMR.Hardware { if (HardwareBlowerType != 0) hash ^= HardwareBlowerType.GetHashCode(); if (Enabled != false) hash ^= Enabled.GetHashCode(); if (Voltage != 0D) hash ^= Voltage.GetHashCode(); + if (HeatingVoltage != 0D) hash ^= HeatingVoltage.GetHashCode(); return hash; } @@ -152,6 +166,10 @@ namespace Tango.PMR.Hardware { output.WriteRawTag(25); output.WriteDouble(Voltage); } + if (HeatingVoltage != 0D) { + output.WriteRawTag(33); + output.WriteDouble(HeatingVoltage); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -166,6 +184,9 @@ namespace Tango.PMR.Hardware { if (Voltage != 0D) { size += 1 + 8; } + if (HeatingVoltage != 0D) { + size += 1 + 8; + } return size; } @@ -183,6 +204,9 @@ namespace Tango.PMR.Hardware { if (other.Voltage != 0D) { Voltage = other.Voltage; } + if (other.HeatingVoltage != 0D) { + HeatingVoltage = other.HeatingVoltage; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -205,6 +229,10 @@ namespace Tango.PMR.Hardware { Voltage = input.ReadDouble(); break; } + case 33: { + HeatingVoltage = input.ReadDouble(); + break; + } } } } |
