aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-01 15:22:57 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-01 15:22:57 +0300
commit72819bfd9ce2c0573045f25435035fc0288f87bb (patch)
tree122530d6e090fc4cca7b02063b1f4ba021be8088 /Software
parent15c60b68b62b6ccaeba27a3f9df222cb24cfa779 (diff)
downloadTango-72819bfd9ce2c0573045f25435035fc0288f87bb.tar.gz
Tango-72819bfd9ce2c0573045f25435035fc0288f87bb.zip
Added Heater 4,5,6 to TECH_MONITORS.
Diffstat (limited to 'Software')
-rw-r--r--Software/DB/Tango.mdfbin75497472 -> 75497472 bytes
-rw-r--r--Software/DB/Tango_log.ldfbin1572864 -> 1572864 bytes
-rw-r--r--Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto9
-rw-r--r--Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs198
-rw-r--r--Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs80
-rw-r--r--Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj10
-rw-r--r--Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs4
-rw-r--r--Software/Visual_Studio/Versioning/Core.cs4
-rw-r--r--Software/Visual_Studio/Versioning/MachineStudio.cs4
9 files changed, 205 insertions, 104 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 05279bc82..995738447 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
Binary files differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index d6aeb2abb..0f05a572a 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
Binary files differ
diff --git a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
index 6bba594d5..893f28a27 100644
--- a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
+++ b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
@@ -126,4 +126,13 @@ message DiagnosticsMonitors
//Dispenser 8 Motor Frequency (Min = 0, Max = 1080, PPF = 10)
repeated double Dispenser8MotorFrequency = 36;
+ //Head Zone 4 (Min = 0, Max = 100, PPF = 1)
+ repeated double HeadZone4Temperature = 37;
+
+ //Head Zone 5 (Min = 0, Max = 100, PPF = 1)
+ repeated double HeadZone5Temperature = 38;
+
+ //Head Zone 6 (Min = 0, Max = 100, PPF = 1)
+ repeated double HeadZone6Temperature = 39;
+
}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
index c7874ec14..c73105b9f 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
@@ -26,16 +26,10 @@ namespace Tango.BL.Enumerations
ChillerTemperature = 27,
/// <summary>
- /// (Head Zone 3)
- /// </summary>
- [Description("Head Zone 3")]
- HeadZone3Temperature = 12,
-
- /// <summary>
- /// (Dispensers Motors)
+ /// (Dancer 1)
/// </summary>
- [Description("Dispensers Motors")]
- DispensersMotorsFrequency = 21,
+ [Description("Dancer 1")]
+ Dancer1Angle = 0,
/// <summary>
/// (Dancer 2)
@@ -44,28 +38,34 @@ namespace Tango.BL.Enumerations
Dancer2Angle = 1,
/// <summary>
- /// (Dispenser 2 Motor Frequency)
+ /// (Dancer 3)
/// </summary>
- [Description("Dispenser 2 Motor Frequency")]
- Dispenser2MotorFrequency = 29,
+ [Description("Dancer 3")]
+ Dancer3Angle = 2,
/// <summary>
- /// (Dispenser 7 Motor Frequency)
+ /// (Dispenser 1 Motor Frequency)
/// </summary>
- [Description("Dispenser 7 Motor Frequency")]
- Dispenser7MotorFrequency = 34,
+ [Description("Dispenser 1 Motor Frequency")]
+ Dispenser1MotorFrequency = 28,
/// <summary>
- /// (Dispenser 8 Motor Frequency)
+ /// (Dispenser 2 Motor Frequency)
/// </summary>
- [Description("Dispenser 8 Motor Frequency")]
- Dispenser8MotorFrequency = 35,
+ [Description("Dispenser 2 Motor Frequency")]
+ Dispenser2MotorFrequency = 29,
/// <summary>
- /// (Dispenser 6 Motor Frequency)
+ /// (Dispenser 3 Motor Frequency)
/// </summary>
- [Description("Dispenser 6 Motor Frequency")]
- Dispenser6MotorFrequency = 33,
+ [Description("Dispenser 3 Motor Frequency")]
+ Dispenser3MotorFrequency = 30,
+
+ /// <summary>
+ /// (Dispenser 4 Motor Frequency)
+ /// </summary>
+ [Description("Dispenser 4 Motor Frequency")]
+ Dispenser4MotorFrequency = 31,
/// <summary>
/// (Dispenser 5 Motor Frequency)
@@ -74,16 +74,22 @@ namespace Tango.BL.Enumerations
Dispenser5MotorFrequency = 32,
/// <summary>
- /// (Dryer Zone 3)
+ /// (Dispenser 6 Motor Frequency)
/// </summary>
- [Description("Dryer Zone 3")]
- DryerZone3Temperature = 18,
+ [Description("Dispenser 6 Motor Frequency")]
+ Dispenser6MotorFrequency = 33,
/// <summary>
- /// (Winder Motor)
+ /// (Dispenser 7 Motor Frequency)
/// </summary>
- [Description("Winder Motor")]
- WinderMotor = 6,
+ [Description("Dispenser 7 Motor Frequency")]
+ Dispenser7MotorFrequency = 34,
+
+ /// <summary>
+ /// (Dispenser 8 Motor Frequency)
+ /// </summary>
+ [Description("Dispenser 8 Motor Frequency")]
+ Dispenser8MotorFrequency = 35,
/// <summary>
/// (Dispensers Angular Encoders)
@@ -92,28 +98,28 @@ namespace Tango.BL.Enumerations
DispensersAngularEncoders = 22,
/// <summary>
- /// (Filter Delta Pressure)
+ /// (Dispensers Linear Positions)
/// </summary>
- [Description("Filter Delta Pressure")]
- FilterDeltaPressure = 26,
+ [Description("Dispensers Linear Positions")]
+ DispensersLinearPositions = 23,
/// <summary>
- /// (Puller Tension)
+ /// (Dispensers Motors)
/// </summary>
- [Description("Puller Tension")]
- PullerTension = 15,
+ [Description("Dispensers Motors")]
+ DispensersMotorsFrequency = 21,
/// <summary>
- /// (Dispenser 1 Motor Frequency)
+ /// (Dispensers Pressure)
/// </summary>
- [Description("Dispenser 1 Motor Frequency")]
- Dispenser1MotorFrequency = 28,
+ [Description("Dispensers Pressure")]
+ DispensersPressure = 24,
/// <summary>
- /// (Feeder Tension)
+ /// (Dryer Air Flow)
/// </summary>
- [Description("Feeder Tension")]
- FeederTension = 14,
+ [Description("Dryer Air Flow")]
+ DryerAirFlow = 19,
/// <summary>
/// (Dryer Motor)
@@ -122,10 +128,22 @@ namespace Tango.BL.Enumerations
DryerMotor = 4,
/// <summary>
- /// (Dryer Air Flow)
+ /// (Dryer Zone 1)
/// </summary>
- [Description("Dryer Air Flow")]
- DryerAirFlow = 19,
+ [Description("Dryer Zone 1")]
+ DryerZone1Temperature = 16,
+
+ /// <summary>
+ /// (Dryer Zone 2)
+ /// </summary>
+ [Description("Dryer Zone 2")]
+ DryerZone2Temperature = 17,
+
+ /// <summary>
+ /// (Dryer Zone 3)
+ /// </summary>
+ [Description("Dryer Zone 3")]
+ DryerZone3Temperature = 18,
/// <summary>
/// (Feeder Motor)
@@ -134,22 +152,22 @@ namespace Tango.BL.Enumerations
FeederMotorFrequency = 3,
/// <summary>
- /// (Mixer)
+ /// (Feeder Tension)
/// </summary>
- [Description("Mixer")]
- MixerTemperature = 9,
+ [Description("Feeder Tension")]
+ FeederTension = 14,
/// <summary>
- /// (Screw Motor)
+ /// (Filter Delta Pressure)
/// </summary>
- [Description("Screw Motor")]
- ScrewMotor = 7,
+ [Description("Filter Delta Pressure")]
+ FilterDeltaPressure = 26,
/// <summary>
- /// (Thread Speed)
+ /// (Head Air Flow)
/// </summary>
- [Description("Thread Speed")]
- ThreadSpeed = 8,
+ [Description("Head Air Flow")]
+ HeadAirFlow = 13,
/// <summary>
/// (Head Zone 1)
@@ -158,82 +176,82 @@ namespace Tango.BL.Enumerations
HeadZone1Temperature = 10,
/// <summary>
- /// (Dispenser 3 Motor Frequency)
+ /// (Head Zone 2)
/// </summary>
- [Description("Dispenser 3 Motor Frequency")]
- Dispenser3MotorFrequency = 30,
+ [Description("Head Zone 2")]
+ HeadZone2Temperature = 11,
/// <summary>
- /// (Dryer Zone 1)
+ /// (Head Zone 3)
/// </summary>
- [Description("Dryer Zone 1")]
- DryerZone1Temperature = 16,
+ [Description("Head Zone 3")]
+ HeadZone3Temperature = 12,
/// <summary>
- /// (Dancer 1)
+ /// (Head Zone 4)
/// </summary>
- [Description("Dancer 1")]
- Dancer1Angle = 0,
+ [Description("Head Zone 4")]
+ HeadZone4Temperature = 36,
/// <summary>
- /// (Dryer Zone 2)
+ /// (Head Zone 5)
/// </summary>
- [Description("Dryer Zone 2")]
- DryerZone2Temperature = 17,
+ [Description("Head Zone 5")]
+ HeadZone5Temperature = 37,
/// <summary>
- /// (Dispensers Pressure)
+ /// (Head Zone 6)
/// </summary>
- [Description("Dispensers Pressure")]
- DispensersPressure = 24,
+ [Description("Head Zone 6")]
+ HeadZone6Temperature = 38,
/// <summary>
- /// (Dancer 3)
+ /// (Mid Tank Pressure)
/// </summary>
- [Description("Dancer 3")]
- Dancer3Angle = 2,
+ [Description("Mid Tank Pressure")]
+ MidTankPressure = 25,
/// <summary>
- /// (Head Zone 2)
+ /// (Mixer)
/// </summary>
- [Description("Head Zone 2")]
- HeadZone2Temperature = 11,
+ [Description("Mixer")]
+ MixerTemperature = 9,
/// <summary>
- /// (Mid Tank Pressure)
+ /// (Poller Motor)
/// </summary>
- [Description("Mid Tank Pressure")]
- MidTankPressure = 25,
+ [Description("Poller Motor")]
+ PollerMotor = 5,
/// <summary>
- /// (Dispenser 4 Motor Frequency)
+ /// (Puller Tension)
/// </summary>
- [Description("Dispenser 4 Motor Frequency")]
- Dispenser4MotorFrequency = 31,
+ [Description("Puller Tension")]
+ PullerTension = 15,
/// <summary>
- /// (Winder Tension)
+ /// (Screw Motor)
/// </summary>
- [Description("Winder Tension")]
- WinderTension = 20,
+ [Description("Screw Motor")]
+ ScrewMotor = 7,
/// <summary>
- /// (Dispensers Linear Positions)
+ /// (Thread Speed)
/// </summary>
- [Description("Dispensers Linear Positions")]
- DispensersLinearPositions = 23,
+ [Description("Thread Speed")]
+ ThreadSpeed = 8,
/// <summary>
- /// (Poller Motor)
+ /// (Winder Motor)
/// </summary>
- [Description("Poller Motor")]
- PollerMotor = 5,
+ [Description("Winder Motor")]
+ WinderMotor = 6,
/// <summary>
- /// (Head Air Flow)
+ /// (Winder Tension)
/// </summary>
- [Description("Head Air Flow")]
- HeadAirFlow = 13,
+ [Description("Winder Tension")]
+ WinderTension = 20,
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
index 3f558f414..a00e17320 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v",
- "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIpQJChNEaWFnbm9zdGljc01vbml0",
+ "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIu4JChNEaWFnbm9zdGljc01vbml0",
"b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD",
"KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl",
"bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY",
@@ -49,12 +49,14 @@ namespace Tango.PMR.Diagnostics {
"c3BlbnNlcjRNb3RvckZyZXF1ZW5jeRggIAMoARIgChhEaXNwZW5zZXI1TW90",
"b3JGcmVxdWVuY3kYISADKAESIAoYRGlzcGVuc2VyNk1vdG9yRnJlcXVlbmN5",
"GCIgAygBEiAKGERpc3BlbnNlcjdNb3RvckZyZXF1ZW5jeRgjIAMoARIgChhE",
- "aXNwZW5zZXI4TW90b3JGcmVxdWVuY3kYJCADKAFCIQofY29tLnR3aW5lLnRh",
+ "aXNwZW5zZXI4TW90b3JGcmVxdWVuY3kYJCADKAESHAoUSGVhZFpvbmU0VGVt",
+ "cGVyYXR1cmUYJSADKAESHAoUSGVhZFpvbmU1VGVtcGVyYXR1cmUYJiADKAES",
+ "HAoUSGVhZFpvbmU2VGVtcGVyYXR1cmUYJyADKAFCIQofY29tLnR3aW5lLnRh",
"bmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "MidTankPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "MidTankPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature" }, null, null, null)
}));
}
#endregion
@@ -121,6 +123,9 @@ namespace Tango.PMR.Diagnostics {
dispenser6MotorFrequency_ = other.dispenser6MotorFrequency_.Clone();
dispenser7MotorFrequency_ = other.dispenser7MotorFrequency_.Clone();
dispenser8MotorFrequency_ = other.dispenser8MotorFrequency_.Clone();
+ headZone4Temperature_ = other.headZone4Temperature_.Clone();
+ headZone5Temperature_ = other.headZone5Temperature_.Clone();
+ headZone6Temperature_ = other.headZone6Temperature_.Clone();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -596,6 +601,45 @@ namespace Tango.PMR.Diagnostics {
get { return dispenser8MotorFrequency_; }
}
+ /// <summary>Field number for the "HeadZone4Temperature" field.</summary>
+ public const int HeadZone4TemperatureFieldNumber = 37;
+ private static readonly pb::FieldCodec<double> _repeated_headZone4Temperature_codec
+ = pb::FieldCodec.ForDouble(298);
+ private readonly pbc::RepeatedField<double> headZone4Temperature_ = new pbc::RepeatedField<double>();
+ /// <summary>
+ ///Head Zone 4 (Min = 0, Max = 100, PPF = 1)
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pbc::RepeatedField<double> HeadZone4Temperature {
+ get { return headZone4Temperature_; }
+ }
+
+ /// <summary>Field number for the "HeadZone5Temperature" field.</summary>
+ public const int HeadZone5TemperatureFieldNumber = 38;
+ private static readonly pb::FieldCodec<double> _repeated_headZone5Temperature_codec
+ = pb::FieldCodec.ForDouble(306);
+ private readonly pbc::RepeatedField<double> headZone5Temperature_ = new pbc::RepeatedField<double>();
+ /// <summary>
+ ///Head Zone 5 (Min = 0, Max = 100, PPF = 1)
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pbc::RepeatedField<double> HeadZone5Temperature {
+ get { return headZone5Temperature_; }
+ }
+
+ /// <summary>Field number for the "HeadZone6Temperature" field.</summary>
+ public const int HeadZone6TemperatureFieldNumber = 39;
+ private static readonly pb::FieldCodec<double> _repeated_headZone6Temperature_codec
+ = pb::FieldCodec.ForDouble(314);
+ private readonly pbc::RepeatedField<double> headZone6Temperature_ = new pbc::RepeatedField<double>();
+ /// <summary>
+ ///Head Zone 6 (Min = 0, Max = 100, PPF = 1)
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pbc::RepeatedField<double> HeadZone6Temperature {
+ get { return headZone6Temperature_; }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as DiagnosticsMonitors);
@@ -645,6 +689,9 @@ namespace Tango.PMR.Diagnostics {
if(!dispenser6MotorFrequency_.Equals(other.dispenser6MotorFrequency_)) return false;
if(!dispenser7MotorFrequency_.Equals(other.dispenser7MotorFrequency_)) return false;
if(!dispenser8MotorFrequency_.Equals(other.dispenser8MotorFrequency_)) return false;
+ if(!headZone4Temperature_.Equals(other.headZone4Temperature_)) return false;
+ if(!headZone5Temperature_.Equals(other.headZone5Temperature_)) return false;
+ if(!headZone6Temperature_.Equals(other.headZone6Temperature_)) return false;
return true;
}
@@ -687,6 +734,9 @@ namespace Tango.PMR.Diagnostics {
hash ^= dispenser6MotorFrequency_.GetHashCode();
hash ^= dispenser7MotorFrequency_.GetHashCode();
hash ^= dispenser8MotorFrequency_.GetHashCode();
+ hash ^= headZone4Temperature_.GetHashCode();
+ hash ^= headZone5Temperature_.GetHashCode();
+ hash ^= headZone6Temperature_.GetHashCode();
return hash;
}
@@ -733,6 +783,9 @@ namespace Tango.PMR.Diagnostics {
dispenser6MotorFrequency_.WriteTo(output, _repeated_dispenser6MotorFrequency_codec);
dispenser7MotorFrequency_.WriteTo(output, _repeated_dispenser7MotorFrequency_codec);
dispenser8MotorFrequency_.WriteTo(output, _repeated_dispenser8MotorFrequency_codec);
+ headZone4Temperature_.WriteTo(output, _repeated_headZone4Temperature_codec);
+ headZone5Temperature_.WriteTo(output, _repeated_headZone5Temperature_codec);
+ headZone6Temperature_.WriteTo(output, _repeated_headZone6Temperature_codec);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -774,6 +827,9 @@ namespace Tango.PMR.Diagnostics {
size += dispenser6MotorFrequency_.CalculateSize(_repeated_dispenser6MotorFrequency_codec);
size += dispenser7MotorFrequency_.CalculateSize(_repeated_dispenser7MotorFrequency_codec);
size += dispenser8MotorFrequency_.CalculateSize(_repeated_dispenser8MotorFrequency_codec);
+ size += headZone4Temperature_.CalculateSize(_repeated_headZone4Temperature_codec);
+ size += headZone5Temperature_.CalculateSize(_repeated_headZone5Temperature_codec);
+ size += headZone6Temperature_.CalculateSize(_repeated_headZone6Temperature_codec);
return size;
}
@@ -818,6 +874,9 @@ namespace Tango.PMR.Diagnostics {
dispenser6MotorFrequency_.Add(other.dispenser6MotorFrequency_);
dispenser7MotorFrequency_.Add(other.dispenser7MotorFrequency_);
dispenser8MotorFrequency_.Add(other.dispenser8MotorFrequency_);
+ headZone4Temperature_.Add(other.headZone4Temperature_);
+ headZone5Temperature_.Add(other.headZone5Temperature_);
+ headZone6Temperature_.Add(other.headZone6Temperature_);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1004,6 +1063,21 @@ namespace Tango.PMR.Diagnostics {
dispenser8MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser8MotorFrequency_codec);
break;
}
+ case 298:
+ case 297: {
+ headZone4Temperature_.AddEntriesFrom(input, _repeated_headZone4Temperature_codec);
+ break;
+ }
+ case 306:
+ case 305: {
+ headZone5Temperature_.AddEntriesFrom(input, _repeated_headZone5Temperature_codec);
+ break;
+ }
+ case 314:
+ case 313: {
+ headZone6Temperature_.AddEntriesFrom(input, _repeated_headZone6Temperature_codec);
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj b/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj
index fb9a62c56..80eae8f77 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.Installer/Tango.Stubs.Installer.vdproj
@@ -555,7 +555,7 @@
"DisplayName" = "8:Debug"
"IsDebugOnly" = "11:TRUE"
"IsReleaseOnly" = "11:FALSE"
- "OutputFilename" = "8:..\\..\\Build\\Debug\\Installers\\Tango Stubs Installer v2.3.msi"
+ "OutputFilename" = "8:..\\..\\Build\\Debug\\Installers\\Tango Stubs Installer v2.4.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@@ -951,7 +951,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:StubsExecutionGUI, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:StubsExecutionGUI, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_61BDC9339D1440BCBC454CC904BCE79C"
@@ -1561,15 +1561,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Tango Stubs GUI"
- "ProductCode" = "8:{29F059C9-90F4-40C3-928F-88F897CC362B}"
- "PackageCode" = "8:{1CDFE043-1DED-4D3A-89CE-CE7DB63AB456}"
+ "ProductCode" = "8:{9C483557-286C-4959-A505-4DE9D17273D7}"
+ "PackageCode" = "8:{DED60BA5-02BB-4912-8A2D-04E794D58974}"
"UpgradeCode" = "8:{72B680FB-E47D-486A-A81E-6C035F2EBA42}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:2.3"
+ "ProductVersion" = "8:2.4"
"Manufacturer" = "8:Twine"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
index 6dc80b073..8b6a48a33 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Stubs execution utility")]
[assembly: AssemblyCopyright("Twine LTD 2018")]
[assembly: AssemblyTrademark("Twine LTD")]
-[assembly: AssemblyVersion("2.3")]
-[assembly: AssemblyFileVersion("2.3")]
+[assembly: AssemblyVersion("2.4")]
+[assembly: AssemblyFileVersion("2.4")]
diff --git a/Software/Visual_Studio/Versioning/Core.cs b/Software/Visual_Studio/Versioning/Core.cs
index b435e79ef..82bed7abb 100644
--- a/Software/Visual_Studio/Versioning/Core.cs
+++ b/Software/Visual_Studio/Versioning/Core.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
[assembly: AssemblyTrademark("Twine LTD")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
diff --git a/Software/Visual_Studio/Versioning/MachineStudio.cs b/Software/Visual_Studio/Versioning/MachineStudio.cs
index 8d51f7ee1..1d8794b69 100644
--- a/Software/Visual_Studio/Versioning/MachineStudio.cs
+++ b/Software/Visual_Studio/Versioning/MachineStudio.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
[assembly: AssemblyTrademark("Twine LTD")]
-[assembly: AssemblyVersion("1.0.0.7")]
-[assembly: AssemblyFileVersion("1.0.0.7")]
+[assembly: AssemblyVersion("1.0.0.8")]
+[assembly: AssemblyFileVersion("1.0.0.8")]