diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-18 17:27:56 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-18 17:27:56 +0300 |
| commit | 5d9f09e5beeb61671ab1a68b021ec6da62bc3042 (patch) | |
| tree | 7c7a01dd80cfb87d6b39df2cbe9eb434d163fdff /Software/Embedded_SW/Embedded/Modules/General | |
| parent | 121128fd6cf5bec4e20b9f67f0a4ea20b4174cf3 (diff) | |
| download | Tango-5d9f09e5beeb61671ab1a68b021ec6da62bc3042.tar.gz Tango-5d9f09e5beeb61671ab1a68b021ec6da62bc3042.zip | |
Version 1.4.6.32; enable variating control timing for thread. fix WHS pid
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 166062248..d2379c309 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -390,7 +390,7 @@ uint32_t GenHWInitCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) { uint32_t status = 0; - int Dancer_i, Dispenser_i,PID_i,tempheaterId; + int Dancer_i, Dispenser_i,PID_i,tempheaterId,DispenserId; HardwareBlowerType blowerType = HARDWARE_BLOWER_TYPE__DefaultBlower; if (UploadRequest == NULL) @@ -474,8 +474,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) (request->pidcontrols[PID_i]->hardwarepidcontroltype < HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ7)) status += IDS_DispenserPidRequestMessage(request->pidcontrols[PID_i]); else if (request->pidcontrols[PID_i]->hardwarepidcontroltype == HARDWARE_PID_CONTROL_TYPE__WasteControl) - status += WHS_PidRequestMessage(request->pidcontrols[PID_i]); - + WHS_PidRequestMessage(request->pidcontrols[PID_i]); } } else @@ -488,15 +487,16 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) { for (Dispenser_i = 0; Dispenser_i < request->n_dispensers ; Dispenser_i++) { - Valve_Set(IDS_Id_to_AirValve[Dispenser_i], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON - Valve_Set(IDS_Id_to_CartrideValve[Dispenser_i], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON + DispenserId = request->dispensers[Dispenser_i]->index; + Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON + Valve_Set(IDS_Id_to_CartrideValve[DispenserId], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON status += DispenserConfigMessage(request->dispensers[Dispenser_i]); - if (Check_Dispenser_Type(request->dispensers[Dispenser_i]->index) == LS_STATUS_ERROR) + if (Check_Dispenser_Type(DispenserId) == LS_STATUS_ERROR) { - LOG_ERROR (Dispenser_i, "Dispenser identification failed"); + LOG_ERROR (DispenserId, "Dispenser identification failed"); //return ERROR; } - status |= Dispenser_EEPROM_Read_Data(Dispenser_i); + status |= Dispenser_EEPROM_Read_Data(DispenserId); } Calculateinit(); } |