From ca927bad3d0336040eb826307f20165631d2580c Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 3 Feb 2020 10:32:23 +0200 Subject: some changes in new WHS --- .../Embedded/Common/SWUpdate/FileSystem.c | 5 +- .../WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c | 8 +- .../Embedded/Modules/Heaters/Heaters_init.c | 16 +- .../stubs/technician view files/new head.tpf | 294 ++++++++++++++------- 4 files changed, 214 insertions(+), 109 deletions(-) (limited to 'Software') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 89039d2a6..8aabafd2e 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -106,10 +106,11 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) Fresult = f_open(UploadFileHandle,request->path,FA_READ | FA_WRITE | FA_OPEN_ALWAYS | FA_CREATE_ALWAYS); if (Fresult == FR_OK) { - //Report("FileUploadRequestFunc 3", __FILE__, __LINE__, msec_millisecondCounter, RpWarning, (int)0, 0); + usnprintf(ErrorMsg, 100, "file upload request %s %d",request->path,request->length); + + Report(ErrorMsg, __FILE__, __LINE__, request->length, RpWarning, (int)MAX_CHUNK_LENGTH, 0); FileLength = request->length; FileReceivedLength = 0; - REPORT_MSG (FileLength,"file upload request"); response.has_maxchunklength = true; response.maxchunklength = MAX_CHUNK_LENGTH; strcpy(FileHandleChar, "1234"); diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c index 3ac621fc5..3c4dcb522 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c @@ -177,7 +177,7 @@ bool Test_WHS_max11614() #define Aorf_ofset 0.0425 -#define Corf_flow 0.2485 +#define Corf_flow 0.239 double get_Q(uint16_t num) { @@ -254,7 +254,7 @@ bool get_orf_1(uint16_t *value) // U34 connected to AIN2 - +uint16_t Orf_zero_value[HEAD_FLOW_METER+1] = {1112,0,1040}; double GetWHSAirFlow(uint8_t OR_Id) @@ -275,7 +275,9 @@ double GetWHSAirFlow(uint8_t OR_Id) break; } - return get_Q(value); + ReportWithPackageFilter(WasteFilter,"GetWHSAirFlow",__FILE__,OR_Id,(int)value,RpWarning,(int) Orf_zero_value[OR_Id],0); + + return get_Q(value-Orf_zero_value[OR_Id]); } diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c index 78ae37eef..d20f0511b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c @@ -69,12 +69,22 @@ uint32_t Heaters_Init(void) FPGA_SensorInitConfig(); memset(HeaterControl,0,sizeof(HeaterControl)); -#ifdef Use_Head_Card +//#ifdef Use_Head_Card for (i = 0;i DryerAirHeater 0 - 279.63 + 86.429999999999993 false false true @@ -60,7 +60,7 @@ DryerMainHeater 0 - 8.5 + 86.149999999999991 false false true @@ -79,7 +79,7 @@ DryerSecondaryHeater 0 - 119.35 + 86.69 false false true @@ -98,7 +98,7 @@ HeaterZone3 0 - 8.5 + 131.21 false false true @@ -117,7 +117,7 @@ HeaterZone2 0 - 8.5 + 162.58 false false true @@ -136,7 +136,7 @@ HeaterZone1 0 - 8.5 + 144.21 false false true @@ -155,7 +155,7 @@ MixerHeater 0 - 8.5 + 107.16 false false true @@ -174,7 +174,7 @@ HeaterZone4 0 - 8.5 + 99.13 false false true @@ -193,7 +193,7 @@ HeaterZone5 0 - 8.5 + 80.57 false false true @@ -212,7 +212,7 @@ HeaterZone6 0 - 8.5 + 76.78 false false true @@ -303,7 +303,7 @@ HeaterZone7 0 - -2 + 83.94 false false true @@ -342,7 +342,7 @@ HeaterZone8 0 - -2 + 79.47 false false true @@ -361,7 +361,7 @@ HeaterZone9 0 - -2 + 82.41 false false true @@ -380,7 +380,7 @@ HeaterZone12 0 - -2 + 76.39 false false true @@ -399,7 +399,7 @@ HeaterZone11 0 - -2 + 84.97 false false true @@ -418,7 +418,7 @@ HeaterZone10 0 - -2 + 86.27 false false true @@ -444,15 +444,15 @@ 0 0 0 - 12 - 100 - 100 - 95 - 100 - 100 - 99 + 111 + 111 + 111 + 111 + 111 + 111 + 111 0 - 100 + 111 0 0 0 @@ -822,7 +822,7 @@ HeadCoverHeater1 0 - -2 + 283.75 false false true @@ -841,13 +841,37 @@ HeadCoverHeater2 0 - -2 + 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 + @@ -910,11 +934,11 @@ 0 D126DB23-784B-4F0C-8F88-D89A65A7549F -14774017 + 1 1460 + true 0 16384 - true - 1 984b4126-3dda-4624-a79f-0646eb0e1358 @@ -925,11 +949,11 @@ 0 10102BC3-0EAE-47FF-A8E5-8640780CAA3D -14774017 + 1 1516 + true 0 16384 - true - 1 8ebc3ab7-a02d-4b12-93b3-2563443831d7 @@ -940,11 +964,11 @@ 0 C0BCCD5C-346B-4C4A-A080-39D28E9E1A0C -14774017 + 1 1398 + true 0 16384 - true - 1 acafb268-5e97-4277-8dc8-173250a9e3f8 @@ -955,11 +979,11 @@ 0 9FBC5460-BA59-486B-8D85-BD7D8A959F98 -14774017 + 1 1273 + true 0 100 - true - 1 3ccb1485-b0e9-4d36-a931-a1b3865edeaa @@ -981,11 +1005,11 @@ 0 4CE6A82E-D841-4D33-BBB2-11F0743A441C -14774017 + 1 514 + true 0 100000 - true - 1 75b99507-4eba-4b11-b52e-26732d4c5479 @@ -996,11 +1020,11 @@ 0 F1DF490B-0577-4FA7-ACA1-0EEF4F934E8F -14774017 + 4 1398 + true 0 100 - true - 4 a30e48de-be76-4230-92d0-d27d6f37b940 @@ -1011,11 +1035,11 @@ 0 5F12B974-2C9E-4DDD-9B20-733251A5D7E6 -14774017 + 4 1398 + true 0 100 - true - 4 5ac4b368-093a-4192-98d4-e9d24f229b13 @@ -1026,11 +1050,11 @@ 0 84CF23C9-D20D-4C08-BE1D-80201FC43C06 -14774017 + 4 1398 + true 0 100 - true - 4 9c34dc69-cfaa-48b4-9d02-8f0d9bba79dd @@ -1482,11 +1506,11 @@ 0 1F0F907A-EC16-4386-AFC8-B2B156F2A822 -14774017 + 3 1426 + true 0 100 - true - 3 cc99a514-1498-4b93-a4eb-4e0a2a2e9de6 @@ -1497,11 +1521,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 1 1282 + true 0 100 - true - 1 cdddd48e-422d-48f4-8397-5032c3705fdb @@ -1707,11 +1731,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448FB -14774017 + 2 2962 + true 0 300 - true - 2 81b78212-14d8-4a66-bf3a-eeea9900e0d6 @@ -1735,7 +1759,7 @@ HeaterZone7 0 - -2 + 83.94 false false true @@ -1751,11 +1775,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44809 -14774017 + 2 2962 + true 0 300 - true - 2 064bd571-4250-4ea3-8ed5-96f1ddc8fe6b @@ -1779,7 +1803,7 @@ HeaterZone9 0 - -2 + 82.41 false false true @@ -1795,11 +1819,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44812 -14774017 + 2 2962 + true 0 300 - true - 2 85e9ecc2-3bce-4055-89a9-1712752898a9 @@ -1823,7 +1847,7 @@ HeadCoverHeater2 0 - -2 + 283.75 false false true @@ -1839,11 +1863,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44811 -14774017 + 2 2962 + true 0 300 - true - 2 5ed86083-bdd6-4648-b7ca-f17fa97f034a @@ -1867,7 +1891,7 @@ HeaterZone11 0 - -2 + 84.97 false false true @@ -1883,11 +1907,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44810 -14774017 + 2 2962 + true 0 300 - true - 2 e8130372-e0ee-4c1c-a43d-4ab15ff57bd8 @@ -1911,7 +1935,7 @@ HeaterZone10 0 - -2 + 86.27 false false true @@ -1927,11 +1951,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E44808 -14774017 + 2 2962 + true 0 300 - true - 2 e7935033-56c6-42a4-a2b3-f5eedb0a11e7 @@ -1955,7 +1979,7 @@ HeaterZone8 0 - -2 + 79.47 false false true @@ -1971,11 +1995,11 @@ 0 D7585119-4A42-4370-8F1E-F3E62553E588 -14774017 + 2 2962 + true 0 300 - true - 2 b3826c8e-1d82-4f4f-ad9f-d88f257dffb2 @@ -1999,7 +2023,7 @@ HeaterZone3 0 - 8.5 + 131.21 false false true @@ -2015,11 +2039,11 @@ 0 098F7CAB-030C-46B0-B2B8-A85AF2253032 -14774017 + 2 2962 + true 0 100 - true - 2 233f0076-7595-4ecb-8496-41eeb7b457ea @@ -2043,7 +2067,7 @@ HeaterZone1 0 - 8.5 + 144.21 false false true @@ -2059,11 +2083,11 @@ 0 A8DB1D27-6B25-4FB4-A3F5-46A29BA51955 -14774017 + 2 2962 + true 0 300 - true - 2 72d7192b-dd27-4064-9f5f-90062388a81c @@ -2087,7 +2111,7 @@ HeaterZone2 0 - 8.5 + 162.58 false false true @@ -2103,11 +2127,11 @@ 0 246C2551-5EFD-48E9-94F6-6313C5E5018F -14774017 + 2 2962 + true 0 300 - true - 2 5f451443-fab2-4bf6-8f21-5e038ca2c726 @@ -2131,7 +2155,7 @@ HeaterZone6 0 - 8.5 + 76.78 false false true @@ -2147,11 +2171,11 @@ 0 6C0C1AB0-3EE9-40D7-8424-A79436FBC804 -14774017 + 2 2962 + true 0 300 - true - 2 665593d6-e689-459e-94f9-2cdcce6150ac @@ -2175,7 +2199,7 @@ HeaterZone5 0 - 8.5 + 80.57 false false true @@ -2191,11 +2215,11 @@ 0 DACEBF90-E2B4-4CC9-A973-B8B429AA0089 -14774017 + 2 2962 + true 0 300 - true - 2 b53a74f3-8e91-40ce-b980-c5b237baeee9 @@ -2219,7 +2243,7 @@ HeaterZone4 0 - 8.5 + 99.13 false false true @@ -2235,11 +2259,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448DD -14774017 + 2 2962 + true 0 300 - true - 2 584c7f29-49cc-4845-a7ab-09239bd3a986 @@ -2263,7 +2287,7 @@ HeaterZone12 0 - -2 + 76.39 false false true @@ -2279,11 +2303,11 @@ 0 0E4783A1-B8DE-451E-B357-322C39E448CC -14774017 + 2 2962 + true 0 300 - true - 2 c1f48bf1-9cb3-475a-b152-e8b9a211b694 @@ -2307,7 +2331,7 @@ HeadCoverHeater1 0 - -2 + 283.75 false false true @@ -2429,6 +2453,74 @@ 78db28d0-0407-4942-bb62-c44da81c4f9e -1 + + 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 + true + 0 + 100 + + + 8aa4b451-71d6-429c-94e4-2581e3c62a7a + 956 + 513.80973451327361 + 461 + 250.27876106194691 + 0 + FE0D0A56-5795-4C5A-8E09-939FBB35C441 + -14774017 + 2 + 419 + true + 0 + 100 + + + a4c498bc-8fb0-4b56-b448-6144afe447c9 + 30 + 356.66814159292045 + 241 + 131.7256637168141 + 0 + 78482AA4-3DF6-421F-944C-64328D3C3EF2 + -14774017 + 10 + 0 + 7000 + true + @@ -2443,11 +2535,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 3 3600 + true 0 100 - true - 3 aae29286-81b3-476a-9f58-c0fd246cae96 @@ -2458,11 +2550,11 @@ 0 F33667BD-D9FA-4DC7-BC2C-0E89E60AE4BE -14774017 + 3 3600 + true 0 100 - true - 3 7d94c7c4-1288-4f9d-b0e6-a06794829642 @@ -2552,11 +2644,11 @@ 0 1F0F907A-EC16-4386-AFC8-B2B156F2A822 -14774017 + 3 3600 + true 0 100 - true - 3 1c254a92-c075-453f-9667-cdcc91cf8e6a @@ -2589,11 +2681,11 @@ 0 6B1DF4B0-BCC2-400C-A3B7-31C5119A55BB -14774017 + 3 3600 + true 0 100 - true - 3 0bef6e9d-6da0-4f06-9e1a-c00142bde4c1 @@ -2626,11 +2718,11 @@ 0 19645882-6587-4A50-BD85-AF06617DC654 -14774017 + 3 3600 + true 0 100 - true - 3 39f6a02c-c4d9-47d0-b92d-bdea0ed5d3ce @@ -2782,11 +2874,11 @@ 0 A499E5E0-A812-4032-8F96-B38C6762C4BD -14774017 + 1 1942 + true 0 100 - true - 1 604e031b-89c3-4c9d-90ef-7b861a77e5e0 @@ -2811,5 +2903,5 @@ - 3 + 0 \ No newline at end of file -- cgit v1.3.1