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:19:47 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-03-06 15:19:47 +0200
commit7a8c464989eef021df8b7c0a7179094cb22cf83f (patch)
treeb4e9887cc62ca1a475116b9177c5b0f7f0d1033c /Software/Visual_Studio/Tango.PMR/EmbeddedParameters
parentd2731722bf9964577987ede7816e1fed7502421d (diff)
downloadTango-7a8c464989eef021df8b7c0a7179094cb22cf83f.tar.gz
Tango-7a8c464989eef021df8b7c0a7179094cb22cf83f.zip
Compiled latest shlomo PMR configuration parameters.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/EmbeddedParameters')
-rw-r--r--Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs85
1 files changed, 77 insertions, 8 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
index 7fc12910c..83861aef0 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",
- "YmVkZGVkUGFyYW1ldGVycyKSBQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
+ "YmVkZGVkUGFyYW1ldGVycyLXBQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
"GAoQQnJlYWtTZW5zb3JMaW1pdBgBIAEoDRIhChlEaWFnbm9zdGljQ29sbGVj",
"dGlvbkxpbWl0GAIgASgNEhoKEk92ZXJIZWF0Q291bnRMaW1pdBgDIAEoDRIb",
"ChNVbmRlckhlYXRDb3VudExpbWl0GAQgASgNEhkKEUNsb3NlVmFsdmVUaW1l",
@@ -37,13 +37,14 @@ namespace Tango.PMR.EmbeddedParameters {
"GA4gASgNEiQKHEFDSGVhdGVyc1VwcGVyT3BlcmF0aW9uTGltaXQYDyABKA0S",
"JAocRENIZWF0ZXJzTG93ZXJPcGVyYXRpb25MaW1pdBgQIAEoDRIkChxEQ0hl",
"YXRlcnNVcHBlck9wZXJhdGlvbkxpbWl0GBEgASgNEiEKGU1pZFRhbmtQcmVz",
- "c3VyZUNvcnJlY3Rpb24YEiABKAESGQoRR2VuZXJhbFBhcmFtZXRlcnMYEyAD",
- "KAFCKAomY29tLnR3aW5lLnRhbmdvLnBtci5lbWJlZGRlZHBhcmFtZXRlcnNi",
- "BnByb3RvMw=="));
+ "c3VyZUNvcnJlY3Rpb24YEiABKAESHwoXRGlzcGVuc2VyUHJlc2VnbWVudFdG",
+ "Q0YYEyABKAESIgoaU3RhcnRIZWF0aW5nT25Jbml0U2VxdWVuY2UYFCABKAgS",
+ "GQoRR2VuZXJhbFBhcmFtZXRlcnMYFSADKAFCKAomY29tLnR3aW5lLnRhbmdv",
+ "LnBtci5lbWJlZGRlZHBhcmFtZXRlcnNiBnByb3RvMw=="));
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", "GeneralParameters" }, 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" }, null, null, null)
}));
}
#endregion
@@ -92,6 +93,8 @@ namespace Tango.PMR.EmbeddedParameters {
dCHeatersLowerOperationLimit_ = other.dCHeatersLowerOperationLimit_;
dCHeatersUpperOperationLimit_ = other.dCHeatersUpperOperationLimit_;
midTankPressureCorrection_ = other.midTankPressureCorrection_;
+ dispenserPresegmentWFCF_ = other.dispenserPresegmentWFCF_;
+ startHeatingOnInitSequence_ = other.startHeatingOnInitSequence_;
generalParameters_ = other.generalParameters_.Clone();
}
@@ -285,6 +288,9 @@ namespace Tango.PMR.EmbeddedParameters {
/// <summary>Field number for the "ACHeatersLowerOperationLimit" field.</summary>
public const int ACHeatersLowerOperationLimitFieldNumber = 14;
private uint aCHeatersLowerOperationLimit_;
+ /// <summary>
+ ///sets the temperature frame for approving job start - in promil above and beyond target temperatures
+ /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public uint ACHeatersLowerOperationLimit {
get { return aCHeatersLowerOperationLimit_; }
@@ -337,11 +343,42 @@ namespace Tango.PMR.EmbeddedParameters {
}
}
+ /// <summary>Field number for the "DispenserPresegmentWFCF" field.</summary>
+ public const int DispenserPresegmentWFCFFieldNumber = 19;
+ private double dispenserPresegmentWFCF_;
+ /// <summary>
+ ///Waste Flow Correction Factor
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public double DispenserPresegmentWFCF {
+ get { return dispenserPresegmentWFCF_; }
+ set {
+ dispenserPresegmentWFCF_ = value;
+ }
+ }
+
+ /// <summary>Field number for the "StartHeatingOnInitSequence" field.</summary>
+ public const int StartHeatingOnInitSequenceFieldNumber = 20;
+ private bool startHeatingOnInitSequence_;
+ /// <summary>
+ ///disable heating start on init
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool StartHeatingOnInitSequence {
+ get { return startHeatingOnInitSequence_; }
+ set {
+ startHeatingOnInitSequence_ = value;
+ }
+ }
+
/// <summary>Field number for the "GeneralParameters" field.</summary>
- public const int GeneralParametersFieldNumber = 19;
+ public const int GeneralParametersFieldNumber = 21;
private static readonly pb::FieldCodec<double> _repeated_generalParameters_codec
- = pb::FieldCodec.ForDouble(154);
+ = pb::FieldCodec.ForDouble(170);
private readonly pbc::RepeatedField<double> generalParameters_ = new pbc::RepeatedField<double>();
+ /// <summary>
+ /// general storage for parameters that do not have a specific name updated
+ /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public pbc::RepeatedField<double> GeneralParameters {
get { return generalParameters_; }
@@ -378,6 +415,8 @@ namespace Tango.PMR.EmbeddedParameters {
if (DCHeatersLowerOperationLimit != other.DCHeatersLowerOperationLimit) return false;
if (DCHeatersUpperOperationLimit != other.DCHeatersUpperOperationLimit) return false;
if (MidTankPressureCorrection != other.MidTankPressureCorrection) return false;
+ if (DispenserPresegmentWFCF != other.DispenserPresegmentWFCF) return false;
+ if (StartHeatingOnInitSequence != other.StartHeatingOnInitSequence) return false;
if(!generalParameters_.Equals(other.generalParameters_)) return false;
return true;
}
@@ -403,6 +442,8 @@ namespace Tango.PMR.EmbeddedParameters {
if (DCHeatersLowerOperationLimit != 0) hash ^= DCHeatersLowerOperationLimit.GetHashCode();
if (DCHeatersUpperOperationLimit != 0) hash ^= DCHeatersUpperOperationLimit.GetHashCode();
if (MidTankPressureCorrection != 0D) hash ^= MidTankPressureCorrection.GetHashCode();
+ if (DispenserPresegmentWFCF != 0D) hash ^= DispenserPresegmentWFCF.GetHashCode();
+ if (StartHeatingOnInitSequence != false) hash ^= StartHeatingOnInitSequence.GetHashCode();
hash ^= generalParameters_.GetHashCode();
return hash;
}
@@ -486,6 +527,14 @@ namespace Tango.PMR.EmbeddedParameters {
output.WriteRawTag(145, 1);
output.WriteDouble(MidTankPressureCorrection);
}
+ if (DispenserPresegmentWFCF != 0D) {
+ output.WriteRawTag(153, 1);
+ output.WriteDouble(DispenserPresegmentWFCF);
+ }
+ if (StartHeatingOnInitSequence != false) {
+ output.WriteRawTag(160, 1);
+ output.WriteBool(StartHeatingOnInitSequence);
+ }
generalParameters_.WriteTo(output, _repeated_generalParameters_codec);
}
@@ -546,6 +595,12 @@ namespace Tango.PMR.EmbeddedParameters {
if (MidTankPressureCorrection != 0D) {
size += 2 + 8;
}
+ if (DispenserPresegmentWFCF != 0D) {
+ size += 2 + 8;
+ }
+ if (StartHeatingOnInitSequence != false) {
+ size += 2 + 1;
+ }
size += generalParameters_.CalculateSize(_repeated_generalParameters_codec);
return size;
}
@@ -609,6 +664,12 @@ namespace Tango.PMR.EmbeddedParameters {
if (other.MidTankPressureCorrection != 0D) {
MidTankPressureCorrection = other.MidTankPressureCorrection;
}
+ if (other.DispenserPresegmentWFCF != 0D) {
+ DispenserPresegmentWFCF = other.DispenserPresegmentWFCF;
+ }
+ if (other.StartHeatingOnInitSequence != false) {
+ StartHeatingOnInitSequence = other.StartHeatingOnInitSequence;
+ }
generalParameters_.Add(other.generalParameters_);
}
@@ -692,8 +753,16 @@ namespace Tango.PMR.EmbeddedParameters {
MidTankPressureCorrection = input.ReadDouble();
break;
}
- case 154:
case 153: {
+ DispenserPresegmentWFCF = input.ReadDouble();
+ break;
+ }
+ case 160: {
+ StartHeatingOnInitSequence = input.ReadBool();
+ break;
+ }
+ case 170:
+ case 169: {
generalParameters_.AddEntriesFrom(input, _repeated_generalParameters_codec);
break;
}