aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.PMR/EmbeddedParameters
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-03-06 15:17:41 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-03-06 15:17:41 +0200
commitb1a34b1a9a6e685516476a9cf5610ea177a7be94 (patch)
tree993835b7c9bd17ace0dca8b289204592c1a077fd /Software/Visual_Studio/Tango.PMR/EmbeddedParameters
parent1d0a3a5c47a2ba4cdabb9f8a4fab694d4987083f (diff)
downloadTango-b1a34b1a9a6e685516476a9cf5610ea177a7be94.tar.gz
Tango-b1a34b1a9a6e685516476a9cf5610ea177a7be94.zip
Added
repeated double DrierZone1HeaterCurrent; repeated double DrierZone2HeaterCurrent; repeated double HeadZone1HeaterCurrent; repeated double HeadZone2HeaterCurrent; repeated double HeadZone3HeaterCurrent; repeated double HeadZone4HeaterCurrent; repeated double HeadZone5_6HeaterCurrent; repeated double Mixer1HeaterCurrent; to database and PMR. Compiled latest PMR.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/EmbeddedParameters')
-rw-r--r--Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs30
1 files changed, 26 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
index 7f6f2d2c0..7fc12910c 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",
- "YmVkZGVkUGFyYW1ldGVycyL3BAoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
+ "YmVkZGVkUGFyYW1ldGVycyKSBQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
"GAoQQnJlYWtTZW5zb3JMaW1pdBgBIAEoDRIhChlEaWFnbm9zdGljQ29sbGVj",
"dGlvbkxpbWl0GAIgASgNEhoKEk92ZXJIZWF0Q291bnRMaW1pdBgDIAEoDRIb",
"ChNVbmRlckhlYXRDb3VudExpbWl0GAQgASgNEhkKEUNsb3NlVmFsdmVUaW1l",
@@ -37,12 +37,13 @@ namespace Tango.PMR.EmbeddedParameters {
"GA4gASgNEiQKHEFDSGVhdGVyc1VwcGVyT3BlcmF0aW9uTGltaXQYDyABKA0S",
"JAocRENIZWF0ZXJzTG93ZXJPcGVyYXRpb25MaW1pdBgQIAEoDRIkChxEQ0hl",
"YXRlcnNVcHBlck9wZXJhdGlvbkxpbWl0GBEgASgNEiEKGU1pZFRhbmtQcmVz",
- "c3VyZUNvcnJlY3Rpb24YEiABKAFCKAomY29tLnR3aW5lLnRhbmdvLnBtci5l",
- "bWJlZGRlZHBhcmFtZXRlcnNiBnByb3RvMw=="));
+ "c3VyZUNvcnJlY3Rpb24YEiABKAESGQoRR2VuZXJhbFBhcmFtZXRlcnMYEyAD",
+ "KAFCKAomY29tLnR3aW5lLnRhbmdvLnBtci5lbWJlZGRlZHBhcmFtZXRlcnNi",
+ "BnByb3RvMw=="));
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" }, 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", "GeneralParameters" }, null, null, null)
}));
}
#endregion
@@ -91,6 +92,7 @@ namespace Tango.PMR.EmbeddedParameters {
dCHeatersLowerOperationLimit_ = other.dCHeatersLowerOperationLimit_;
dCHeatersUpperOperationLimit_ = other.dCHeatersUpperOperationLimit_;
midTankPressureCorrection_ = other.midTankPressureCorrection_;
+ generalParameters_ = other.generalParameters_.Clone();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -335,6 +337,16 @@ namespace Tango.PMR.EmbeddedParameters {
}
}
+ /// <summary>Field number for the "GeneralParameters" field.</summary>
+ public const int GeneralParametersFieldNumber = 19;
+ private static readonly pb::FieldCodec<double> _repeated_generalParameters_codec
+ = pb::FieldCodec.ForDouble(154);
+ private readonly pbc::RepeatedField<double> generalParameters_ = new pbc::RepeatedField<double>();
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pbc::RepeatedField<double> GeneralParameters {
+ get { return generalParameters_; }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as ConfigurationParameters);
@@ -366,6 +378,7 @@ namespace Tango.PMR.EmbeddedParameters {
if (DCHeatersLowerOperationLimit != other.DCHeatersLowerOperationLimit) return false;
if (DCHeatersUpperOperationLimit != other.DCHeatersUpperOperationLimit) return false;
if (MidTankPressureCorrection != other.MidTankPressureCorrection) return false;
+ if(!generalParameters_.Equals(other.generalParameters_)) return false;
return true;
}
@@ -390,6 +403,7 @@ namespace Tango.PMR.EmbeddedParameters {
if (DCHeatersLowerOperationLimit != 0) hash ^= DCHeatersLowerOperationLimit.GetHashCode();
if (DCHeatersUpperOperationLimit != 0) hash ^= DCHeatersUpperOperationLimit.GetHashCode();
if (MidTankPressureCorrection != 0D) hash ^= MidTankPressureCorrection.GetHashCode();
+ hash ^= generalParameters_.GetHashCode();
return hash;
}
@@ -472,6 +486,7 @@ namespace Tango.PMR.EmbeddedParameters {
output.WriteRawTag(145, 1);
output.WriteDouble(MidTankPressureCorrection);
}
+ generalParameters_.WriteTo(output, _repeated_generalParameters_codec);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -531,6 +546,7 @@ namespace Tango.PMR.EmbeddedParameters {
if (MidTankPressureCorrection != 0D) {
size += 2 + 8;
}
+ size += generalParameters_.CalculateSize(_repeated_generalParameters_codec);
return size;
}
@@ -593,6 +609,7 @@ namespace Tango.PMR.EmbeddedParameters {
if (other.MidTankPressureCorrection != 0D) {
MidTankPressureCorrection = other.MidTankPressureCorrection;
}
+ generalParameters_.Add(other.generalParameters_);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -675,6 +692,11 @@ namespace Tango.PMR.EmbeddedParameters {
MidTankPressureCorrection = input.ReadDouble();
break;
}
+ case 154:
+ case 153: {
+ generalParameters_.AddEntriesFrom(input, _repeated_generalParameters_codec);
+ break;
+ }
}
}
}