Fixed issue with gradient generation.

Added SingleMode to conversion Input.
Changed default gradient resolution to 50 cm.
Updated latest PMR.

1 files changed, 252 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
index 83861aef0..1177681a6 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",
-            "YmVkZGVkUGFyYW1ldGVycyLXBQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
+            "YmVkZGVkUGFyYW1ldGVycyLoBwoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
             "GAoQQnJlYWtTZW5zb3JMaW1pdBgBIAEoDRIhChlEaWFnbm9zdGljQ29sbGVj",
             "dGlvbkxpbWl0GAIgASgNEhoKEk92ZXJIZWF0Q291bnRMaW1pdBgDIAEoDRIb",
             "ChNVbmRlckhlYXRDb3VudExpbWl0GAQgASgNEhkKEUNsb3NlVmFsdmVUaW1l",
@@ -39,12 +39,18 @@ namespace Tango.PMR.EmbeddedParameters {
             "YXRlcnNVcHBlck9wZXJhdGlvbkxpbWl0GBEgASgNEiEKGU1pZFRhbmtQcmVz",
             "c3VyZUNvcnJlY3Rpb24YEiABKAESHwoXRGlzcGVuc2VyUHJlc2VnbWVudFdG",
             "Q0YYEyABKAESIgoaU3RhcnRIZWF0aW5nT25Jbml0U2VxdWVuY2UYFCABKAgS",
-            "GQoRR2VuZXJhbFBhcmFtZXRlcnMYFSADKAFCKAomY29tLnR3aW5lLnRhbmdv",
-            "LnBtci5lbWJlZGRlZHBhcmFtZXRlcnNiBnByb3RvMw=="));
+            "GQoRR2VuZXJhbFBhcmFtZXRlcnMYFSADKAESHAoUQ3VycmVudEFsYXJtTG93",
+            "TGltaXQYFiABKAESHQoVQ3VycmVudEFsYXJtSGlnaExpbWl0GBcgASgBEiAK",
+            "GElEU19TZWdtZW50UmVmaWxsVGltZW91dBgYIAEoARIhChlJRFNfUHJlU2Vn",
+            "bWVudEJ1aWxkdXBUaW1lGBkgASgBEhkKEUlEU19DbGVhbmluZ1NwZWVkGBog",
+            "ASgBEikKIUlEU19DbGVhbmluZ1N0b3BCZWZvcmVTZWdtZW50VGltZRgbIAEo",
+            "ARIiChpJRFNfTGVmdENsZWFuaW5nTW90b3JTcGVlZBgcIAEoARIjChtJRFNf",
+            "UmlnaHRDbGVhbmluZ01vdG9yU3BlZWQYHSABKAFCKAomY29tLnR3aW5lLnRh",
+            "bmdvLnBtci5lbWJlZGRlZHBhcmFtZXRlcnNiBnByb3RvMw=="));
       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" }, 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", "IDSLeftCleaningMotorSpeed", "IDSRightCleaningMotorSpeed" }, null, null, null)
           }));
     }
     #endregion
@@ -96,6 +102,14 @@ namespace Tango.PMR.EmbeddedParameters {
       dispenserPresegmentWFCF_ = other.dispenserPresegmentWFCF_;
       startHeatingOnInitSequence_ = other.startHeatingOnInitSequence_;
       generalParameters_ = other.generalParameters_.Clone();
+      currentAlarmLowLimit_ = other.currentAlarmLowLimit_;
+      currentAlarmHighLimit_ = other.currentAlarmHighLimit_;
+      iDSSegmentRefillTimeout_ = other.iDSSegmentRefillTimeout_;
+      iDSPreSegmentBuildupTime_ = other.iDSPreSegmentBuildupTime_;
+      iDSCleaningSpeed_ = other.iDSCleaningSpeed_;
+      iDSCleaningStopBeforeSegmentTime_ = other.iDSCleaningStopBeforeSegmentTime_;
+      iDSLeftCleaningMotorSpeed_ = other.iDSLeftCleaningMotorSpeed_;
+      iDSRightCleaningMotorSpeed_ = other.iDSRightCleaningMotorSpeed_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -384,6 +398,112 @@ namespace Tango.PMR.EmbeddedParameters {
       get { return generalParameters_; }
     }
 
+    /// <summary>Field number for the "CurrentAlarmLowLimit" field.</summary>
+    public const int CurrentAlarmLowLimitFieldNumber = 22;
+    private double currentAlarmLowLimit_;
+    /// <summary>
+    /// a limit percentage for current deviation below predefined level
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double CurrentAlarmLowLimit {
+      get { return currentAlarmLowLimit_; }
+      set {
+        currentAlarmLowLimit_ = value;
+      }
+    }
+
+    /// <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_; }
+      set {
+        currentAlarmHighLimit_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "IDS_SegmentRefillTimeout" field.</summary>
+    public const int IDSSegmentRefillTimeoutFieldNumber = 24;
+    private double iDSSegmentRefillTimeout_;
+    /// <summary>
+    ///how much time before next segment the automatic refill should stop
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double IDSSegmentRefillTimeout {
+      get { return iDSSegmentRefillTimeout_; }
+      set {
+        iDSSegmentRefillTimeout_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "IDS_PreSegmentBuildupTime" field.</summary>
+    public const int IDSPreSegmentBuildupTimeFieldNumber = 25;
+    private double iDSPreSegmentBuildupTime_;
+    /// <summary>
+    /// how much running to waste time during presegment
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double IDSPreSegmentBuildupTime {
+      get { return iDSPreSegmentBuildupTime_; }
+      set {
+        iDSPreSegmentBuildupTime_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "IDS_CleaningSpeed" field.</summary>
+    public const int IDSCleaningSpeedFieldNumber = 26;
+    private double iDSCleaningSpeed_;
+    /// <summary>
+    ///cleaning dispenser motorspeed
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double IDSCleaningSpeed {
+      get { return iDSCleaningSpeed_; }
+      set {
+        iDSCleaningSpeed_ = value;
+      }
+    }
+
+    /// <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_; }
+      set {
+        iDSCleaningStopBeforeSegmentTime_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "IDS_LeftCleaningMotorSpeed" field.</summary>
+    public const int IDSLeftCleaningMotorSpeedFieldNumber = 28;
+    private double iDSLeftCleaningMotorSpeed_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double IDSLeftCleaningMotorSpeed {
+      get { return iDSLeftCleaningMotorSpeed_; }
+      set {
+        iDSLeftCleaningMotorSpeed_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "IDS_RightCleaningMotorSpeed" field.</summary>
+    public const int IDSRightCleaningMotorSpeedFieldNumber = 29;
+    private double iDSRightCleaningMotorSpeed_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double IDSRightCleaningMotorSpeed {
+      get { return iDSRightCleaningMotorSpeed_; }
+      set {
+        iDSRightCleaningMotorSpeed_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConfigurationParameters);
@@ -418,6 +538,14 @@ namespace Tango.PMR.EmbeddedParameters {
       if (DispenserPresegmentWFCF != other.DispenserPresegmentWFCF) return false;
       if (StartHeatingOnInitSequence != other.StartHeatingOnInitSequence) return false;
       if(!generalParameters_.Equals(other.generalParameters_)) return false;
+      if (CurrentAlarmLowLimit != other.CurrentAlarmLowLimit) return false;
+      if (CurrentAlarmHighLimit != other.CurrentAlarmHighLimit) return false;
+      if (IDSSegmentRefillTimeout != other.IDSSegmentRefillTimeout) return false;
+      if (IDSPreSegmentBuildupTime != other.IDSPreSegmentBuildupTime) return false;
+      if (IDSCleaningSpeed != other.IDSCleaningSpeed) return false;
+      if (IDSCleaningStopBeforeSegmentTime != other.IDSCleaningStopBeforeSegmentTime) return false;
+      if (IDSLeftCleaningMotorSpeed != other.IDSLeftCleaningMotorSpeed) return false;
+      if (IDSRightCleaningMotorSpeed != other.IDSRightCleaningMotorSpeed) return false;
       return true;
     }
 
@@ -445,6 +573,14 @@ namespace Tango.PMR.EmbeddedParameters {
       if (DispenserPresegmentWFCF != 0D) hash ^= DispenserPresegmentWFCF.GetHashCode();
       if (StartHeatingOnInitSequence != false) hash ^= StartHeatingOnInitSequence.GetHashCode();
       hash ^= generalParameters_.GetHashCode();
+      if (CurrentAlarmLowLimit != 0D) hash ^= CurrentAlarmLowLimit.GetHashCode();
+      if (CurrentAlarmHighLimit != 0D) hash ^= CurrentAlarmHighLimit.GetHashCode();
+      if (IDSSegmentRefillTimeout != 0D) hash ^= IDSSegmentRefillTimeout.GetHashCode();
+      if (IDSPreSegmentBuildupTime != 0D) hash ^= IDSPreSegmentBuildupTime.GetHashCode();
+      if (IDSCleaningSpeed != 0D) hash ^= IDSCleaningSpeed.GetHashCode();
+      if (IDSCleaningStopBeforeSegmentTime != 0D) hash ^= IDSCleaningStopBeforeSegmentTime.GetHashCode();
+      if (IDSLeftCleaningMotorSpeed != 0D) hash ^= IDSLeftCleaningMotorSpeed.GetHashCode();
+      if (IDSRightCleaningMotorSpeed != 0D) hash ^= IDSRightCleaningMotorSpeed.GetHashCode();
       return hash;
     }
 
@@ -536,6 +672,38 @@ namespace Tango.PMR.EmbeddedParameters {
         output.WriteBool(StartHeatingOnInitSequence);
       }
       generalParameters_.WriteTo(output, _repeated_generalParameters_codec);
+      if (CurrentAlarmLowLimit != 0D) {
+        output.WriteRawTag(177, 1);
+        output.WriteDouble(CurrentAlarmLowLimit);
+      }
+      if (CurrentAlarmHighLimit != 0D) {
+        output.WriteRawTag(185, 1);
+        output.WriteDouble(CurrentAlarmHighLimit);
+      }
+      if (IDSSegmentRefillTimeout != 0D) {
+        output.WriteRawTag(193, 1);
+        output.WriteDouble(IDSSegmentRefillTimeout);
+      }
+      if (IDSPreSegmentBuildupTime != 0D) {
+        output.WriteRawTag(201, 1);
+        output.WriteDouble(IDSPreSegmentBuildupTime);
+      }
+      if (IDSCleaningSpeed != 0D) {
+        output.WriteRawTag(209, 1);
+        output.WriteDouble(IDSCleaningSpeed);
+      }
+      if (IDSCleaningStopBeforeSegmentTime != 0D) {
+        output.WriteRawTag(217, 1);
+        output.WriteDouble(IDSCleaningStopBeforeSegmentTime);
+      }
+      if (IDSLeftCleaningMotorSpeed != 0D) {
+        output.WriteRawTag(225, 1);
+        output.WriteDouble(IDSLeftCleaningMotorSpeed);
+      }
+      if (IDSRightCleaningMotorSpeed != 0D) {
+        output.WriteRawTag(233, 1);
+        output.WriteDouble(IDSRightCleaningMotorSpeed);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -602,6 +770,30 @@ namespace Tango.PMR.EmbeddedParameters {
         size += 2 + 1;
       }
       size += generalParameters_.CalculateSize(_repeated_generalParameters_codec);
+      if (CurrentAlarmLowLimit != 0D) {
+        size += 2 + 8;
+      }
+      if (CurrentAlarmHighLimit != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSSegmentRefillTimeout != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSPreSegmentBuildupTime != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSCleaningSpeed != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSCleaningStopBeforeSegmentTime != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSLeftCleaningMotorSpeed != 0D) {
+        size += 2 + 8;
+      }
+      if (IDSRightCleaningMotorSpeed != 0D) {
+        size += 2 + 8;
+      }
       return size;
     }
 
@@ -671,6 +863,30 @@ namespace Tango.PMR.EmbeddedParameters {
         StartHeatingOnInitSequence = other.StartHeatingOnInitSequence;
       }
       generalParameters_.Add(other.generalParameters_);
+      if (other.CurrentAlarmLowLimit != 0D) {
+        CurrentAlarmLowLimit = other.CurrentAlarmLowLimit;
+      }
+      if (other.CurrentAlarmHighLimit != 0D) {
+        CurrentAlarmHighLimit = other.CurrentAlarmHighLimit;
+      }
+      if (other.IDSSegmentRefillTimeout != 0D) {
+        IDSSegmentRefillTimeout = other.IDSSegmentRefillTimeout;
+      }
+      if (other.IDSPreSegmentBuildupTime != 0D) {
+        IDSPreSegmentBuildupTime = other.IDSPreSegmentBuildupTime;
+      }
+      if (other.IDSCleaningSpeed != 0D) {
+        IDSCleaningSpeed = other.IDSCleaningSpeed;
+      }
+      if (other.IDSCleaningStopBeforeSegmentTime != 0D) {
+        IDSCleaningStopBeforeSegmentTime = other.IDSCleaningStopBeforeSegmentTime;
+      }
+      if (other.IDSLeftCleaningMotorSpeed != 0D) {
+        IDSLeftCleaningMotorSpeed = other.IDSLeftCleaningMotorSpeed;
+      }
+      if (other.IDSRightCleaningMotorSpeed != 0D) {
+        IDSRightCleaningMotorSpeed = other.IDSRightCleaningMotorSpeed;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -766,6 +982,38 @@ namespace Tango.PMR.EmbeddedParameters {
             generalParameters_.AddEntriesFrom(input, _repeated_generalParameters_codec);
             break;
           }
+          case 177: {
+            CurrentAlarmLowLimit = input.ReadDouble();
+            break;
+          }
+          case 185: {
+            CurrentAlarmHighLimit = input.ReadDouble();
+            break;
+          }
+          case 193: {
+            IDSSegmentRefillTimeout = input.ReadDouble();
+            break;
+          }
+          case 201: {
+            IDSPreSegmentBuildupTime = input.ReadDouble();
+            break;
+          }
+          case 209: {
+            IDSCleaningSpeed = input.ReadDouble();
+            break;
+          }
+          case 217: {
+            IDSCleaningStopBeforeSegmentTime = input.ReadDouble();
+            break;
+          }
+          case 225: {
+            IDSLeftCleaningMotorSpeed = input.ReadDouble();
+            break;
+          }
+          case 233: {
+            IDSRightCleaningMotorSpeed = input.ReadDouble();
+            break;
+          }
         }
       }
     }