diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-03 10:32:23 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-03 10:32:23 +0200 |
| commit | ca927bad3d0336040eb826307f20165631d2580c (patch) | |
| tree | 395096cbe7d207456dd72b2661e012c0257fd4a9 /Software/Embedded_SW/Embedded | |
| parent | 0967770a1bc3bb2d543c09de5e8e0e734aca353f (diff) | |
| download | Tango-ca927bad3d0336040eb826307f20165631d2580c.tar.gz Tango-ca927bad3d0336040eb826307f20165631d2580c.zip | |
some changes in new WHS
Diffstat (limited to 'Software/Embedded_SW/Embedded')
3 files changed, 21 insertions, 8 deletions
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<HEATER_TYPE_MAX_HEATERS; i++) -#else +/*#else for (i = 0;i<MAX_HEATERS_NUM; i++) -#endif +#endif*/ DeActivateHeater(i); + + BlowerCfg.enabled = true; + BlowerCfg.voltage = 3000; + BlowerCfg.heatingvoltage = 3000; +#ifdef Use_WHS_Card + BlowerCfg.hardwareblowertype = HARDWARE_BLOWER_TYPE__WHSBlower2; +#else + BlowerCfg.hardwareblowertype = HARDWARE_BLOWER_TYPE__DefaultBlower; +#endif + return OK; } |