diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2020-02-02 16:12:45 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2020-02-02 16:12:45 +0200 |
| commit | 9cf2e318f78831eb056ef7a11e93494d7301ee85 (patch) | |
| tree | d1909ba72fc400dfda0fb00650c64aafba04242a /Software/Embedded_SW/Embedded/Modules | |
| parent | aabec2c2686c9a99f56ce6e2e501a50b1d3e6431 (diff) | |
| parent | 0967770a1bc3bb2d543c09de5e8e0e734aca353f (diff) | |
| download | Tango-9cf2e318f78831eb056ef7a11e93494d7301ee85.tar.gz Tango-9cf2e318f78831eb056ef7a11e93494d7301ee85.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 34 |
2 files changed, 25 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 36726f7e4..6d92e06c9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -778,6 +778,7 @@ uint32_t MillisecLowLoop(uint32_t tick) }*/ midtankDisplay = 1-midtankDisplay; Gas_PPM_Info = Calculate_Gas_Power_Consumption(); + Trigger_WHS_MAX11614_Read_allADC(); } if (OneHourTick) diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 76cb9afbe..82d2dc226 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -490,17 +490,31 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) ThreadConfigBreakSensor(request->breaksensors[0]); } - if(request->blowers[0]->enabled) - { - BlowerCfg.enabled = true; - BlowerCfg.voltage = request->blowers[0]->voltage; - BlowerCfg.heatingvoltage = request->blowers[0]->heatingvoltage; - } - else + BlowerCfg.enabled = true; + BlowerCfg.voltage = 3000; + BlowerCfg.heatingvoltage = 3000; +#ifdef Use_WHS_Card + HardwareBlowerType blowerType = HARDWARE_BLOWER_TYPE__WHSBlower2; +#else + HardwareBlowerType blowerType = HARDWARE_BLOWER_TYPE__DefaultBlower; +#endif + if (request->n_blowers) { - BlowerCfg.enabled = true; - BlowerCfg.voltage = 3000; - BlowerCfg.heatingvoltage = 3000; + for (Dispenser_i = 0; Dispenser_i < request->n_blowers ; Dispenser_i++) + { + if (request->blowers[Dispenser_i]->hardwareblowertype == blowerType) + { + if(request->blowers[Dispenser_i]->enabled) + { + BlowerCfg.enabled = true; + BlowerCfg.voltage = request->blowers[Dispenser_i]->voltage; + BlowerCfg.heatingvoltage = request->blowers[Dispenser_i]->heatingvoltage; + } + Report("blower config", __FILE__,Dispenser_i,(int)request->blowers[Dispenser_i]->hardwareblowertype, RpMessage, (int)request->blowers[Dispenser_i]->voltage, 0); + + break; + } + } } //from now on starting blower on INIT, so that the chiller does not freeze /*if (BlowerCfg.enabled == true) |