diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/EmbeddedParameters')
6 files changed, 124 insertions, 869 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs index 25f40a731..1777459e4 100644 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs +++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs @@ -24,20 +24,20 @@ namespace Tango.PMR.EmbeddedParameters { string.Concat( "ChdBbGFybUhhbmRsaW5nSXRlbS5wcm90bxIcVGFuZ28uUE1SLkVtYmVkZGVk", "UGFyYW1ldGVycxoVQWxhcm1Tb3VyY2VUeXBlLnByb3RvGhZEZWJ1Z0xvZ0Nh", - "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8i2wIKEUFsYXJtSGFuZGxp", + "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8i7QIKEUFsYXJtSGFuZGxp", "bmdJdGVtEkIKC0FsYXJtU291cmNlGAEgASgOMi0uVGFuZ28uUE1SLkVtYmVk", - "ZGVkUGFyYW1ldGVycy5BbGFybVNvdXJjZVR5cGUSEAoIRGV2aWNlSWQYAiAB", - "KA0SFgoOTW9kdWxlRGV2aWNlSWQYAyABKA0SEgoKQWxhcm1WYWx1ZRgEIAEo", - "DRIWCg5BbGFybURpcmVjdGlvbhgFIAEoCBI3CghTZXZlcml0eRgGIAEoDjIl", - "LlRhbmdvLlBNUi5EZWJ1Z2dpbmcuRGVidWdMb2dDYXRlZ29yeRIVCg1EZWJv", - "dW5jZVZhbHVlGAcgASgNEjMKCUV2ZW50VHlwZRgIIAEoDjIgLlRhbmdvLlBN", - "Ui5EaWFnbm9zdGljcy5FdmVudFR5cGUSEQoJRXZlbnROYW1lGAkgASgJEhQK", - "DElzUGVyc2lzdGVudBgKIAEoCEIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVt", - "YmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z")); + "ZGVkUGFyYW1ldGVycy5BbGFybVNvdXJjZVR5cGUSEQoJRnJlcXVlbmN5GAIg", + "ASgNEhAKCERldmljZUlkGAMgASgNEhYKDk1vZHVsZURldmljZUlkGAQgASgN", + "EhIKCkFsYXJtVmFsdWUYBSABKA0SFgoOQWxhcm1EaXJlY3Rpb24YBiABKAgS", + "NwoIU2V2ZXJpdHkYByABKA4yJS5UYW5nby5QTVIuRGVidWdnaW5nLkRlYnVn", + "TG9nQ2F0ZWdvcnkSEwoLUHJlZGVjZXNzb3IYCCABKA0SFQoNRGVib3VuY2VW", + "YWx1ZRgJIAEoDRIzCglFdmVudFR5cGUYCiABKA4yIC5UYW5nby5QTVIuRGlh", + "Z25vc3RpY3MuRXZlbnRUeXBlEhEKCUV2ZW50TmFtZRgLIAEoCUIoCiZjb20u", + "dHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z")); 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", "DeviceId", "ModuleDeviceId", "AlarmValue", "AlarmDirection", "Severity", "DebounceValue", "EventType", "EventName", "IsPersistent" }, null, null, null) + 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" }, null, null, null) })); } #endregion @@ -69,15 +69,16 @@ 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_; - isPersistent_ = other.isPersistent_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -96,8 +97,22 @@ 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 = 2; + public const int DeviceIdFieldNumber = 3; private uint deviceId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DeviceId { @@ -108,7 +123,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "ModuleDeviceId" field.</summary> - public const int ModuleDeviceIdFieldNumber = 3; + public const int ModuleDeviceIdFieldNumber = 4; private uint moduleDeviceId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint ModuleDeviceId { @@ -119,7 +134,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "AlarmValue" field.</summary> - public const int AlarmValueFieldNumber = 4; + public const int AlarmValueFieldNumber = 5; private uint alarmValue_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint AlarmValue { @@ -130,7 +145,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "AlarmDirection" field.</summary> - public const int AlarmDirectionFieldNumber = 5; + public const int AlarmDirectionFieldNumber = 6; private bool alarmDirection_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public bool AlarmDirection { @@ -141,7 +156,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "Severity" field.</summary> - public const int SeverityFieldNumber = 6; + public const int SeverityFieldNumber = 7; private global::Tango.PMR.Debugging.DebugLogCategory severity_ = 0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Tango.PMR.Debugging.DebugLogCategory Severity { @@ -151,8 +166,19 @@ 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 = 7; + public const int DebounceValueFieldNumber = 9; private uint debounceValue_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DebounceValue { @@ -163,7 +189,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "EventType" field.</summary> - public const int EventTypeFieldNumber = 8; + public const int EventTypeFieldNumber = 10; private global::Tango.PMR.Diagnostics.EventType eventType_ = 0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Tango.PMR.Diagnostics.EventType EventType { @@ -174,7 +200,7 @@ namespace Tango.PMR.EmbeddedParameters { } /// <summary>Field number for the "EventName" field.</summary> - public const int EventNameFieldNumber = 9; + public const int EventNameFieldNumber = 11; private string eventName_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string EventName { @@ -184,17 +210,6 @@ namespace Tango.PMR.EmbeddedParameters { } } - /// <summary>Field number for the "IsPersistent" field.</summary> - public const int IsPersistentFieldNumber = 10; - private bool isPersistent_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool IsPersistent { - get { return isPersistent_; } - set { - isPersistent_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as AlarmHandlingItem); @@ -209,15 +224,16 @@ 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; - if (IsPersistent != other.IsPersistent) return false; return true; } @@ -225,15 +241,16 @@ 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(); - if (IsPersistent != false) hash ^= IsPersistent.GetHashCode(); return hash; } @@ -248,42 +265,46 @@ namespace Tango.PMR.EmbeddedParameters { output.WriteRawTag(8); output.WriteEnum((int) AlarmSource); } - if (DeviceId != 0) { + if (Frequency != 0) { output.WriteRawTag(16); + output.WriteUInt32(Frequency); + } + if (DeviceId != 0) { + output.WriteRawTag(24); output.WriteUInt32(DeviceId); } if (ModuleDeviceId != 0) { - output.WriteRawTag(24); + output.WriteRawTag(32); output.WriteUInt32(ModuleDeviceId); } if (AlarmValue != 0) { - output.WriteRawTag(32); + output.WriteRawTag(40); output.WriteUInt32(AlarmValue); } if (AlarmDirection != false) { - output.WriteRawTag(40); + output.WriteRawTag(48); output.WriteBool(AlarmDirection); } if (Severity != 0) { - output.WriteRawTag(48); + output.WriteRawTag(56); output.WriteEnum((int) Severity); } + if (Predecessor != 0) { + output.WriteRawTag(64); + output.WriteUInt32(Predecessor); + } if (DebounceValue != 0) { - output.WriteRawTag(56); + output.WriteRawTag(72); output.WriteUInt32(DebounceValue); } if (EventType != 0) { - output.WriteRawTag(64); + output.WriteRawTag(80); output.WriteEnum((int) EventType); } if (EventName.Length != 0) { - output.WriteRawTag(74); + output.WriteRawTag(90); output.WriteString(EventName); } - if (IsPersistent != false) { - output.WriteRawTag(80); - output.WriteBool(IsPersistent); - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -292,6 +313,9 @@ 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); } @@ -307,6 +331,9 @@ 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); } @@ -316,9 +343,6 @@ namespace Tango.PMR.EmbeddedParameters { if (EventName.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(EventName); } - if (IsPersistent != false) { - size += 1 + 1; - } return size; } @@ -330,6 +354,9 @@ 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; } @@ -345,6 +372,9 @@ 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; } @@ -354,9 +384,6 @@ namespace Tango.PMR.EmbeddedParameters { if (other.EventName.Length != 0) { EventName = other.EventName; } - if (other.IsPersistent != false) { - IsPersistent = other.IsPersistent; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -372,39 +399,43 @@ namespace Tango.PMR.EmbeddedParameters { break; } case 16: { - DeviceId = input.ReadUInt32(); + Frequency = input.ReadUInt32(); break; } case 24: { - ModuleDeviceId = input.ReadUInt32(); + DeviceId = input.ReadUInt32(); break; } case 32: { - AlarmValue = input.ReadUInt32(); + ModuleDeviceId = input.ReadUInt32(); break; } case 40: { - AlarmDirection = input.ReadBool(); + AlarmValue = input.ReadUInt32(); break; } case 48: { - severity_ = (global::Tango.PMR.Debugging.DebugLogCategory) input.ReadEnum(); + AlarmDirection = input.ReadBool(); break; } case 56: { - DebounceValue = input.ReadUInt32(); + severity_ = (global::Tango.PMR.Debugging.DebugLogCategory) input.ReadEnum(); break; } case 64: { - eventType_ = (global::Tango.PMR.Diagnostics.EventType) input.ReadEnum(); + Predecessor = input.ReadUInt32(); break; } - case 74: { - EventName = input.ReadString(); + case 72: { + DebounceValue = input.ReadUInt32(); break; } case 80: { - IsPersistent = input.ReadBool(); + eventType_ = (global::Tango.PMR.Diagnostics.EventType) input.ReadEnum(); + break; + } + case 90: { + EventName = input.ReadString(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs index 1e7767423..a7e1345bd 100644 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.EmbeddedParameters { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch1Db25maWd1cmF0aW9uUGFyYW1ldGVycy5wcm90bxIcVGFuZ28uUE1SLkVt", - "YmVkZGVkUGFyYW1ldGVycyKNCgoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS", + "YmVkZGVkUGFyYW1ldGVycyLjCQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS", "GAoQQnJlYWtTZW5zb3JMaW1pdBgBIAEoDRIhChlEaWFnbm9zdGljQ29sbGVj", "dGlvbkxpbWl0GAIgASgNEhoKEk92ZXJIZWF0Q291bnRMaW1pdBgDIAEoDRIb", "ChNVbmRlckhlYXRDb3VudExpbWl0GAQgASgNEhkKEUNsb3NlVmFsdmVUaW1l", @@ -51,13 +51,12 @@ namespace Tango.PMR.EmbeddedParameters { "ICABKA0SGwoTSWRsZUhlYWRUZW1wZXJhdHVyZRghIAEoDRIcChRJZGxlTWl4", "ZXJUZW1wZXJhdHVyZRgiIAEoDRIgChhQb3dlck9mZlRlbXBlcmF0dXJlTGlt", "aXQYIyABKA0SLQolSURTX1ByZVNlZ21lbnRfV0ZDRl9UaW1lQmVmb3JlU2Vn", - "bWVudBgkIAEoARITCgtGaWxlVmVyc2lvbhglIAEoDRITCgtEZXNjcmlwdGlv", - "bhgmIAEoCUIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1l", - "dGVyc2IGcHJvdG8z")); + "bWVudBgkIAEoAUIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFy", + "YW1ldGVyc2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.ConfigurationParameters), global::Tango.PMR.EmbeddedParameters.ConfigurationParameters.Parser, new[]{ "BreakSensorLimit", "DiagnosticCollectionLimit", "OverHeatCountLimit", "UnderHeatCountLimit", "CloseValveTimeout", "OpenValveTimeout", "InitialDispenserPressure", "InitialDispenserTimeout", "InitialDispenserTimeLag", "DispenserBuildPressureSpeed", "DispenserBuildPressureLimit", "DispenserBuildPressureTimeout", "DispenserBuildPressureLag", "ACHeatersLowerOperationLimit", "ACHeatersUpperOperationLimit", "DCHeatersLowerOperationLimit", "DCHeatersUpperOperationLimit", "MidTankPressureCorrection", "DispenserPresegmentWFCF", "StartHeatingOnInitSequence", "GeneralParameters", "CurrentAlarmLowLimit", "CurrentAlarmHighLimit", "IDSSegmentRefillTimeout", "IDSPreSegmentBuildupTime", "IDSCleaningSpeed", "IDSCleaningStopBeforeSegmentTime", "IDSCleaningStartSprayPreSegmentTime", "IDSLeftCleaningMotorSpeed", "IDSRightCleaningMotorSpeed", "SwitchToIdleTimeinSeconds", "IdleDrierTemperature", "IdleHeadTemperature", "IdleMixerTemperature", "PowerOffTemperatureLimit", "IDSPreSegmentWFCFTimeBeforeSegment", "FileVersion", "Description" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.ConfigurationParameters), global::Tango.PMR.EmbeddedParameters.ConfigurationParameters.Parser, new[]{ "BreakSensorLimit", "DiagnosticCollectionLimit", "OverHeatCountLimit", "UnderHeatCountLimit", "CloseValveTimeout", "OpenValveTimeout", "InitialDispenserPressure", "InitialDispenserTimeout", "InitialDispenserTimeLag", "DispenserBuildPressureSpeed", "DispenserBuildPressureLimit", "DispenserBuildPressureTimeout", "DispenserBuildPressureLag", "ACHeatersLowerOperationLimit", "ACHeatersUpperOperationLimit", "DCHeatersLowerOperationLimit", "DCHeatersUpperOperationLimit", "MidTankPressureCorrection", "DispenserPresegmentWFCF", "StartHeatingOnInitSequence", "GeneralParameters", "CurrentAlarmLowLimit", "CurrentAlarmHighLimit", "IDSSegmentRefillTimeout", "IDSPreSegmentBuildupTime", "IDSCleaningSpeed", "IDSCleaningStopBeforeSegmentTime", "IDSCleaningStartSprayPreSegmentTime", "IDSLeftCleaningMotorSpeed", "IDSRightCleaningMotorSpeed", "SwitchToIdleTimeinSeconds", "IdleDrierTemperature", "IdleHeadTemperature", "IdleMixerTemperature", "PowerOffTemperatureLimit", "IDSPreSegmentWFCFTimeBeforeSegment" }, null, null, null) })); } #endregion @@ -124,8 +123,6 @@ namespace Tango.PMR.EmbeddedParameters { idleMixerTemperature_ = other.idleMixerTemperature_; powerOffTemperatureLimit_ = other.powerOffTemperatureLimit_; iDSPreSegmentWFCFTimeBeforeSegment_ = other.iDSPreSegmentWFCFTimeBeforeSegment_; - fileVersion_ = other.fileVersion_; - description_ = other.description_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -137,7 +134,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int BreakSensorLimitFieldNumber = 1; private uint breakSensorLimit_; /// <summary> - /// Break Sensor Limit + ///#define BREAK_SENSOR_LIMIT 10 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint BreakSensorLimit { @@ -151,7 +148,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int DiagnosticCollectionLimitFieldNumber = 2; private uint diagnosticCollectionLimit_; /// <summary> - /// Diagnostics send interval in milliseconds 2 + ///#define Diagnostics send interval in milliseconds 2 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DiagnosticCollectionLimit { @@ -165,7 +162,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int OverHeatCountLimitFieldNumber = 3; private uint overHeatCountLimit_; /// <summary> - /// Overheat Count Limit + ///#define OVERHEAT_COUNT_LIMIT 3 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint OverHeatCountLimit { @@ -179,7 +176,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int UnderHeatCountLimitFieldNumber = 4; private uint underHeatCountLimit_; /// <summary> - /// Underheat Count Limit + ///#define UNDERHEAT_COUNT_LIMIT 3 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint UnderHeatCountLimit { @@ -193,7 +190,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int CloseValveTimeoutFieldNumber = 5; private uint closeValveTimeout_; /// <summary> - /// Close Valve Timeout + ///uint32_t CloseValveTimeout = 250; /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint CloseValveTimeout { @@ -207,7 +204,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int OpenValveTimeoutFieldNumber = 6; private uint openValveTimeout_; /// <summary> - /// Open Valve Timeout = 250; + ///uint32_t OpenValveTimeout = 250; /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint OpenValveTimeout { @@ -221,7 +218,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int InitialDispenserPressureFieldNumber = 7; private double initialDispenserPressure_; /// <summary> - /// Initial Dispenser Pressure + ///#define INITIAL_DISPENSER_PRESSURE 0.10 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double InitialDispenserPressure { @@ -235,7 +232,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int InitialDispenserTimeoutFieldNumber = 8; private uint initialDispenserTimeout_; /// <summary> - /// Initial Dispenser Timeout Limit + ///#define INITIAL_DISPENSER_TIMEOUT_LIMIT 10000 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint InitialDispenserTimeout { @@ -249,7 +246,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int InitialDispenserTimeLagFieldNumber = 9; private uint initialDispenserTimeLag_; /// <summary> - /// Initial Dispenser Timeout + ///#define INITIAL_DISPENSER_TIMEOUT 100 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint InitialDispenserTimeLag { @@ -263,7 +260,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int DispenserBuildPressureSpeedFieldNumber = 10; private uint dispenserBuildPressureSpeed_; /// <summary> - /// Dispenser prepare pressure building parameters - job prepare + ///#define DISPENSER_BUILD_PRESSURE_SPEED 500 /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DispenserBuildPressureSpeed { @@ -276,6 +273,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "DispenserBuildPressureLimit" field.</summary> public const int DispenserBuildPressureLimitFieldNumber = 11; private double dispenserBuildPressureLimit_; + /// <summary> + ///#define DISPENSER_BUILD_PRESSURE_LIMIT 0.5 + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double DispenserBuildPressureLimit { get { return dispenserBuildPressureLimit_; } @@ -287,6 +287,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "DispenserBuildPressureTimeout" field.</summary> public const int DispenserBuildPressureTimeoutFieldNumber = 12; private uint dispenserBuildPressureTimeout_; + /// <summary> + ///#define DISPENSER_BUILD_PRESSURE_TIMEOUT 8000 + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DispenserBuildPressureTimeout { get { return dispenserBuildPressureTimeout_; } @@ -298,6 +301,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "DispenserBuildPressureLag" field.</summary> public const int DispenserBuildPressureLagFieldNumber = 13; private uint dispenserBuildPressureLag_; + /// <summary> + ///#define DISPENSER_BUILD_PRESSURE_LAG 50 + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint DispenserBuildPressureLag { get { return dispenserBuildPressureLag_; } @@ -356,9 +362,6 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "MidTankPressureCorrection" field.</summary> public const int MidTankPressureCorrectionFieldNumber = 18; private double midTankPressureCorrection_; - /// <summary> - ///obsolete - /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double MidTankPressureCorrection { get { return midTankPressureCorrection_; } @@ -425,6 +428,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "CurrentAlarmHighLimit" field.</summary> public const int CurrentAlarmHighLimitFieldNumber = 23; private double currentAlarmHighLimit_; + /// <summary> + /// a limit percentage for current deviation predefined level + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double CurrentAlarmHighLimit { get { return currentAlarmHighLimit_; } @@ -465,7 +471,7 @@ namespace Tango.PMR.EmbeddedParameters { public const int IDSCleaningSpeedFieldNumber = 26; private double iDSCleaningSpeed_; /// <summary> - ///cleaning dispenser motor speed and timing - going to move to RML + ///cleaning dispenser motorspeed /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double IDSCleaningSpeed { @@ -478,6 +484,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "IDS_CleaningStopBeforeSegmentTime" field.</summary> public const int IDSCleaningStopBeforeSegmentTimeFieldNumber = 27; private double iDSCleaningStopBeforeSegmentTime_; + /// <summary> + ///cleaning dispenser stop before segment start + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double IDSCleaningStopBeforeSegmentTime { get { return iDSCleaningStopBeforeSegmentTime_; } @@ -489,6 +498,9 @@ namespace Tango.PMR.EmbeddedParameters { /// <summary>Field number for the "IDS_CleaningStartSprayPreSegmentTime" field.</summary> public const int IDSCleaningStartSprayPreSegmentTimeFieldNumber = 28; private double iDSCleaningStartSprayPreSegmentTime_; + /// <summary> + ///cleaning dispenser start during pre segment + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double IDSCleaningStartSprayPreSegmentTime { get { return iDSCleaningStartSprayPreSegmentTime_; } @@ -588,28 +600,6 @@ namespace Tango.PMR.EmbeddedParameters { } } - /// <summary>Field number for the "FileVersion" field.</summary> - public const int FileVersionFieldNumber = 37; - private uint fileVersion_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint FileVersion { - get { return fileVersion_; } - set { - fileVersion_ = value; - } - } - - /// <summary>Field number for the "Description" field.</summary> - public const int DescriptionFieldNumber = 38; - private string description_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Description { - get { return description_; } - set { - description_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ConfigurationParameters); @@ -659,8 +649,6 @@ namespace Tango.PMR.EmbeddedParameters { if (IdleMixerTemperature != other.IdleMixerTemperature) return false; if (PowerOffTemperatureLimit != other.PowerOffTemperatureLimit) return false; if (IDSPreSegmentWFCFTimeBeforeSegment != other.IDSPreSegmentWFCFTimeBeforeSegment) return false; - if (FileVersion != other.FileVersion) return false; - if (Description != other.Description) return false; return true; } @@ -703,8 +691,6 @@ namespace Tango.PMR.EmbeddedParameters { if (IdleMixerTemperature != 0) hash ^= IdleMixerTemperature.GetHashCode(); if (PowerOffTemperatureLimit != 0) hash ^= PowerOffTemperatureLimit.GetHashCode(); if (IDSPreSegmentWFCFTimeBeforeSegment != 0D) hash ^= IDSPreSegmentWFCFTimeBeforeSegment.GetHashCode(); - if (FileVersion != 0) hash ^= FileVersion.GetHashCode(); - if (Description.Length != 0) hash ^= Description.GetHashCode(); return hash; } @@ -856,14 +842,6 @@ namespace Tango.PMR.EmbeddedParameters { output.WriteRawTag(161, 2); output.WriteDouble(IDSPreSegmentWFCFTimeBeforeSegment); } - if (FileVersion != 0) { - output.WriteRawTag(168, 2); - output.WriteUInt32(FileVersion); - } - if (Description.Length != 0) { - output.WriteRawTag(178, 2); - output.WriteString(Description); - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -975,12 +953,6 @@ namespace Tango.PMR.EmbeddedParameters { if (IDSPreSegmentWFCFTimeBeforeSegment != 0D) { size += 2 + 8; } - if (FileVersion != 0) { - size += 2 + pb::CodedOutputStream.ComputeUInt32Size(FileVersion); - } - if (Description.Length != 0) { - size += 2 + pb::CodedOutputStream.ComputeStringSize(Description); - } return size; } @@ -1095,12 +1067,6 @@ namespace Tango.PMR.EmbeddedParameters { if (other.IDSPreSegmentWFCFTimeBeforeSegment != 0D) { IDSPreSegmentWFCFTimeBeforeSegment = other.IDSPreSegmentWFCFTimeBeforeSegment; } - if (other.FileVersion != 0) { - FileVersion = other.FileVersion; - } - if (other.Description.Length != 0) { - Description = other.Description; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1256,14 +1222,6 @@ namespace Tango.PMR.EmbeddedParameters { IDSPreSegmentWFCFTimeBeforeSegment = input.ReadDouble(); break; } - case 296: { - FileVersion = input.ReadUInt32(); - break; - } - case 306: { - Description = input.ReadString(); - break; - } } } } diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredData.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredData.cs deleted file mode 100644 index 94a15b2a0..000000000 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredData.cs +++ /dev/null @@ -1,182 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MainCardStoredData.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.EmbeddedParameters { - - /// <summary>Holder for reflection information generated from MainCardStoredData.proto</summary> - public static partial class MainCardStoredDataReflection { - - #region Descriptor - /// <summary>File descriptor for MainCardStoredData.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MainCardStoredDataReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChhNYWluQ2FyZFN0b3JlZERhdGEucHJvdG8SHFRhbmdvLlBNUi5FbWJlZGRl", - "ZFBhcmFtZXRlcnMaGE1haW5DYXJkU3RvcmVkSXRlbS5wcm90byJvChJNYWlu", - "Q2FyZFN0b3JlZERhdGESEwoLTWFpbkNhcmRTX04YASABKAkSRAoKU3RvcmVk", - "SXRlbRgCIAMoCzIwLlRhbmdvLlBNUi5FbWJlZGRlZFBhcmFtZXRlcnMuTWFp", - "bkNhcmRTdG9yZWRJdGVtQigKJmNvbS50d2luZS50YW5nby5wbXIuZW1iZWRk", - "ZWRwYXJhbWV0ZXJzYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.MainCardStoredItemReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MainCardStoredData), global::Tango.PMR.EmbeddedParameters.MainCardStoredData.Parser, new[]{ "MainCardSN", "StoredItem" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MainCardStoredData : pb::IMessage<MainCardStoredData> { - private static readonly pb::MessageParser<MainCardStoredData> _parser = new pb::MessageParser<MainCardStoredData>(() => new MainCardStoredData()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<MainCardStoredData> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.EmbeddedParameters.MainCardStoredDataReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredData() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredData(MainCardStoredData other) : this() { - mainCardSN_ = other.mainCardSN_; - storedItem_ = other.storedItem_.Clone(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredData Clone() { - return new MainCardStoredData(this); - } - - /// <summary>Field number for the "MainCardS_N" field.</summary> - public const int MainCardSNFieldNumber = 1; - private string mainCardSN_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string MainCardSN { - get { return mainCardSN_; } - set { - mainCardSN_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "StoredItem" field.</summary> - public const int StoredItemFieldNumber = 2; - private static readonly pb::FieldCodec<global::Tango.PMR.EmbeddedParameters.MainCardStoredItem> _repeated_storedItem_codec - = pb::FieldCodec.ForMessage(18, global::Tango.PMR.EmbeddedParameters.MainCardStoredItem.Parser); - private readonly pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MainCardStoredItem> storedItem_ = new pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MainCardStoredItem>(); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MainCardStoredItem> StoredItem { - get { return storedItem_; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MainCardStoredData); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MainCardStoredData other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (MainCardSN != other.MainCardSN) return false; - if(!storedItem_.Equals(other.storedItem_)) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (MainCardSN.Length != 0) hash ^= MainCardSN.GetHashCode(); - hash ^= storedItem_.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 (MainCardSN.Length != 0) { - output.WriteRawTag(10); - output.WriteString(MainCardSN); - } - storedItem_.WriteTo(output, _repeated_storedItem_codec); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (MainCardSN.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(MainCardSN); - } - size += storedItem_.CalculateSize(_repeated_storedItem_codec); - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MainCardStoredData other) { - if (other == null) { - return; - } - if (other.MainCardSN.Length != 0) { - MainCardSN = other.MainCardSN; - } - storedItem_.Add(other.storedItem_); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - MainCardSN = input.ReadString(); - break; - } - case 18: { - storedItem_.AddEntriesFrom(input, _repeated_storedItem_codec); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataRequest.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataRequest.cs deleted file mode 100644 index 6db8ab8f8..000000000 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataRequest.cs +++ /dev/null @@ -1,196 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MainCardStoredDataRequest.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.EmbeddedParameters { - - /// <summary>Holder for reflection information generated from MainCardStoredDataRequest.proto</summary> - public static partial class MainCardStoredDataRequestReflection { - - #region Descriptor - /// <summary>File descriptor for MainCardStoredDataRequest.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MainCardStoredDataRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "Ch9NYWluQ2FyZFN0b3JlZERhdGFSZXF1ZXN0LnByb3RvEhxUYW5nby5QTVIu", - "RW1iZWRkZWRQYXJhbWV0ZXJzGhhNYWluQ2FyZFN0b3JlZERhdGEucHJvdG8i", - "fgoZTWFpbkNhcmRTdG9yZWREYXRhUmVxdWVzdBITCgtCdXJuUmVxdWVzdBgB", - "IAEoCBJMChJNYWluQ2FyZFN0b3JlZERhdGEYAiABKAsyMC5UYW5nby5QTVIu", - "RW1iZWRkZWRQYXJhbWV0ZXJzLk1haW5DYXJkU3RvcmVkRGF0YUIoCiZjb20u", - "dHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.MainCardStoredDataReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MainCardStoredDataRequest), global::Tango.PMR.EmbeddedParameters.MainCardStoredDataRequest.Parser, new[]{ "BurnRequest", "MainCardStoredData" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MainCardStoredDataRequest : pb::IMessage<MainCardStoredDataRequest> { - private static readonly pb::MessageParser<MainCardStoredDataRequest> _parser = new pb::MessageParser<MainCardStoredDataRequest>(() => new MainCardStoredDataRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<MainCardStoredDataRequest> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.EmbeddedParameters.MainCardStoredDataRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataRequest(MainCardStoredDataRequest other) : this() { - burnRequest_ = other.burnRequest_; - MainCardStoredData = other.mainCardStoredData_ != null ? other.MainCardStoredData.Clone() : null; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataRequest Clone() { - return new MainCardStoredDataRequest(this); - } - - /// <summary>Field number for the "BurnRequest" field.</summary> - public const int BurnRequestFieldNumber = 1; - private bool burnRequest_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool BurnRequest { - get { return burnRequest_; } - set { - burnRequest_ = value; - } - } - - /// <summary>Field number for the "MainCardStoredData" field.</summary> - public const int MainCardStoredDataFieldNumber = 2; - private global::Tango.PMR.EmbeddedParameters.MainCardStoredData mainCardStoredData_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.EmbeddedParameters.MainCardStoredData MainCardStoredData { - get { return mainCardStoredData_; } - set { - mainCardStoredData_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MainCardStoredDataRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MainCardStoredDataRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (BurnRequest != other.BurnRequest) return false; - if (!object.Equals(MainCardStoredData, other.MainCardStoredData)) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (BurnRequest != false) hash ^= BurnRequest.GetHashCode(); - if (mainCardStoredData_ != null) hash ^= MainCardStoredData.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 (BurnRequest != false) { - output.WriteRawTag(8); - output.WriteBool(BurnRequest); - } - if (mainCardStoredData_ != null) { - output.WriteRawTag(18); - output.WriteMessage(MainCardStoredData); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (BurnRequest != false) { - size += 1 + 1; - } - if (mainCardStoredData_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(MainCardStoredData); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MainCardStoredDataRequest other) { - if (other == null) { - return; - } - if (other.BurnRequest != false) { - BurnRequest = other.BurnRequest; - } - if (other.mainCardStoredData_ != null) { - if (mainCardStoredData_ == null) { - mainCardStoredData_ = new global::Tango.PMR.EmbeddedParameters.MainCardStoredData(); - } - MainCardStoredData.MergeFrom(other.MainCardStoredData); - } - } - - [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: { - BurnRequest = input.ReadBool(); - break; - } - case 18: { - if (mainCardStoredData_ == null) { - mainCardStoredData_ = new global::Tango.PMR.EmbeddedParameters.MainCardStoredData(); - } - input.ReadMessage(mainCardStoredData_); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataResponse.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataResponse.cs deleted file mode 100644 index b2e40a5bb..000000000 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredDataResponse.cs +++ /dev/null @@ -1,168 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MainCardStoredDataResponse.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.EmbeddedParameters { - - /// <summary>Holder for reflection information generated from MainCardStoredDataResponse.proto</summary> - public static partial class MainCardStoredDataResponseReflection { - - #region Descriptor - /// <summary>File descriptor for MainCardStoredDataResponse.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MainCardStoredDataResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CiBNYWluQ2FyZFN0b3JlZERhdGFSZXNwb25zZS5wcm90bxIcVGFuZ28uUE1S", - "LkVtYmVkZGVkUGFyYW1ldGVycxoYTWFpbkNhcmRTdG9yZWREYXRhLnByb3Rv", - "ImoKGk1haW5DYXJkU3RvcmVkRGF0YVJlc3BvbnNlEkwKEk1haW5DYXJkU3Rv", - "cmVkRGF0YRgBIAEoCzIwLlRhbmdvLlBNUi5FbWJlZGRlZFBhcmFtZXRlcnMu", - "TWFpbkNhcmRTdG9yZWREYXRhQigKJmNvbS50d2luZS50YW5nby5wbXIuZW1i", - "ZWRkZWRwYXJhbWV0ZXJzYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.MainCardStoredDataReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MainCardStoredDataResponse), global::Tango.PMR.EmbeddedParameters.MainCardStoredDataResponse.Parser, new[]{ "MainCardStoredData" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MainCardStoredDataResponse : pb::IMessage<MainCardStoredDataResponse> { - private static readonly pb::MessageParser<MainCardStoredDataResponse> _parser = new pb::MessageParser<MainCardStoredDataResponse>(() => new MainCardStoredDataResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<MainCardStoredDataResponse> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.EmbeddedParameters.MainCardStoredDataResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataResponse(MainCardStoredDataResponse other) : this() { - MainCardStoredData = other.mainCardStoredData_ != null ? other.MainCardStoredData.Clone() : null; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredDataResponse Clone() { - return new MainCardStoredDataResponse(this); - } - - /// <summary>Field number for the "MainCardStoredData" field.</summary> - public const int MainCardStoredDataFieldNumber = 1; - private global::Tango.PMR.EmbeddedParameters.MainCardStoredData mainCardStoredData_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.EmbeddedParameters.MainCardStoredData MainCardStoredData { - get { return mainCardStoredData_; } - set { - mainCardStoredData_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MainCardStoredDataResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MainCardStoredDataResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (!object.Equals(MainCardStoredData, other.MainCardStoredData)) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (mainCardStoredData_ != null) hash ^= MainCardStoredData.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 (mainCardStoredData_ != null) { - output.WriteRawTag(10); - output.WriteMessage(MainCardStoredData); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (mainCardStoredData_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(MainCardStoredData); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MainCardStoredDataResponse other) { - if (other == null) { - return; - } - if (other.mainCardStoredData_ != null) { - if (mainCardStoredData_ == null) { - mainCardStoredData_ = new global::Tango.PMR.EmbeddedParameters.MainCardStoredData(); - } - MainCardStoredData.MergeFrom(other.MainCardStoredData); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - if (mainCardStoredData_ == null) { - mainCardStoredData_ = new global::Tango.PMR.EmbeddedParameters.MainCardStoredData(); - } - input.ReadMessage(mainCardStoredData_); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredItem.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredItem.cs deleted file mode 100644 index 3cc7457ab..000000000 --- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MainCardStoredItem.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MainCardStoredItem.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.EmbeddedParameters { - - /// <summary>Holder for reflection information generated from MainCardStoredItem.proto</summary> - public static partial class MainCardStoredItemReflection { - - #region Descriptor - /// <summary>File descriptor for MainCardStoredItem.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MainCardStoredItemReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChhNYWluQ2FyZFN0b3JlZEl0ZW0ucHJvdG8SHFRhbmdvLlBNUi5FbWJlZGRl", - "ZFBhcmFtZXRlcnMiMwoSTWFpbkNhcmRTdG9yZWRJdGVtEg8KB0FkZHJlc3MY", - "ASABKA0SDAoERGF0YRgCIAEoDUIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVt", - "YmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MainCardStoredItem), global::Tango.PMR.EmbeddedParameters.MainCardStoredItem.Parser, new[]{ "Address", "Data" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MainCardStoredItem : pb::IMessage<MainCardStoredItem> { - private static readonly pb::MessageParser<MainCardStoredItem> _parser = new pb::MessageParser<MainCardStoredItem>(() => new MainCardStoredItem()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<MainCardStoredItem> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.EmbeddedParameters.MainCardStoredItemReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredItem() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredItem(MainCardStoredItem other) : this() { - address_ = other.address_; - data_ = other.data_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MainCardStoredItem Clone() { - return new MainCardStoredItem(this); - } - - /// <summary>Field number for the "Address" field.</summary> - public const int AddressFieldNumber = 1; - private uint address_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint Address { - get { return address_; } - set { - address_ = value; - } - } - - /// <summary>Field number for the "Data" field.</summary> - public const int DataFieldNumber = 2; - private uint data_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint Data { - get { return data_; } - set { - data_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MainCardStoredItem); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MainCardStoredItem other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Address != other.Address) return false; - if (Data != other.Data) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Address != 0) hash ^= Address.GetHashCode(); - if (Data != 0) hash ^= Data.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 (Address != 0) { - output.WriteRawTag(8); - output.WriteUInt32(Address); - } - if (Data != 0) { - output.WriteRawTag(16); - output.WriteUInt32(Data); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Address != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Address); - } - if (Data != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Data); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MainCardStoredItem other) { - if (other == null) { - return; - } - if (other.Address != 0) { - Address = other.Address; - } - if (other.Data != 0) { - Data = other.Data; - } - } - - [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: { - Address = input.ReadUInt32(); - break; - } - case 16: { - Data = input.ReadUInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code |