diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-25 13:37:47 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-25 13:37:47 +0200 |
| commit | 14dabcafd0458b239aee0348dd60c626ee1699b4 (patch) | |
| tree | 39b23cf0846c7c5deaabe4d544d281530a508ece /Software/Embedded_SW/Embedded/Drivers | |
| parent | 63f3186821cfa8db9770dcd6b305b385eb75ed6e (diff) | |
| parent | e4be70dce32657332524a879aa1f04bc184f9890 (diff) | |
| download | Tango-14dabcafd0458b239aee0348dd60c626ee1699b4.tar.gz Tango-14dabcafd0458b239aee0348dd60c626ee1699b4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
3 files changed, 15 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index 4484f1932..ce6b34dd9 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -406,11 +406,19 @@ void WHS_Set_IFS_Clearing_Suction (int midtank) } Report("------------ WHS_Set_IFS_Clearing_Suction :-----------------", __FILE__,__LINE__, (int) IFS_Clearing_Suction, RpMessage, (int)JobIsActive(), 0); } -#define JobEndSuctionTime 30 +#define JOB_END_SUCTION_TIME 30 +int SublimationBlowTime = JOB_END_SUCTION_TIME; +void setSublimationBlowTime(int Time) +{ + SublimationBlowTime = Time; +} void WHS_Set_JobEndSuction (void) { - JobEndSuction = true; - Report("------------ WHS_Set_JobEndSuction :-----------------", __FILE__,__LINE__, (int) JobEndSuction, RpMessage, (int)JobIsActive(), 0); + if (SublimationBlowTime) + { + JobEndSuction = true; + } + Report("------------ WHS_Set_JobEndSuction :-----------------", __FILE__,SublimationBlowTime, (int) JobEndSuction, RpMessage, (int)JobIsActive(), 0); } #define MAX_ALLOWED_BLOWER_VOLTAGE 4300 @@ -492,9 +500,9 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value) if (JobEndSuction == true) { JobEndSuction = false; - Report("------------ Job end Clearing Suction -----------------", __FILE__,__LINE__, (int)4000, RpMessage, (int)JobEndSuctionTime, 0); + Report("------------ Job end Clearing Suction -----------------", __FILE__,__LINE__, (int)4000, RpMessage, (int)SublimationBlowTime, 0); Control_Voltage_To_Blower(4000); - close_loop_time = JobEndSuctionTime; + close_loop_time = SublimationBlowTime; return OK; } volt = getBlowerState(); diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h index 3033d6d06..391aa6185 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h @@ -29,6 +29,7 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value); void WHS_Start_Blower_Control_Closed_Loop (void); void WHS_Set_IFS_Clearing_Suction (int midtank); void WHS_Set_JobEndSuction (void); +void setSublimationBlowTime(int Time); double WHS_Get_Blower_Control_Closed_Loop_SetPoint(void); void WHS_Set_SetPoint_Q_value(double value); diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index 5d58c2cdf..748eb79c7 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -250,6 +250,7 @@ void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE break; case VALVE_DISPENSER_8: Dispenser_Valve_GPO_Reg.bits.F2_DISPENSER_VALVE_C1_8_C2_8= ValveRequest[Valve_Id].Direction; + REPORT_MSG(ValveRequest[Valve_Id].Direction,"Dispenser 8 Set valve direction"); break; default: |