From 2abb72b9ca0d0e2c1440e0ccbe4e2e775b343313 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 20 Feb 2020 15:34:34 +0200 Subject: some changes for rapid first print --- .../Embedded/Common/report/reportInit.c | 2 +- .../Head_Card/EEPROM/Head_EEPROM.c | 1 + .../WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c | 16 +- .../WHS_Card/D_EMC2302_Fan/WHS_Fan.c | 2 +- .../WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c | 2 +- .../stubs/technician view files/new head.tpf | 841 +++++++++++++-------- 6 files changed, 544 insertions(+), 320 deletions(-) diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index ef9f2fffb..8f3cde15f 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -481,6 +481,6 @@ STATUS ReportInit(ReportInitParams InitParams) InitFilter = ReportAddFilterPackage("Init"); MaintFilter = ReportAddFilterPackage("Maint"); // Filter = ReportAddFilterPackage(""); - //ReportSwitchPackageFilter(WasteFilter,REPORT_OFF); + ReportSwitchPackageFilter(WasteFilter,REPORT_OFF); return status; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c index 9b17ae0dd..a3de380b4 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c @@ -125,6 +125,7 @@ uint32_t Check_Head_Type_Via_EEPROM() Head_struct.Read_Head_EEPROM.bytes.HeadType = Read_Buf[1]; //HEAD_TYPE_SYLKO / HEAD_TYPE_STAPLE_SPUN Head_Type = Head_struct.Read_Head_EEPROM.bytes.HeadType; + Head_Type = HEAD_TYPE_SYLKO; } return status; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c index 24f5fdb5b..b9cef250b 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c @@ -322,19 +322,19 @@ uint8_t D_Fan_Read_Tacho_HIGH(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2 { writebuffer = EMC2301_TACH_1_READING_HIGH; status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } else { writebuffer = EMC2301_TACH_2_READING_HIGH; status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } return status; @@ -349,19 +349,19 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C { writebuffer = EMC2301_TACH_1_READING_LOW; status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } else { writebuffer = EMC2301_TACH_2_READING_LOW; status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); - ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); + //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } return status; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c index db8698837..ca3ef7c63 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c @@ -151,7 +151,7 @@ void Read_All_WHS_Fans_Tach() { WHS_fan_num fan_number=0; - for (fan_number = FAN1 ; fan_number < maxFAN; fan_number++) + for (fan_number = FAN1 ; fan_number < FAN5/*maxFAN*/; fan_number++) { WHS_Read_fan_tach(fan_number); } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index 5c8cf5cfb..f00d6c6ed 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -326,7 +326,7 @@ bool WHS_Set_Blower_Control_Closed_Loop(double SetPoint_Q) uint16_t volt; double tmp = 0.0; - current_dying_head_flow_Q = get_average_ORF3_Q(); + current_dying_head_flow_Q = get_average_ORF1_Q(); ReportWithPackageFilter(WasteFilter,"------------ current_dying_head_flow_Q =-----------------", __FILE__,__LINE__, current_dying_head_flow_Q, RpMessage, 0, 0); ReportWithPackageFilter(WasteFilter,"------------ SET_DYEING_HEAD_ORRIFFICE_SENSOR =-----------------", __FILE__,__LINE__, SET_DYEING_HEAD_ORRIFFICE_SENSOR, RpMessage, current_dying_head_flow_Q, 0); tmp = fabs((current_dying_head_flow_Q*10) - (SetPoint_Q*10)); 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 d8cd7f0dc..9177d1da9 100644 --- a/Software/Stubs Collection/stubs/technician view files/new head.tpf +++ b/Software/Stubs Collection/stubs/technician view files/new head.tpf @@ -5,20 +5,6 @@ Temperatures - - ba743caa-95f2-4b20-8c32-8e5943ada3fc - 28 - 678.95132743362808 - 238 - 119.56637168141629 - 0 - 78482AA4-3DF6-421F-944C-64328D3C3EF2 - -14774017 - 10 - 0 - 70 - true - e4892498-fa1a-413c-9dd8-633efaade51c 415 @@ -40,13 +26,13 @@ -1 DryerAirHeater - 0 - -142.72 + 190 + 182.13 false - false + true true - 0 + 190 0ac64716-d30c-489b-939e-a26d06445866 @@ -59,13 +45,13 @@ -1 DryerMainHeater - 0 - 8.5 + 66 + 195.45 false false true - 0 + 66 181796d8-64f6-420a-8f37-9af9df67d6a9 @@ -79,7 +65,7 @@ DryerSecondaryHeater 0 - 233.57 + 194.35999999999999 false false true @@ -97,13 +83,13 @@ -1 HeaterZone3 - 0 - 283.75 + 135 + 134.06 false false true - 0 + 135 7e8dd386-cca6-4d07-8a3e-af5403756002 @@ -116,13 +102,13 @@ -1 HeaterZone2 - 80 - 24.439999999999998 + 120 + 117.28999999999999 false - true - false + false + true - 80 + 120 32a91e5f-27c8-490d-b187-8e39b6626a13 @@ -136,10 +122,10 @@ HeaterZone1 80 - 24.599999999999998 + 79.1 false - true - false + false + true 80 @@ -154,13 +140,13 @@ -1 MixerHeater - 0 - 283.75 + 80 + 80.26 false false true - 0 + 80 45b121b5-cf7c-41f7-8089-6d4d6b1ed2c8 @@ -173,13 +159,13 @@ -1 HeaterZone4 - 80 - 27.459999999999997 + 135 + 132.82 false - true - false + false + true - 80 + 135 e6b3eb18-482b-450e-b8a8-d2ac6bba4fd4 @@ -192,13 +178,13 @@ -1 HeaterZone5 - 80 - 24.779999999999998 + 135 + 133.72 false - true - false + false + true - 80 + 135 efff2e67-e3a3-4667-9208-4704707d7cda @@ -211,13 +197,13 @@ -1 HeaterZone6 - 80 - 24.729999999999997 + 120 + 119.47999999999999 false - true - false + false + true - 80 + 120 f9936dba-cef8-41e3-a715-eb629dca1870 @@ -302,13 +288,13 @@ -1 HeaterZone7 - 80 - 25.02 + 130 + 127.77999999999999 false - true - false + false + true - 80 + 130 f129ea0d-9abb-437f-928e-1cd1f569db2a @@ -341,13 +327,13 @@ -1 HeaterZone8 - 80 - 25.069999999999997 + 130 + 127.46 false - true - false + false + true - 80 + 130 3c923a93-4d15-4bbc-b1b3-be1876a77cfc @@ -360,13 +346,13 @@ -1 HeaterZone9 - 80 - 25.02 + 130 + 127.64999999999999 false - true - false + false + true - 80 + 130 26e078e6-df8c-4fbf-b10e-4b3f7c7e9500 @@ -379,13 +365,13 @@ -1 HeaterZone12 - 0 - 283.75 + 120 + 114.25 false false true - 0 + 120 7a8c3948-bb3d-4eb1-9276-315d34038f91 @@ -398,13 +384,13 @@ -1 HeaterZone11 - 0 - 283.75 + 130 + 127.75 false false true - 0 + 130 f7d4c8ac-28cb-4779-83ef-3ede5e5a612c @@ -417,47 +403,55 @@ -1 HeaterZone10 - 80 - 24.939999999999998 + 120 + 118.89999999999999 false - true - false + false + true - 80 + 120 - 63aa661e-4bad-43fc-aed3-c8f570254246 + 120a9bea-5b5a-4ba4-92f5-40135f49a344 6 - 111.52654867256638 - 308 - 419.49557522123905 + 535.07522123893818 + 338 + 137.80530973451323 0 -14774017 0 - 0f2eecbd-2a88-4510-b37c-7b4fc90de7f9 - 2020-01-14T07:43:22.6203867Z - Process parameters 1 + 674d92c5-e6f8-4a62-bc62-b8e2fe0882a0 + 2020-01-14T07:44:15.1425366Z + Process parameters 2 0 0 0 0 0 0 - 12 - 101 - 102 - 103 - 104 - 105 - 106 - 0 - 100 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 5 + 0 0 0 0 - 0 + 5 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -550,144 +544,290 @@ + + e502555c-95b0-4688-b5e3-8becb30fc62c + 1458.875 + 91.7821782178217 + 200 + 187.45575221238937 + 0 + F8C1BA7F-F6DF-414D-BAF5-D4CB292F91F6 + -1 + + HeadCoverHeater1 + 0 + 283.75 + false + false + true + + 0 + + + 0f7a35fc-e363-45b2-948d-ba66f91e4f0d + 1457.8333333333333 + 344.58910891089096 + 200 + 187.45575221238937 + 0 + F39B952A-6194-4055-A5CB-A3421BFE0F9B + -1 + + HeadCoverHeater2 + 0 + 283.75 + false + false + true + + 0 + + + 0214c2bd-98e2-4435-b55f-ec165b0782dd + 532 + 587.69469026548677 + 163 + 77.008849557522126 + 0 + FE0D0A56-5795-4C5A-8E09-939FBB35C441 + -1 + 10 + 2 + + + 387e9a45-e608-47b8-9f3c-5572d0544e41 + 708 + 584.65486725663732 + 168 + 84.101769911504334 + 0 + 94F3E5A1-413E-4EA0-BDE1-F0625BFF7910 + -1 + 10 + 2 + + + 18f62f2f-dbc0-4a3e-8af6-efdffc9562a5 + 12 + 699.86283185840716 + 234 + 96.2610619469026 + 0 + B6FE07F8-2435-495D-ABFE-358C76812413 + -1 + + + cb7b89a1-cdb4-408e-acc8-40e8dcb8d6ac + 7 + 5.995575221238937 + 142 + 84.101769911504391 + 0 + 9F98B9D3-F989-4D03-90E8-721671835E0B + -1 + 10 + 2 + + + 6be6ca7d-3ca6-4206-9c67-415174b71ace + 168 + 7.3893805309738809 + 146 + 83.088495575221259 + 0 + D59EFB38-79D9-446C-BCB5-92D8FDA900E4 + -1 + 10 + 2 + + + 2dca972d-3c41-4b07-a047-b63a23470a7e + 347 + 574.92035398230325 + 160 + 102.34070796460173 + 0 + 75f69efe-1c7e-4015-a6eb-2686d4f67a67 + -1 + - 120a9bea-5b5a-4ba4-92f5-40135f49a344 - 3.6044649102295456 - 562.307262407734 - 361.0862313806519 - 110.60070319545434 + 38e5d1ac-40a5-4c5f-822c-51813cb15b7b + 31 + 144.3584070796461 + 310 + 315.12831858407088 0 -14774017 0 - 674d92c5-e6f8-4a62-bc62-b8e2fe0882a0 - 2020-01-14T07:44:15.1425366Z - Process parameters 2 + ce709f03-59be-410d-a928-e942c0c46ce3 + 2020-02-09T12:45:24.1272815Z + Process parameters 6 0 0 0 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 80 + 80 + 100 + 100 + 100 + 100 + 100 + 7 + 100 0 0 0 - 0 + 7 0 + 100 + 100 + 100 + 100 + 100 + 100 + 100 + 100 - Name + Process Parameters Tables Group Guid 0 - Dyeing Speed + Name 1 - Min Ink Uptake + Table Index 2 - Max Ink Uptake + Dyeing Speed 3 - Feeder Tension + Min Ink Uptake 4 - Puller Tension + Max Ink Uptake 5 - Winder Tension + Feeder Tension 6 - Mixer Temp + Puller Tension 7 - Head Zone 1 Temp + Winder Tension 8 - Head Zone 2 Temp + Mixer Temp 9 - Head Zone 3 Temp + Head Zone 1 Temp 10 - Head Zone 4 Temp + Head Zone 2 Temp 11 - Head Zone 5 Temp + Head Zone 3 Temp 12 - Head Zone 6 Temp + Head Zone 4 Temp 13 - Dryer Air Flow + Head Zone 5 Temp 14 - Dryer Zone 1 Temp + Head Zone 6 Temp 15 - Dryer Zone 2 Temp + Head Zone 7 Temp 16 - Dryer Zone 3 Temp + Head Zone 8 Temp 17 - Dryer Buffer Length + Head Zone 9 Temp 18 - Head Air Flow + Head Zone 10 Temp 19 - Process Parameters Tables Group Guid + Head Zone 11 Temp 20 - Table Index + Head Zone 12 Temp 21 + + St Sp Zone 1 Temp + 22 + + + St Sp Zone 2 Temp + 23 + + + Dryer Zone 1 Temp + 24 + + + Dryer Zone 2 Temp + 25 + + + Dryer Zone 3 Temp + 26 + + + Dryer Air Flow + 27 + + + Head Air Flow + 28 + + + Dryer Buffer Length + 29 + - 21aa11c9-3d35-4902-901a-b9ed45117e09 - 653 - 860.82743362831877 - 382 - 223.93362831858394 + d2e09fbf-2ac8-4c32-a4f5-45e50e305098 + 1016 + 821.96460176991263 + 361 + 233.95575221238948 0 -14774017 0 - 811430c0-2afc-4e9b-8077-a74e1fd2f825 - 2020-01-14T11:41:02.8729031Z - Process parameters 3 + 9b265a7c-cc48-4c5a-abed-dfa8c8e3099f + 2020-02-09T13:11:03.3185652Z + Process parameters 2 0 0 0 @@ -696,18 +836,26 @@ 0 0 0 - 100 + 0 0 0 0 0 0 - 0 + 100 0 0 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -800,53 +948,17 @@ - - d3f502ea-76dd-48c3-b401-7f5fb7925a72 - 409 - 589.79203539823015 - 148 - 96.2610619469026 - 0 - 3EEE3B24-55DD-49F2-9339-F83F883BB908 - -1 - - - e502555c-95b0-4688-b5e3-8becb30fc62c - 1458.875 - 91.7821782178217 - 200 - 187.45575221238937 - 0 - F8C1BA7F-F6DF-414D-BAF5-D4CB292F91F6 - -1 - - HeadCoverHeater1 - 80 - 24.919999999999998 - false - true - false - - 80 - - - 0f7a35fc-e363-45b2-948d-ba66f91e4f0d - 1457.8333333333333 - 344.58910891089096 - 200 - 187.45575221238937 + + 11f4748e-ed30-48d6-a08a-afeaa0277e2e + 330 + 12.154867256637203 + 205 + 90.181415929203524 0 - F39B952A-6194-4055-A5CB-A3421BFE0F9B + 1778C1A7-AFB5-42F9-9E00-E80D30D9FC02 -1 - - HeadCoverHeater2 - 0 - 283.75 - false - false - true - - 0 + 10 + 2 @@ -875,7 +987,7 @@ 96B89605-F999-43FE-A1CD-2645BFB33A36 -1 10 - 2 + 0 6be024c6-3d1b-4267-9b77-44473aba56b7 @@ -887,7 +999,7 @@ FC60060A-3736-4910-B41A-FF6DABDF0E9E -1 10 - 2 + 0 7c720f3b-00e1-49dd-92f9-fdd1e9686623 @@ -899,7 +1011,7 @@ 4CE6A82E-D841-4D33-BBB2-11F0743A441C -1 10 - 2 + 0 3ebd6759-521b-4ed1-a353-ee1ad7801f28 @@ -910,11 +1022,11 @@ 0 D126DB23-784B-4F0C-8F88-D89A65A7549F -14774017 + 1 1460 0 16384 true - 1 984b4126-3dda-4624-a79f-0646eb0e1358 @@ -925,11 +1037,11 @@ 0 10102BC3-0EAE-47FF-A8E5-8640780CAA3D -14774017 + 1 1516 0 16384 true - 1 8ebc3ab7-a02d-4b12-93b3-2563443831d7 @@ -940,11 +1052,11 @@ 0 C0BCCD5C-346B-4C4A-A080-39D28E9E1A0C -14774017 + 1 1398 0 16384 true - 1 acafb268-5e97-4277-8dc8-173250a9e3f8 @@ -955,22 +1067,11 @@ 0 9FBC5460-BA59-486B-8D85-BD7D8A959F98 -14774017 + 1 1273 0 100 true - 1 - - - 3ccb1485-b0e9-4d36-a931-a1b3865edeaa - 460 - 38.28761061946841 - 267 - 221.90707964601768 - 0 - 08d15ca1-d7d1-460f-8f37-42c37c287cd1 - -1 - 952.3546144121359 be4cb8d9-b516-4604-a6a5-1638cbc50251 @@ -981,11 +1082,11 @@ 0 4CE6A82E-D841-4D33-BBB2-11F0743A441C -14774017 + 1 514 0 100000 true - 1 75b99507-4eba-4b11-b52e-26732d4c5479 @@ -996,11 +1097,11 @@ 0 F1DF490B-0577-4FA7-ACA1-0EEF4F934E8F -14774017 + 4 1398 0 100 true - 4 a30e48de-be76-4230-92d0-d27d6f37b940 @@ -1011,11 +1112,11 @@ 0 5F12B974-2C9E-4DDD-9B20-733251A5D7E6 -14774017 + 4 1398 0 100 true - 4 5ac4b368-093a-4192-98d4-e9d24f229b13 @@ -1026,11 +1127,11 @@ 0 84CF23C9-D20D-4C08-BE1D-80201FC43C06 -14774017 + 4 1398 0 100 true - 4 9c34dc69-cfaa-48b4-9d02-8f0d9bba79dd @@ -1051,6 +1152,28 @@ F1DF490B-0577-4FA7-ACA1-0EEF4F934E8F + + be5b2c37-4481-4293-b957-bf65d8516fee + 464 + 21.274336283185846 + 315 + 177.3230088495576 + 0 + -1 + 20 + + + aace77b8-02ca-4c88-abc1-590fc2592b99 + 1355 + 146.70796460176933 + 175 + 167.827433628319 + 0 + 89B7B89D-8050-4188-B568-35B1910CFB6F + -1 + 10 + 0 + @@ -1065,7 +1188,7 @@ 0 2CC8E461-E91F-4D4C-A402-922477F06C87 -1 - 1200 + 800 Dispenser 1 @@ -1277,9 +1400,9 @@ 0 78482AA4-3DF6-421F-944C-64328D3C3EF2 -14774017 - 10 0 70 + 10 true @@ -1313,11 +1436,11 @@ 0 D023F15D-3555-48E9-A9E9-5DF99F60D791 0 + 2 1956 0 100 true - 2 46bdfce3-1c69-45dd-bbe9-582d1ac1e6f2 @@ -1482,11 +1605,11 @@ 0 1F0F907A-EC16-4386-AFC8-B2B156F2A822 -14774017 + 3 1426 0 100 true - 3 cc99a514-1498-4b93-a4eb-4e0a2a2e9de6 @@ -1497,11 +1620,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 1 1282 0 100 true - 1 cdddd48e-422d-48f4-8397-5032c3705fdb @@ -1510,7 +1633,7 @@ 382 136.79203539823016 0 - 16C0F85C-0479-42F4-A67E-3E0CD3B23C2D + 04C58CA0-9719-4BB0-8D3B-D4C71129D8E4 -1 @@ -1562,7 +1685,7 @@ 0 b90a4e78-ebbf-44db-829b-949517d6400b -1 - 50 + 350 e36e321b-d48d-4199-a1ee-75ac18e9de1e @@ -1573,7 +1696,7 @@ 0 b7c1aea4-32c1-41cb-bca3-4aa665529b49 -1 - 50 + 350 8790db03-4dfd-4d49-aec0-706babb55af9 @@ -1626,7 +1749,7 @@ 0 7b6d0a93-5a91-4e1f-af47-353afd8b5ea6 -1 - 83.833754740833143 + 20 2052a2d3-843c-4a1c-87fd-acd0832fd1b9 @@ -1648,7 +1771,7 @@ 0 f3b5076e-cba3-4ad2-b3cc-0c4e907bd9ef -1 - 98.094184576485333 + 20 7644a8f9-00a2-4e37-8f48-0667b1541114 @@ -1657,7 +1780,7 @@ 240 172.30973451327589 0 - 92237d83-9f85-48db-aa6f-2fc5c9e0d8cd + bda5aa4d-13aa-4259-92e5-b969276cb2b1 -1 500 @@ -1678,9 +1801,9 @@ 227 145.08849557522183 0 - 9c02effb-7deb-40a1-90c3-df1fb48e6431 + b71ad55d-d296-4371-a6d2-9d3c637c0380 -1 - 30 + 300 a88a74cb-418b-4ed0-89ec-c42ff560528e @@ -1689,9 +1812,19 @@ 227 145.08849557522183 0 - a359e9d0-adcc-40a5-b3d9-b9cb26eca092 + 4d097acc-df45-46af-bb7e-3d177ab27a9b + -1 + 2 + + + 37267035-ae9d-4c72-a04f-215f754d0900 + 264 + 417.77433628317885 + 240 + 116.10176991150968 + 0 + 6f48e18c-d472-425a-ba7e-633630605e11 -1 - 30 @@ -1707,11 +1840,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448FB -14774017 + 2 2962 0 300 true - 2 81b78212-14d8-4a66-bf3a-eeea9900e0d6 @@ -1734,13 +1867,13 @@ -1 HeaterZone7 - 80 - 25.02 + 130 + 127.77999999999999 false - true - false + false + true - 80 + 130 7e0942e7-a87a-402a-b580-5091ed6b29ee @@ -1751,11 +1884,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44809 -14774017 + 2 2962 0 300 true - 2 064bd571-4250-4ea3-8ed5-96f1ddc8fe6b @@ -1778,13 +1911,13 @@ -1 HeaterZone9 - 80 - 25.02 + 130 + 127.64999999999999 false - true - false + false + true - 80 + 130 85b25b0b-cd3d-4a8a-88f5-f832623d7ec2 @@ -1795,11 +1928,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44812 -14774017 + 2 2962 0 300 true - 2 85e9ecc2-3bce-4055-89a9-1712752898a9 @@ -1839,11 +1972,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44811 -14774017 + 2 2962 0 300 true - 2 5ed86083-bdd6-4648-b7ca-f17fa97f034a @@ -1866,13 +1999,13 @@ -1 HeaterZone11 - 0 - 283.75 + 130 + 127.75 false false true - 0 + 130 182492d7-b240-4162-b8ec-39996eec3cc7 @@ -1883,11 +2016,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44810 -14774017 + 2 2962 0 300 true - 2 e8130372-e0ee-4c1c-a43d-4ab15ff57bd8 @@ -1910,13 +2043,13 @@ -1 HeaterZone10 - 80 - 24.939999999999998 + 120 + 118.89999999999999 false - true - false + false + true - 80 + 120 00dda04e-1853-422f-ac47-29bdbab642d7 @@ -1927,11 +2060,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44808 -14774017 + 2 2962 0 300 true - 2 e7935033-56c6-42a4-a2b3-f5eedb0a11e7 @@ -1954,13 +2087,13 @@ -1 HeaterZone8 - 80 - 25.069999999999997 + 130 + 127.46 false - true - false + false + true - 80 + 130 40d16753-8448-4af9-8fbd-98c1ed301de5 @@ -1971,11 +2104,11 @@ 0 D7585119-4A42-4370-8F1E-F3E62553E588 -14774017 + 2 2962 0 300 true - 2 b3826c8e-1d82-4f4f-ad9f-d88f257dffb2 @@ -1998,13 +2131,13 @@ -1 HeaterZone3 - 0 - 283.75 + 135 + 134.06 false false true - 0 + 135 99af8946-4971-4913-9382-705c4e05b7ce @@ -2015,11 +2148,11 @@ 0 098F7CAB-030C-46B0-B2B8-A85AF2253032 -14774017 + 2 2962 0 100 true - 2 233f0076-7595-4ecb-8496-41eeb7b457ea @@ -2043,10 +2176,10 @@ HeaterZone1 80 - 24.599999999999998 + 79.1 false - true - false + false + true 80 @@ -2059,11 +2192,11 @@ 0 A8DB1D27-6B25-4FB4-A3F5-46A29BA51955 -14774017 + 2 2962 0 300 true - 2 72d7192b-dd27-4064-9f5f-90062388a81c @@ -2086,13 +2219,13 @@ -1 HeaterZone2 - 80 - 24.439999999999998 + 120 + 117.28999999999999 false - true - false + false + true - 80 + 120 64fba32f-3c03-42b3-b1ed-e2bdbe454bd6 @@ -2103,11 +2236,11 @@ 0 246C2551-5EFD-48E9-94F6-6313C5E5018F -14774017 + 2 2962 0 300 true - 2 5f451443-fab2-4bf6-8f21-5e038ca2c726 @@ -2130,13 +2263,13 @@ -1 HeaterZone6 - 80 - 24.729999999999997 + 120 + 119.47999999999999 false - true - false + false + true - 80 + 120 4f3b4ecd-759a-4ba5-80f3-74cc485d7085 @@ -2147,11 +2280,11 @@ 0 6C0C1AB0-3EE9-40D7-8424-A79436FBC804 -14774017 + 2 2962 0 300 true - 2 665593d6-e689-459e-94f9-2cdcce6150ac @@ -2174,13 +2307,13 @@ -1 HeaterZone5 - 80 - 24.779999999999998 + 135 + 133.72 false - true - false + false + true - 80 + 135 60dff2b2-7ddc-47a9-90b1-3f45968c1790 @@ -2191,11 +2324,11 @@ 0 DACEBF90-E2B4-4CC9-A973-B8B429AA0089 -14774017 + 2 2962 0 300 true - 2 b53a74f3-8e91-40ce-b980-c5b237baeee9 @@ -2218,13 +2351,13 @@ -1 HeaterZone4 - 80 - 27.459999999999997 + 135 + 132.82 false - true - false + false + true - 80 + 135 f786b4da-3291-4ccb-a280-196fd8697ac1 @@ -2235,11 +2368,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448DD -14774017 + 2 2962 0 300 true - 2 584c7f29-49cc-4845-a7ab-09239bd3a986 @@ -2262,13 +2395,13 @@ -1 HeaterZone12 - 0 - 283.75 + 120 + 114.25 false false true - 0 + 120 05eab3d7-3af6-4d3f-b3b3-468eeb77a503 @@ -2279,11 +2412,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448CC -14774017 + 2 2962 0 300 true - 2 c1f48bf1-9cb3-475a-b152-e8b9a211b694 @@ -2306,13 +2439,13 @@ -1 HeadCoverHeater1 - 80 - 24.919999999999998 + 0 + 283.75 false - true - false + false + true - 80 + 0 @@ -2419,14 +2552,104 @@ -14774017 valve + + a79322a7-fbb8-469b-a4d9-a0ffb3c17a5d + 639 + 358.69469026548683 + 134 + 99.300884955752167 + 0 + 94F3E5A1-413E-4EA0-BDE1-F0625BFF7910 + -1 + 10 + 2 + + + 979459b4-b609-487f-b6d7-55f435659658 + 1027 + 391.93362831858775 + 118 + 93.221238938053034 + 0 + FE0D0A56-5795-4C5A-8E09-939FBB35C441 + -1 + 10 + 2 + + + 8b11bfca-091d-4461-8713-ba2fd9c8484e + 432 + 511.69911504424789 + 461 + 250.27876106194691 + 0 + 94F3E5A1-413E-4EA0-BDE1-F0625BFF7910 + -14774017 + 2 + 419 + 0 + 100 + true + + + 8aa4b451-71d6-429c-94e4-2581e3c62a7a + 956 + 513.80973451327361 + 461 + 250.27876106194691 + 0 + FE0D0A56-5795-4C5A-8E09-939FBB35C441 + -14774017 + 2 + 419 + 0 + 100 + true + + + 1f85047c-0b3e-49c6-a80a-c2585de00a81 + 288 + 366.80088495575222 + 217 + 97.2743362831859 + 0 + B6FE07F8-2435-495D-ABFE-358C76812413 + -1 + + + c296a84d-7af4-4a26-9a35-0b82d378edce + 41 + 351.6017699115045 + 209 + 120.57964601769913 + 0 + 1778C1A7-AFB5-42F9-9E00-E80D30D9FC0A + -1 + 10 + 2 + + + ab6714cc-04d8-471f-a263-db28c30e229d + 59 + 550.2035398230089 + 294 + 171.24336283185835 + 0 + 78482AA4-3DF6-421F-944C-64328D3C3EF2 + -14774017 + 0 + 7000 + 10 + true + - fbe2670f-6d9b-4361-9332-1ceb1692c91a - 108 - 484.61946902655154 - 356 - 208.10619469026472 + cde1d5a8-7238-44b8-8d4e-30a2dba70c12 + 1294 + 166.17256637168146 + 217 + 132.73893805309734 0 - 78db28d0-0407-4942-bb62-c44da81c4f9e + 2a454081-bd5e-41de-ae5d-97aefe1d76de -1 @@ -2443,11 +2666,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 3 3600 0 100 true - 3 aae29286-81b3-476a-9f58-c0fd246cae96 @@ -2458,11 +2681,11 @@ 0 F33667BD-D9FA-4DC7-BC2C-0E89E60AE4BE -14774017 + 3 3600 0 100 true - 3 7d94c7c4-1288-4f9d-b0e6-a06794829642 @@ -2552,11 +2775,11 @@ 0 1F0F907A-EC16-4386-AFC8-B2B156F2A822 -14774017 + 3 3600 0 100 true - 3 1c254a92-c075-453f-9667-cdcc91cf8e6a @@ -2589,11 +2812,11 @@ 0 6B1DF4B0-BCC2-400C-A3B7-31C5119A55BB -14774017 + 3 3600 0 100 true - 3 0bef6e9d-6da0-4f06-9e1a-c00142bde4c1 @@ -2626,11 +2849,11 @@ 0 19645882-6587-4A50-BD85-AF06617DC654 -14774017 + 3 3600 0 100 true - 3 39f6a02c-c4d9-47d0-b92d-bdea0ed5d3ce @@ -2782,11 +3005,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 1 1942 0 100 true - 1 604e031b-89c3-4c9d-90ef-7b861a77e5e0 -- cgit v1.3.1