handling of safety heating tests, dancers position

2 files changed, 105 insertions, 215 deletions

diff --git a/Software/Stubs Collection/stubs/ThreadLoading.cs b/Software/Stubs Collection/stubs/ThreadLoading.cs
deleted file mode 100644
index 375237184..000000000
--- a/Software/Stubs Collection/stubs/ThreadLoading.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Text;
-using System.Linq;
-using System.Drawing;
-using System.Diagnostics;
-using System.Windows.Forms;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using Tango.PMR.Hardware;
-using Tango.PMR.Printing;
-using Tango.PMR.Stubs;
-using Tango.Stubs.UI;
-
-include "D:\stubs\addedfiles\ACHeatersDefinition.cs"
-include "D:\stubs\addedfiles\DCHeatersDefinition.cs"
-include "D:\stubs\addedfiles\DeskSystemThreadMotorsDefinition.cs"
-//include "D:\stubs\addedfiles\ThreadMotorsDefinition2.cs"
-
-public void OnExecute(StubManager stubManager)
-{
-        Thread.Sleep(10);
-
-
-UploadHardwareConfigurationRequest uploadHardwareConfigurationRequest = new UploadHardwareConfigurationRequest();
-
-HardwareConfiguration hardwareConfiguration = new HardwareConfiguration();
-
-hardwareConfiguration.Motors.Add(FeederMotor);
-hardwareConfiguration.Motors.Add(WinderMotor);
-hardwareConfiguration.Motors.Add(DryerMotor);
-hardwareConfiguration.Motors.Add(PoolerMotor);
-hardwareConfiguration.Motors.Add(ScrewMotor);
-hardwareConfiguration.Motors.Add(DryerLoadarm);
-
-
-//hardwareConfiguration.Dispensers.Add(hardwareDispenser);
-
-hardwareConfiguration.PidControls.Add(FeederPidControl);
-hardwareConfiguration.PidControls.Add(PoolerPidControl);
-hardwareConfiguration.PidControls.Add(WinderPidControl);
-
-hardwareConfiguration.Dancers.Add(FeederDancer);
-hardwareConfiguration.Dancers.Add(PoolerDancer);
-hardwareConfiguration.Dancers.Add(WinderDancer);
-
-hardwareConfiguration.Winders.Add(Winder);
-
-
-
-stubManager.WriteLine("data.data length = " + hardwareConfiguration.CalculateSize());
-
-
-uploadHardwareConfigurationRequest.HardwareConfiguration = hardwareConfiguration;
-var response = stubManager.Run<UploadHardwareConfigurationResponse>(uploadHardwareConfigurationRequest);
-        /*Thread.Sleep(5000);*/
-
-JobRequest jobRequest = new JobRequest();
-
-JobTicket jobTicket = new JobTicket();
-jobTicket.Name = "Stubs Job";
-jobTicket.EnableInterSegment = false;
-jobTicket.InterSegmentLength = 50;
-jobTicket.Length = 1000;
-
-ProcessParameters processParameters = new ProcessParameters();
-processParameters.DyeingSpeed = 20;
-
-jobTicket.ProcessParameters = processParameters;
-jobTicket.WindingMethod = Tango.PMR.Printing.JobWindingMethod.Embroidery;
-
-JobSpool jobSpool = new JobSpool();
-jobSpool.JobSpoolType = Tango.PMR.Printing.JobSpoolType.StandardSpool;
-jobSpool.Length = 800;
-jobSpool.Weight = 0;
-jobSpool.Diameter = 3.0;
-jobSpool.StartOffsetPulses = 300;
-jobSpool.BackingRate = 10;
-jobSpool.SegmentOffsetPulses = 600;
-jobSpool.BottomBackingRate = 70;
-jobSpool.RotationsPerPassage = 7;
-
-jobTicket.Spool = jobSpool;
-
-JobSegment jobSegment = new JobSegment();
-jobSegment.Name = "Segment1";
-jobSegment.Length = 400.0;
-
-JobBrushStop jobBrushStop = new JobBrushStop();
-jobBrushStop.Index = 0;
-jobBrushStop.OffsetPercent = 0;
-jobBrushStop.OffsetMeters = 0;
-
-JobDispenser jobDispenser = new JobDispenser();
-jobDispenser.Index = 6;
-jobDispenser.Volume = 10;
-jobDispenser.DispenserStepDivision = Tango.PMR.Printing.DispenserStepDivision.Auto;
-jobDispenser.NanolitterPerSecond = 0;
-jobDispenser.NanoliterPerCentimeter = 10;
-jobDispenser.PulsePerSecond = 500;
-jobDispenser.DispenserLiquidType = Tango.PMR.Printing.DispenserLiquidType.Cyan;
-jobDispenser.LiquidMaxNanoliterPerCentimeter = 40;
-jobDispenser.NanoliterPerPulse = 0;
-jobBrushStop.Dispensers.Add(jobDispenser);
-jobSegment.BrushStops.Add(jobBrushStop);
-jobTicket.Segments.Add(jobSegment);
-
-jobRequest.JobTicket = jobTicket;
-
-
-int i=0;
-stubManager.RunContinuous<JobResponse>(jobRequest,(response1) =>
-                                                   {                                                   	
-				stubManager.WriteLine (String.Format("Data, {0},  {1} meters, {2}",++i,response1.Status.Progress*jobSegment.Length,response1.Status.Message));
-                                                   	
-                                                   });
-
-
-}
\ No newline at end of file
diff --git a/Software/Stubs Collection/stubs/technician view files/new head.tpf b/Software/Stubs Collection/stubs/technician view files/new head.tpf
index 6c9d2805b..cb766e7fe 100644
--- a/Software/Stubs Collection/stubs/technician view files/new head.tpf
+++ b/Software/Stubs Collection/stubs/technician view files/new head.tpf
@@ -26,13 +26,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>DryerAirHeater</HeaterType>
-            <SetPoint>190</SetPoint>
-            <CurrentValue>141.23</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>23.29</CurrentValue>
             <IsActive>false</IsActive>
-            <IsRampingUp>true</IsRampingUp>
-            <IsInSetPoint>false</IsInSetPoint>
+            <IsRampingUp>false</IsRampingUp>
+            <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>190</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>0ac64716-d30c-489b-939e-a26d06445866</ID>
@@ -45,13 +45,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>DryerMainHeater</HeaterType>
-            <SetPoint>100</SetPoint>
-            <CurrentValue>172.16</CurrentValue>
-            <IsActive>true</IsActive>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>39.65</CurrentValue>
+            <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>100</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>181796d8-64f6-420a-8f37-9af9df67d6a9</ID>
@@ -64,13 +64,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>DryerSecondaryHeater</HeaterType>
-            <SetPoint>100</SetPoint>
-            <CurrentValue>169.29</CurrentValue>
-            <IsActive>true</IsActive>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>39.74</CurrentValue>
+            <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>100</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>fd2bb3a3-a411-470d-bde7-0beaf84da059</ID>
@@ -83,13 +83,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone3</HeaterType>
-            <SetPoint>110</SetPoint>
-            <CurrentValue>107.80999999999999</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>27.25</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>110</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>7e8dd386-cca6-4d07-8a3e-af5403756002</ID>
@@ -102,13 +102,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone2</HeaterType>
-            <SetPoint>90</SetPoint>
-            <CurrentValue>89.3</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>27.169999999999998</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>90</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>32a91e5f-27c8-490d-b187-8e39b6626a13</ID>
@@ -121,13 +121,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone1</HeaterType>
-            <SetPoint>80</SetPoint>
-            <CurrentValue>79.6</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>25.77</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>80</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>c844235a-8a29-4c2e-a964-e8f546d2ced7</ID>
@@ -140,13 +140,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>MixerHeater</HeaterType>
-            <SetPoint>80</SetPoint>
-            <CurrentValue>80.23</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>25.43</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>80</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>45b121b5-cf7c-41f7-8089-6d4d6b1ed2c8</ID>
@@ -159,13 +159,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone4</HeaterType>
-            <SetPoint>120</SetPoint>
-            <CurrentValue>118.78999999999999</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>25.689999999999998</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>120</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>e6b3eb18-482b-450e-b8a8-d2ac6bba4fd4</ID>
@@ -178,13 +178,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone5</HeaterType>
-            <SetPoint>130</SetPoint>
-            <CurrentValue>128.84</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>24.659999999999997</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>130</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>efff2e67-e3a3-4667-9208-4704707d7cda</ID>
@@ -197,13 +197,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone6</HeaterType>
-            <SetPoint>135</SetPoint>
-            <CurrentValue>135.2</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>25.33</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>135</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="MonitorItem">
           <ID>f9936dba-cef8-41e3-a715-eb629dca1870</ID>
@@ -288,13 +288,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone7</HeaterType>
-            <SetPoint>135</SetPoint>
-            <CurrentValue>134.71</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>26.169999999999998</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>135</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="TextItem">
           <ID>f129ea0d-9abb-437f-928e-1cd1f569db2a</ID>
@@ -327,13 +327,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone8</HeaterType>
-            <SetPoint>135</SetPoint>
-            <CurrentValue>134.83</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>25.389999999999997</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>135</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>3c923a93-4d15-4bbc-b1b3-be1876a77cfc</ID>
@@ -346,13 +346,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone9</HeaterType>
-            <SetPoint>135</SetPoint>
-            <CurrentValue>134.89</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>24.5</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>135</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>26e078e6-df8c-4fbf-b10e-4b3f7c7e9500</ID>
@@ -365,13 +365,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone12</HeaterType>
-            <SetPoint>140</SetPoint>
-            <CurrentValue>138.79</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>23.639999999999997</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>140</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>7a8c3948-bb3d-4eb1-9276-315d34038f91</ID>
@@ -384,13 +384,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone11</HeaterType>
-            <SetPoint>140</SetPoint>
-            <CurrentValue>139.94</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>24.529999999999998</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>140</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="HeaterItem">
           <ID>f7d4c8ac-28cb-4779-83ef-3ede5e5a612c</ID>
@@ -403,13 +403,13 @@
           <ColorNumber>-1</ColorNumber>
           <HeaterState>
             <HeaterType>HeaterZone10</HeaterType>
-            <SetPoint>135</SetPoint>
-            <CurrentValue>134.71</CurrentValue>
+            <SetPoint>0</SetPoint>
+            <CurrentValue>24.779999999999998</CurrentValue>
             <IsActive>false</IsActive>
             <IsRampingUp>false</IsRampingUp>
             <IsInSetPoint>true</IsInSetPoint>
           </HeaterState>
-          <SetPoint>135</SetPoint>
+          <SetPoint>0</SetPoint>
         </TechItem>
         <TechItem xsi:type="ProcessParametersItem">
           <ID>120a9bea-5b5a-4ba4-92f5-40135f49a344</ID>
@@ -450,8 +450,11 @@
             <HeadZone10Temp>0</HeadZone10Temp>
             <HeadZone11Temp>0</HeadZone11Temp>
             <HeadZone12Temp>0</HeadZone12Temp>
-            <StSpZone1Temp>0</StSpZone1Temp>
-            <StSpZone2Temp>0</StSpZone2Temp>
+            <RBlowerFlow>0</RBlowerFlow>
+            <RBlowerTemp>0</RBlowerTemp>
+            <LBlowerFlow>0</LBlowerFlow>
+            <LBlowerTemp>0</LBlowerTemp>
+            <PressureBuildUp>0</PressureBuildUp>
           </ProcessParameters>
           <ParametersIndices>
             <ParameterIndex>
@@ -667,8 +670,8 @@
             <MinInkUptake>0</MinInkUptake>
             <MaxInkUptake>0</MaxInkUptake>
             <FeederTension>0</FeederTension>
-            <PullerTension>0</PullerTension>
-            <WinderTension>0</WinderTension>
+            <PullerTension>5000</PullerTension>
+            <WinderTension>5000</WinderTension>
             <MixerTemp>80</MixerTemp>
             <HeadZone1Temp>80</HeadZone1Temp>
             <HeadZone2Temp>90</HeadZone2Temp>
@@ -689,8 +692,11 @@
             <HeadZone10Temp>135</HeadZone10Temp>
             <HeadZone11Temp>140</HeadZone11Temp>
             <HeadZone12Temp>140</HeadZone12Temp>
-            <StSpZone1Temp>100</StSpZone1Temp>
-            <StSpZone2Temp>100</StSpZone2Temp>
+            <RBlowerFlow>0</RBlowerFlow>
+            <RBlowerTemp>0</RBlowerTemp>
+            <LBlowerFlow>0</LBlowerFlow>
+            <LBlowerTemp>0</LBlowerTemp>
+            <PressureBuildUp>0</PressureBuildUp>
           </ProcessParameters>
           <ParametersIndices>
             <ParameterIndex>
@@ -854,8 +860,11 @@
             <HeadZone10Temp>0</HeadZone10Temp>
             <HeadZone11Temp>0</HeadZone11Temp>
             <HeadZone12Temp>0</HeadZone12Temp>
-            <StSpZone1Temp>0</StSpZone1Temp>
-            <StSpZone2Temp>0</StSpZone2Temp>
+            <RBlowerFlow>0</RBlowerFlow>
+            <RBlowerTemp>0</RBlowerTemp>
+            <LBlowerFlow>0</LBlowerFlow>
+            <LBlowerTemp>0</LBlowerTemp>
+            <PressureBuildUp>0</PressureBuildUp>
           </ProcessParameters>
           <ParametersIndices>
             <ParameterIndex>
@@ -969,11 +978,11 @@
           <Angle>0</Angle>
           <ItemGuid>FE0D0A56-5795-4C5A-8E09-939FBB35C441</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>1275</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
       </Items>
     </MachineTechViewProjectTab>
@@ -1037,11 +1046,11 @@
           <Angle>0</Angle>
           <ItemGuid>D126DB23-784B-4F0C-8F88-D89A65A7549F</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1460</Duration>
           <Min>0</Min>
           <Max>16384</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>984b4126-3dda-4624-a79f-0646eb0e1358</ID>
@@ -1052,11 +1061,11 @@
           <Angle>0</Angle>
           <ItemGuid>10102BC3-0EAE-47FF-A8E5-8640780CAA3D</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1516</Duration>
           <Min>0</Min>
           <Max>16384</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>8ebc3ab7-a02d-4b12-93b3-2563443831d7</ID>
@@ -1067,11 +1076,11 @@
           <Angle>0</Angle>
           <ItemGuid>C0BCCD5C-346B-4C4A-A080-39D28E9E1A0C</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1398</Duration>
           <Min>0</Min>
           <Max>16384</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>acafb268-5e97-4277-8dc8-173250a9e3f8</ID>
@@ -1082,11 +1091,11 @@
           <Angle>0</Angle>
           <ItemGuid>9FBC5460-BA59-486B-8D85-BD7D8A959F98</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1273</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>be4cb8d9-b516-4604-a6a5-1638cbc50251</ID>
@@ -1097,11 +1106,11 @@
           <Angle>0</Angle>
           <ItemGuid>4CE6A82E-D841-4D33-BBB2-11F0743A441C</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>514</Duration>
           <Min>0</Min>
           <Max>100000</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>75b99507-4eba-4b11-b52e-26732d4c5479</ID>
@@ -1112,11 +1121,11 @@
           <Angle>0</Angle>
           <ItemGuid>F1DF490B-0577-4FA7-ACA1-0EEF4F934E8F</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>4</DecimalPlaces>
           <Duration>1398</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>4</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>a30e48de-be76-4230-92d0-d27d6f37b940</ID>
@@ -1127,11 +1136,11 @@
           <Angle>0</Angle>
           <ItemGuid>5F12B974-2C9E-4DDD-9B20-733251A5D7E6</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>4</DecimalPlaces>
           <Duration>1398</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>4</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>5ac4b368-093a-4192-98d4-e9d24f229b13</ID>
@@ -1142,11 +1151,11 @@
           <Angle>0</Angle>
           <ItemGuid>84CF23C9-D20D-4C08-BE1D-80201FC43C06</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>4</DecimalPlaces>
           <Duration>1398</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>4</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="MonitorRecorderItem">
           <ID>9c34dc69-cfaa-48b4-9d02-8f0d9bba79dd</ID>
@@ -1415,9 +1424,9 @@
           <Angle>0</Angle>
           <ItemGuid>78482AA4-3DF6-421F-944C-64328D3C3EF2</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
+          <UpdateInterval>10</UpdateInterval>
           <OptimalRangeMinimum>0</OptimalRangeMinimum>
           <OptimalRangeMaximum>70</OptimalRangeMaximum>
-          <UpdateInterval>10</UpdateInterval>
           <IsSetToDefault>true</IsSetToDefault>
         </TechItem>
         <TechItem xsi:type="DigitalOutItem">
@@ -1451,11 +1460,11 @@
           <Angle>0</Angle>
           <ItemGuid>D023F15D-3555-48E9-A9E9-5DF99F60D791</ItemGuid>
           <ColorNumber>0</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>1956</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="MonitorItem">
           <ID>46bdfce3-1c69-45dd-bbe9-582d1ac1e6f2</ID>
@@ -1620,11 +1629,11 @@
           <Angle>0</Angle>
           <ItemGuid>1F0F907A-EC16-4386-AFC8-B2B156F2A822</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>1426</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>cc99a514-1498-4b93-a4eb-4e0a2a2e9de6</ID>
@@ -1635,11 +1644,11 @@
           <Angle>0</Angle>
           <ItemGuid>A499E5E0-A812-4032-8F96-B38C6762C4BD</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1282</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="ValveItem">
           <ID>cdddd48e-422d-48f4-8397-5032c3705fdb</ID>
@@ -1855,11 +1864,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E448FB</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>81b78212-14d8-4a66-bf3a-eeea9900e0d6</ID>
@@ -1899,11 +1908,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E44809</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>064bd571-4250-4ea3-8ed5-96f1ddc8fe6b</ID>
@@ -1943,11 +1952,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E44812</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>85e9ecc2-3bce-4055-89a9-1712752898a9</ID>
@@ -1987,11 +1996,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E44811</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>5ed86083-bdd6-4648-b7ca-f17fa97f034a</ID>
@@ -2031,11 +2040,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E44810</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>e8130372-e0ee-4c1c-a43d-4ab15ff57bd8</ID>
@@ -2075,11 +2084,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E44808</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>e7935033-56c6-42a4-a2b3-f5eedb0a11e7</ID>
@@ -2119,11 +2128,11 @@
           <Angle>0</Angle>
           <ItemGuid>D7585119-4A42-4370-8F1E-F3E62553E588</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>b3826c8e-1d82-4f4f-ad9f-d88f257dffb2</ID>
@@ -2163,11 +2172,11 @@
           <Angle>0</Angle>
           <ItemGuid>098F7CAB-030C-46B0-B2B8-A85AF2253032</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>233f0076-7595-4ecb-8496-41eeb7b457ea</ID>
@@ -2207,11 +2216,11 @@
           <Angle>0</Angle>
           <ItemGuid>A8DB1D27-6B25-4FB4-A3F5-46A29BA51955</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>72d7192b-dd27-4064-9f5f-90062388a81c</ID>
@@ -2251,11 +2260,11 @@
           <Angle>0</Angle>
           <ItemGuid>246C2551-5EFD-48E9-94F6-6313C5E5018F</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>5f451443-fab2-4bf6-8f21-5e038ca2c726</ID>
@@ -2295,11 +2304,11 @@
           <Angle>0</Angle>
           <ItemGuid>6C0C1AB0-3EE9-40D7-8424-A79436FBC804</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>665593d6-e689-459e-94f9-2cdcce6150ac</ID>
@@ -2339,11 +2348,11 @@
           <Angle>0</Angle>
           <ItemGuid>DACEBF90-E2B4-4CC9-A973-B8B429AA0089</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>b53a74f3-8e91-40ce-b980-c5b237baeee9</ID>
@@ -2383,11 +2392,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E448DD</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>584c7f29-49cc-4845-a7ab-09239bd3a986</ID>
@@ -2427,11 +2436,11 @@
           <Angle>0</Angle>
           <ItemGuid>0E4783A1-B8DE-451E-B357-322C39E448CC</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>2962</Duration>
           <Min>0</Min>
           <Max>300</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="PidItem">
           <ID>c1f48bf1-9cb3-475a-b152-e8b9a211b694</ID>
@@ -2600,11 +2609,11 @@
           <Angle>0</Angle>
           <ItemGuid>94F3E5A1-413E-4EA0-BDE1-F0625BFF7910</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>419</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>8aa4b451-71d6-429c-94e4-2581e3c62a7a</ID>
@@ -2615,11 +2624,11 @@
           <Angle>0</Angle>
           <ItemGuid>FE0D0A56-5795-4C5A-8E09-939FBB35C441</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>2</DecimalPlaces>
           <Duration>419</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>2</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="BlowerItem">
           <ID>1f85047c-0b3e-49c6-a80a-c2585de00a81</ID>
@@ -2652,9 +2661,9 @@
           <Angle>0</Angle>
           <ItemGuid>78482AA4-3DF6-421F-944C-64328D3C3EF2</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
+          <UpdateInterval>10</UpdateInterval>
           <OptimalRangeMinimum>0</OptimalRangeMinimum>
           <OptimalRangeMaximum>7000</OptimalRangeMaximum>
-          <UpdateInterval>10</UpdateInterval>
           <IsSetToDefault>true</IsSetToDefault>
         </TechItem>
         <TechItem xsi:type="DigitalOutItem">
@@ -2681,11 +2690,11 @@
           <Angle>0</Angle>
           <ItemGuid>A499E5E0-A812-4032-8F96-B38C6762C4BD</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>3600</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="SingleGraphItem">
           <ID>aae29286-81b3-476a-9f58-c0fd246cae96</ID>
@@ -2696,11 +2705,11 @@
           <Angle>0</Angle>
           <ItemGuid>F33667BD-D9FA-4DC7-BC2C-0E89E60AE4BE</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>3600</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="TextItem">
           <ID>7d94c7c4-1288-4f9d-b0e6-a06794829642</ID>
@@ -2790,11 +2799,11 @@
           <Angle>0</Angle>
           <ItemGuid>1F0F907A-EC16-4386-AFC8-B2B156F2A822</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>3600</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="TextItem">
           <ID>1c254a92-c075-453f-9667-cdcc91cf8e6a</ID>
@@ -2827,11 +2836,11 @@
           <Angle>0</Angle>
           <ItemGuid>6B1DF4B0-BCC2-400C-A3B7-31C5119A55BB</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>3600</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="TextItem">
           <ID>0bef6e9d-6da0-4f06-9e1a-c00142bde4c1</ID>
@@ -2864,11 +2873,11 @@
           <Angle>0</Angle>
           <ItemGuid>19645882-6587-4A50-BD85-AF06617DC654</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>3</DecimalPlaces>
           <Duration>3600</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>3</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="MonitorItem">
           <ID>39f6a02c-c4d9-47d0-b92d-bdea0ed5d3ce</ID>
@@ -3020,11 +3029,11 @@
           <Angle>0</Angle>
           <ItemGuid>A499E5E0-A812-4032-8F96-B38C6762C4BD</ItemGuid>
           <ColorNumber>-14774017</ColorNumber>
-          <DecimalPlaces>1</DecimalPlaces>
           <Duration>1942</Duration>
           <Min>0</Min>
           <Max>100</Max>
           <UseAutoRange>true</UseAutoRange>
+          <DecimalPlaces>1</DecimalPlaces>
         </TechItem>
         <TechItem xsi:type="ValveItem">
           <ID>604e031b-89c3-4c9d-90ef-7b861a77e5e0</ID>