Index: DDDefs.h =================================================================== diff -u -r7fc2917f51b089d21122bfd4869039df8a13386f -r3b5efb297a908ad37a63dafef403e82072bc5a48 --- DDDefs.h (.../DDDefs.h) (revision 7fc2917f51b089d21122bfd4869039df8a13386f) +++ DDDefs.h (.../DDDefs.h) (revision 3b5efb297a908ad37a63dafef403e82072bc5a48) @@ -240,18 +240,6 @@ }; typedef enum DD_Heat_UI_States DD_HEAT_DISINFECT_UI_STATE_T; ///< Type for DD heat disinfect UI states enumeration -#if defined(_TD_) || defined(_DD_) -/// Heat disinfect data publish struct -typedef struct -{ - U32 heatDisinfectState; ///< Heat disinfect state. - U32 overallElapsedTime; ///< Overall elapsed time in heat disinfect mode. - U32 stateElapsedTime; ///< Current heat disinfect elapsed time. - U32 cancellationMode; ///< Heat disinfect cancellation mode. - U32 heatDisinfectUIState; ///< Heat disinfect UI state. -} MODE_HEAT_DISINFECT_DATA_T; -#endif - /// Cancellation paths enum Cancellation_modes { @@ -314,6 +302,7 @@ enum DD_Event_List { DD_EVENT_STARTUP = 0, ///< DD startup event + DD_EVENT_FIRST = DD_EVENT_STARTUP, ///< DD first event in list DD_EVENT_OP_MODE_CHANGE, ///< DD Op mode change event DD_EVENT_SUB_MODE_CHANGE, ///< DD Op sub-mode change event DD_EVENT_OPERATION_STATUS, ///< DD operation status event @@ -326,6 +315,19 @@ DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, ///< DD blood leak zeroing required DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, ///< DD blood leak number of setpoint check failures DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD blood leak self test result + DD_EVENT_LAST = DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD last event in list + FP_EVENT_STARTUP, ///< FP startup event + FP_EVENT_FIRST = FP_EVENT_STARTUP, ///< FP first event in list + FP_EVENT_OP_MODE_CHANGE, ///< FP Op mode change event + FP_EVENT_SUB_MODE_CHANGE, ///< FP Op sub-mode change event + FP_EVENT_PRE_GEN_RO_SET_PWM, ///< FP gen permeate ro set pwm event + FP_EVENT_GENP_BOOST_SET_PWM, ///< FP gen permeate boost set pwm event + FP_EVENT_GENP_CHANGE, ///< FP gen permeate state change + FP_EVENT_PRE_GEN_CHANGE, ///< FP pre gen state change + FP_EVENT_PRE_GEN_DEF_CHANGE, ///< FP defeatured pre gen state change + FP_EVENT_GENP_DEF_CHANGE, ///< FP defeatured pre gen state change + FP_EVENT_FAULT_ALARM_TRIGGER, ///< FP event for alarms that would trigger + FP_EVENT_LAST = FP_EVENT_FAULT_ALARM_TRIGGER, ///< FP last event in list NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration @@ -359,8 +361,9 @@ /// Enumeration of valves. enum DD_Valves { - FIRST_HYD_VALVE = 0, ///< Start of Hydraulics valve group - D14_VALV = FIRST_HYD_VALVE, ///< Valve Hydraulics Outlet (D14) + D14_VALV = 0, ///< Valve Hydraulics Outlet (D14) + FIRST_DD_VALVE = D14_VALV, ///< First DD valve + FIRST_HYD_VALVE = D14_VALV, ///< Start of Hydraulics valve group D52_VALV, ///< Valve Thermal Disinfect (D52) D8_VALV, ///< Valve Hydraulics Bypass (D8) D54_VALV, ///< Valve Rinse Port (D54) @@ -373,27 +376,43 @@ D40_VALV, ///< Valve Dialyzer Outlet (D40) D47_VALV, ///< Valve Dialysate Out Purge 2 (D47) D3_VALV, ///< Valve Hydraulics Inlet (D3) - // For standalone DD system, may need to control IO valve. - DD_M4_VALV, ///< Valve Water Inlet (M4) - LAST_HYD_VALVE = DD_M4_VALV, ///< End of Hydraulics valve of group + D80_VALV, ///< Valve Dry Bicarb (D80) + D81_VALV, ///< Valve De-scaler (D81) + LAST_HYD_VALVE = D81_VALV, ///< End of Hydraulics valve of group RSRVD_SPACE1, ///< This space has been reserved - RSRVD_SPACE2, ///< This space has been reserved FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) D19_VALV, ///< Balancing chamber Valve 2 (D19) D25_VALV, ///< Balancing chamber Valve 3 (D25) - D26_VALV, ///< Balancing chamber Valve 7 (D26) + D21_VALV, ///< Balancing chamber Valve 4 (D21) D24_VALV, ///< Balancing chamber Valve 5 (D24) D20_VALV, ///< Balancing chamber Valve 6 (D20) - D21_VALV, ///< Balancing chamber Valve 4 (D21) + D26_VALV, ///< Balancing chamber Valve 7 (D26) D22_VALV, ///< Balancing chamber Valve 8 (D22) LAST_BC_VALVE = D22_VALV, ///< End of Balancing Chamber valve group - FIRST_UF_VALVE, ///< Start of Ultrafiltration valve group - D69_VALV = FIRST_UF_VALVE, ///< Ultrafiltration Valve 1 Inlet (D69) - D71_VALV, ///< Ultrafiltration Valve 2 Inlet (D71) - D70_VALV, ///< Ultrafiltration Valve 1 Outlet (D70) - D72_VALV, ///< Ultrafiltration Valve 2 Outlet (D72) - LAST_UF_VALVE = D72_VALV, ///< End of Ultrafiltration valve group + D79_PMP_VALV, ///< D79 Pump mapped to Spare valve 0 + FIRST_SP_VALVE = D79_PMP_VALV, ///< First spare valve + SPARE1_VALV, ///< Spare Valve 1 + SPARE2_VALV, ///< Spare Valve 2 + SPARE3_VALV, ///< Spare Valve 3 + SPARE4_VALV, ///< Spare Valve 4 + SPARE5_VALV, ///< Spare Valve 5 + SPARE6_VALV, ///< Spare Valve 6 + SPARE7_VALV, ///< Spare Valve 7 + LAST_SP_VALVE = SPARE7_VALV, ///< Last spare valve + LAST_DD_VALVE = LAST_SP_VALVE, ///< Last DD valve + M4_VALV, ///< Valve (M4) + FIRST_IO_VALVE = M4_VALV, ///< First IO valve + LAST_IO_VALVE = M4_VALV, ///< Last IO valve + P11_VALV, ///< Valve (P11) + FIRST_FP_VALVE = P11_VALV, ///< First FP valve + P33_VALV, ///< Valve (P33) + P34_VALV, ///< Valve (P34) + P37_VALV, ///< Valve (P37) + P39_VALV, ///< Valve (P39) + P43_VALV, ///< Valve (P43) + P6_VALV, ///< Valve (P6) + LAST_FP_VALVE = P6_VALV, ///< Last FP valve DD_NUM_OF_VALVES ///< Number of valves }; typedef enum DD_Valves DD_VALVES_T;