diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-31 18:32:20 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-31 18:32:20 +0300 |
| commit | 98880580fdb3b36efe6afcf313de76ffca255bb3 (patch) | |
| tree | f6c51ffad0894710bc674802be3a392f29a476fa /Software/Embedded_SW/Embedded/Modules/General | |
| parent | 636615fd69d4cb758fdf51d35baad73ed71d8236 (diff) | |
| parent | bd4581645434385407abdc13ae47a8faf2726078 (diff) | |
| download | Tango-98880580fdb3b36efe6afcf313de76ffca255bb3.tar.gz Tango-98880580fdb3b36efe6afcf313de76ffca255bb3.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
3 files changed, 8 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 4938035e6..4ff2e546c 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -506,6 +506,10 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) status += IDS_DispenserPidRequestMessage(request->pidcontrols[PID_i]); else if (request->pidcontrols[PID_i]->hardwarepidcontroltype == HARDWARE_PID_CONTROL_TYPE__WasteControl) WHS_PidRequestMessage(request->pidcontrols[PID_i]); + else if (request->pidcontrols[PID_i]->hardwarepidcontroltype == HARDWARE_PID_CONTROL_TYPE__HeadBlower_1) + HeadBlowerPidRequestMessage(request->pidcontrols[PID_i], HEAD_FAN_RIGHT); + else if (request->pidcontrols[PID_i]->hardwarepidcontroltype == HARDWARE_PID_CONTROL_TYPE__HeadBlower_2) + HeadBlowerPidRequestMessage(request->pidcontrols[PID_i], HEAD_FAN_LEFT); } } else diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c index d41b3c1a0..7490cef69 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.c +++ b/Software/Embedded_SW/Embedded/Modules/General/process.c @@ -41,6 +41,7 @@ double dryerairflow = 5.0; double pressurebuildup = 0; double dryerzone1temp = 0; int32_t tableindex = 0; +double headBlowersFlow[2] = {1.5,1.5}; double dryerbufferMeters = 0; double dryerbufferCentimeters = 0; @@ -303,9 +304,9 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData) { status |= HeaterCommandRequestMessage(HARDWARE_PID_CONTROL_TYPE__HeadCoverHeater2, false,ProcessParams->lblowertemp); } + headBlowersFlow[HEAD_FAN_RIGHT] = ProcessParams->rblowerflow; + headBlowersFlow[HEAD_FAN_LEFT] = ProcessParams->lblowerflow; Trigger_HeaterWriting(); - Trigger_Head_Fan_Control(HEAD_FAN_RIGHT,ProcessParams->rblowerflow); - Trigger_Head_Fan_Control(HEAD_FAN_LEFT,ProcessParams->lblowerflow); } if (status) diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.h b/Software/Embedded_SW/Embedded/Modules/General/process.h index 7cd592aad..f7f16d11e 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.h +++ b/Software/Embedded_SW/Embedded/Modules/General/process.h @@ -19,6 +19,7 @@ extern double headairflow; extern double dryerairflow; extern double pressurebuildup; extern double dryerzone1temp; +extern double headBlowersFlow[2]; extern int32_t tableindex; |