diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
5 files changed, 10 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index fef3f05a8..eb855fd4a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -422,7 +422,7 @@ void DiagnosticLoadDancerError(int DancerId, double value) double Shinko_Sv = 12,Shinko_Pv = 15; void LoadChillerState(HeaterType HeaterType,HeaterState *HeaterState) { - int HeaterId = HeaterType; + //int HeaterId = HeaterType; HeaterState->has_heatertype = true; HeaterState->heatertype = HeaterType; HeaterState->has_setpoint = true; @@ -611,7 +611,6 @@ void DiagnosticTenMsecCollection(void) void DiagnosticOneMinuteCollection(void) { int i; - bool status = OK; DiagnosticsMonitor.n_dispensersinklevel = 0; DiagnosticsMonitor.n_midtanksinklevel = 0; @@ -677,7 +676,7 @@ void DiagnosticOneMinuteCollection(void) { if (Get_Head_Heater_Current_Reading_State(i) == true) { - status = Get_Head_Current(i,&HeadCurrent[i][0]); + Get_Head_Current(i,&HeadCurrent[i][0]); switch(i) { case HEAD_CURRENT_ZONE_1: diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index 7f8c9b8d8..c7f8740d1 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -34,6 +34,7 @@ #include "ids/ids_ex.h" #include "General/process.h" +#include "Thread/Thread_ex.h" #include "StateMachines/Printing/PrintingSTM.h" diff --git a/Software/Embedded_SW/Embedded/Modules/General/Safety.c b/Software/Embedded_SW/Embedded/Modules/General/Safety.c index 422b4745f..ebbc3d326 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/Safety.c +++ b/Software/Embedded_SW/Embedded/Modules/General/Safety.c @@ -46,7 +46,7 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag) bool mDrierDoorAlarmState = false; bool mAirFlowAlarmState = false; bool mAirFilterAlarmState = false; - bool mWasteOverflowAlarmState = false; + //bool mWasteOverflowAlarmState = false; #ifdef CONTROL_DEBUG uint32_t tempp,tempq,delta; uint32_t sys_ticks_start = msec_millisecondCounter,sys_ticks_end,max = 0,dev = 0; @@ -97,7 +97,7 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag) { //report and handle waste overflow AlarmHandlingSetAlarm(EVENT_TYPE__CHILLER_DRY_CONTACT, true); - mWasteOverflowAlarmState = true; + //mWasteOverflowAlarmState = true; WasteOverflowAlarmState = true; } } diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 051df3b05..b9b916eb6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -330,7 +330,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) { uint16_t tempu16 = 0; double temp_double = 0.0; - uint8_t display_byte = 0; + //uint8_t display_byte = 0; uint16_t A2D_data = 0; if (WHS_Type == WHS_TYPE_NEW) @@ -393,13 +393,13 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) tempu16 = 0; //get_cur_vlv2(&tempu16); break; case 10: - temp_double = get_Q(HEAD_FLOW_METER); + temp_double = WHS_Blower_Avarege(HEAD_FLOW_METER); break; case 11: - temp_double = get_Q(NU_FLOW_METER); + temp_double = WHS_Blower_Avarege(NU_FLOW_METER); break; case 12: - temp_double = get_Q(DRIER_FLOW_METER); + temp_double = WHS_Blower_Avarege(DRIER_FLOW_METER); break; /*case 20: //temp_double = get_average_Q(HEAD_FLOW_METER); //HEAD diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h index 5d69e2980..0861b677b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h @@ -90,5 +90,6 @@ uint32_t StopThreadLoadingFunc(MessageContainer* requestContainer); uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer); void ThreadCheckArcHeadCovers(void); uint32_t Thread_Load_End(void); +uint32_t ThreadLoadingRestartReport(void); //sending after a failure in the finalizing stage #endif |