Index: DDDefs.h =================================================================== diff -u -rb911d37d6ea4a9fcf48fcd9eb5d5070b7f5e493f -r3b5efb297a908ad37a63dafef403e82072bc5a48 --- DDDefs.h (.../DDDefs.h) (revision b911d37d6ea4a9fcf48fcd9eb5d5070b7f5e493f) +++ DDDefs.h (.../DDDefs.h) (revision 3b5efb297a908ad37a63dafef403e82072bc5a48) @@ -384,13 +384,23 @@ 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 - LAST_DD_VALVE = D22_VALV, ///< Last DD valve + 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 Index: MsgDefs.h =================================================================== diff -u -r5b7a0d7a09ff9bff875f85221257e75fbf950031 -r3b5efb297a908ad37a63dafef403e82072bc5a48 --- MsgDefs.h (.../MsgDefs.h) (revision 5b7a0d7a09ff9bff875f85221257e75fbf950031) +++ MsgDefs.h (.../MsgDefs.h) (revision 3b5efb297a908ad37a63dafef403e82072bc5a48) @@ -129,6 +129,7 @@ MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62, ///< FP Inlet Pressure Check broadcast data MSG_ID_DD_VOLTAGES_DATA = 0x63, ///< DD voltage broadcast data + MSG_ID_DD_RINSE_PUMP_DATA = 0x64, ///< DD rinse pump data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID