diff options
| author | Ronen Sberlo <ronen.s@twine-s.com> | 2020-10-07 13:23:14 +0300 |
|---|---|---|
| committer | Ronen Sberlo <ronen.s@twine-s.com> | 2020-10-07 13:23:14 +0300 |
| commit | 70fe24a9044c15f44968d1e4936e4c0b510ef372 (patch) | |
| tree | 2c15b67c98f91ec4f24938d545d3aee7090a377c /Software/Embedded_SW/Embedded/Modules | |
| parent | 4657ee699f089d14d0372e46d5f259fa4db68a65 (diff) | |
| parent | cae0bfc060f16dd75661ebba88d3c905dd2ac875 (diff) | |
| download | Tango-70fe24a9044c15f44968d1e4936e4c0b510ef372.tar.gz Tango-70fe24a9044c15f44968d1e4936e4c0b510ef372.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
4 files changed, 11 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 5f1c0ffaf..dd885b6af 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -777,6 +777,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { //Trigger_WHS_PT100_Read_All(); WHS_Blower_Avarege(HEAD_FLOW_METER); + WHS_Blower_Avarege(NU_FLOW_METER); WHS_Blower_Avarege(DRIER_FLOW_METER); WHS_Start_Blower_Control_Closed_Loop (); diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 537f942b6..16010b908 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -117,7 +117,7 @@ double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT+1]; double dispenserinklevel[MAX_SYSTEM_DISPENSERS][1]; double midtankinklevel[MAX_SYSTEM_DISPENSERS][1]; double MidTankpressure[MAX_SYSTEM_DISPENSERS][1]; -double HeadFlowMeter; +double HeadFlowMeter,TotalFlowMeter; //double tempFlow = 0.0; double DrierFlowMeter; double AcVoltage; @@ -897,6 +897,11 @@ void DiagnosticOneSecCollection(void) HeadFlowMeter = GetWHSAirFlow(HEAD_FLOW_METER); DiagnosticsMonitor.n_headairflow = 1; DiagnosticsMonitor.headairflow = &HeadFlowMeter; + + TotalFlowMeter = GetWHSAirFlow(NU_FLOW_METER); + DiagnosticsMonitor.n_totalwhsflow = 1; + DiagnosticsMonitor.totalwhsflow = &TotalFlowMeter; + /*if (fabs(tempFlow - HeadFlowMeter)>0.25) { Report("Head flow change 1s",__FILE__,(int)diagvoltage,(int)(tempFlow*1000),RpWarning,(int)(HeadFlowMeter*1000),0); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 00e480891..2abcc2b31 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1187,7 +1187,7 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); return OK; } - if (MaxreadValue <= (HeaterControl[index].sensormaxvalue-HeaterControl[index].sensorminvalue)) //was MinreadValue + if (BlowerPt100Read <= (HeaterControl[index].sensormaxvalue-HeaterControl[index].sensorminvalue)) //was MinreadValue { if (HeaterControl[index].sensorminvalue > 0) { diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index b23985103..e4a573e7b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -398,6 +398,9 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) case 10: temp_double = get_Q(HEAD_FLOW_METER); break; + case 11: + temp_double = get_Q(NU_FLOW_METER); + break; case 12: temp_double = get_Q(DRIER_FLOW_METER); break; |