Index: AlarmDefs.h =================================================================== diff -u -r05adee0d7d3f6b17107399421a5f11e6680b46a7 -r20715ecef1276ccdb303fa9603d75722df8df700 --- AlarmDefs.h (.../AlarmDefs.h) (revision 05adee0d7d3f6b17107399421a5f11e6680b46a7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 20715ecef1276ccdb303fa9603d75722df8df700) @@ -115,7 +115,13 @@ ALARM_ID_RO_FPGA_COMM_TIMEOUT = 84, ///< RO FPGA communication timeout ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS = 85, ///< RO too many bad crcs ALARM_ID_RO_VALVE_CONTROL_FAILURE = 86, ///< RO valve control failure - + ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE = 87, ///< DD balance chamber state1 fill start pressure not in range + ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE = 88, ///< DD balance chamber state1 fill end pressure not in range + ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE = 89, ///< DD balance chamber state2 fill start pressure not in range + ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE = 90, ///< DD balance chamber state2 fill end pressure not in range + ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE = 91, ///< DD generate dialysate hydraulics chamber pressure out of range + ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE = 92, ///< DD generate dialysate fresh dialysate pressure out of range + ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE = 93, ///< DD generate dialysate spent dialysate pressure out of range NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -338,6 +344,13 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_VALVE_CONTROL_FAILURE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -411,6 +424,13 @@ { 110, ALARM_ID_DD_WATER_INLET_INPUT_PRES_TIMEOUT_FAULT }, { 110, ALARM_ID_DD_WATER_INLET_OUTPUT_PRES_TIMEOUT_FAULT }, { 110, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, + { 110, ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, @@ -489,10 +509,10 @@ { 33 , ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: Voltage Monitor | TD monitored voltage is out of range | If the TD monitored voltages are out of range for a certain period of time. | "}, { 34 , ALARM_ID_TD_AC_POWER_LOST , "TD | Power Loss | AC Power has been lost.\n- Check all electrical connections.\n- Press Resume/OK to return to welcome screen. | Loss of AC Power | TD AC power lost alarm | The TD Software shall trigger an alarm if an AC power loss is detected while the TD system is in standby, service, or treatment parameters mode. | "}, { 35 , ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT , "TD | Power Loss | Treatment must be terminated due to a power loss.\n- Follow clinic instructions on when to initiate manual rinseback.\n- Check all electrical connections.\n- If power returns within 5 minutes of outage, \n- rinseback will be allowed. | Blood Stop: Loss of AC Power | TD AC power lost alarm | The TD Software shall trigger an alarm if an AC power loss is detected while the TD system is in pre-treatment, treatment, or post-treatment mode. | "}, - { 36 , ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD1) Error | DD conductivity sensor located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD1) is reporting an error or FPGA is failing to read sensor. | "}, - { 37 , ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD2) Error | DD conductivity sensor located after balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD2) is reporting an error or FPGA is failing to read sensor. | "}, - { 38 , ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD3) Error | DD conductivity sensor located after balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD3) is reporting an error or FPGA is failing to read sensor. | "}, - { 39 , ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD4) Error | DD conductivity sensor located in spent dialysate path reporting error or not being read successfully | Conductvity Sensor (CD4) is reporting an error or FPGA is failing to read sensor. | "}, + { 36 , ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD1) Error | DD conductivity sensor located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD1) is reporting an error or FPGA is failing to read sensor. | "}, + { 37 , ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD2) Error | DD conductivity sensor located after balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD2) is reporting an error or FPGA is failing to read sensor. | "}, + { 38 , ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD3) Error | DD conductivity sensor located after balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD3) is reporting an error or FPGA is failing to read sensor. | "}, + { 39 , ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD4) Error | DD conductivity sensor located in spent dialysate path reporting error or not being read successfully | Conductvity Sensor (CD4) is reporting an error or FPGA is failing to read sensor. | "}, { 40 , ALARM_ID_TD_VENOUS_BUBBLE_DETECTED , "TD | Venous Air Detected | Air detected in the venous air trap.\n- Confirm arterial access placement and confirm\nconnections are secure.\n- Treatment must be terminated without rinseback. | Blood Stop: Venous Air Bubble | TD venous air bubble detected alarm | If bubbles are detected during the treatment. | "}, { 41 , ALARM_ID_TD_CARTRIDGE_DOOR_OPENED , "TD | Blood Pump Stopped: Door Open | The device door is open.\n Close the device door. \n- Press Resume/OK to continue. | Blood Stop: Door Open | TD cartridge door opened alarm | If the cartridge door is opened as reported by the FPGA. | "}, { 42 , ALARM_ID_TD_STUCK_BUTTON_TEST_FAILED , "TD | Stuck Button | A button was pressed during start up and appears stuck. \n- Press and release the power and stop buttons on the\nfront of the device.\n- Turn device off, then back on.\n- If problem continues, call service to schedule a repair. | TD POST: Stuck Button | TD Stuck button POST failure. Stop or Off button detected to be pressed for at least 1 second during test shortly after power up | Stop or Off button are pressed for more than 1 sec during POST. | "}, @@ -539,11 +559,17 @@ { 81 , ALARM_ID_TD_VALVE_HOMING_FAILED , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: Valve Home | TD valve homing failed | If the number of failed homing > = 3 counts. | "}, { 82 , ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: Valve Transition Err | TD valve transition time out | if the valve's transition time has timed out (3000msec) | "}, { 83 , ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD , "RO | Communication Error | A communication problem has been detected.\n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Loss of DD Comm (DD ACK) | DD to RO comm error. | DD message to RO that requires acknowledge was not acknowledged within a certain time. | "}, - { 84 , ALARM_ID_RO_FPGA_COMM_TIMEOUT , "RO | Service Required: Filtration Device | A problem was detected with the filtration device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Fault: FPGA Comm | RO FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, - { 85 , ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS , "RO | Service Required: Filtration Device | A problem was detected with the filtration device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Fault: CAN CRC Comm | RO Too many bad CRCs detected on received system messages | If too many bad message CRCs are received within a set period of time | "}, + { 84 , ALARM_ID_RO_FPGA_COMM_TIMEOUT , "RO | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Fault: FPGA Comm | RO FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, + { 85 , ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS , "RO | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Fault: CAN CRC Comm | RO Too many bad CRCs detected on received system messages | If too many bad message CRCs are received within a set period of time | "}, { 86 , ALARM_ID_RO_VALVE_CONTROL_FAILURE , "RO | Service Required: Filtration Device | A problem was detected with the filtration device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | RO Fault: Valve Control | RO FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, - }; - + { 87 , ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing bhamber state 1 fill start pressure is not in range | If the fresh dialysate pressure (< 23 psig or > 25 psig) and spent dialysate pressure (< 29 psig or > 30 psig) not in range for balancing chamber state1 fill start. | "}, + { 88 , ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 1 fill end pressure is not in range | If the fresh dialysate pressure (< 23 psig or > 25 psig) and spent dialysate pressure (< 29 psig or > 30 psig) not in range for balancing chamber state1 fill end. | "}, + { 89 , ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 2 fill start pressure is not in range | If the fresh dialysate pressure (< 23 psig or > 25 psig) and spent dialysate pressure (< 29 psig or > 30 psig) not in range for balancing chamber state2 fill start. | "}, + { 90 , ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 2 fill end pressure is not in range | If the fresh dialysate pressure (< 23 psig or > 25 psig) and spent dialysate pressure (< 29 psig or > 30 psig) not in range for balancing chamber state2 fill end. | "}, + { 91 , ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Hyd Cham Press not in range | DD hydraulics chamber degassed pressure is not in range | If the hydraulics chamber pressure is not between -11.7877 psig and -12.2789 psig. | "}, + { 92 , ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Fresh dial Press not in range | DD fresh dialysate pressure is not in range | If the fresh dialysate pressure (< 23 psig or > 25 psig) not in range. | "}, + { 93 , ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Spent dial Press not in range | DD spent dialysate pressure is not in range | If the spent dialysate pressure (< 29 psig or > 30 psig) not in range. | "}, +}; #endif // manual alarms #endif Index: MsgDefs.h =================================================================== diff -u -r4929d0d6b1e6d1a12b2f5647c629d0721da64e18 -r20715ecef1276ccdb303fa9603d75722df8df700 --- MsgDefs.h (.../MsgDefs.h) (revision 4929d0d6b1e6d1a12b2f5647c629d0721da64e18) +++ MsgDefs.h (.../MsgDefs.h) (revision 20715ecef1276ccdb303fa9603d75722df8df700) @@ -65,7 +65,7 @@ MSG_ID_TD_SWITCHES_DATA = 0x21, ///< TD broadcast switches data MSG_ID_POWER_OFF_WARNING = 0x22, ///< TD broadcast for a power off warning MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23, ///< TD off button request message to UI for user confirmation - MSG_ID_PRESSURE_DATA = 0x24, ///< TD broadcast pressure data + MSG_ID_TD_PRESSURE_DATA = 0x24, ///< TD broadcast pressure data MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25, ///< DD concentrate pump data MSG_ID_DD_TEMPERATURE_DATA = 0x26, ///< DD temperature data MSG_ID_DIALYSATE_PUMPS_DATA = 0x27, ///< DD dialysate pumps data @@ -78,7 +78,14 @@ MSG_ID_DD_BAL_CHAMBER_DATA = 0x2E, ///< DD balancing chamber data MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F, ///< DD Generate dialysate mode data MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30, ///< DD Generate dialysate request data coming from TD with additional parameters - MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x31, ///< DD requests RO to start/stop delivering the purified water. + MSG_ID_RO_VALVES_STATES_DATA = 0x31, ///< RO valves data + MSG_ID_RO_PUMP_DATA = 0x32, ///< RO pumps data + MSG_ID_RO_OP_MODE_DATA = 0x33, ///< RO broadcast operation mode data + MSG_ID_RO_PRESSURES_DATA = 0x34, ///< RO broadcast pressures data + MSG_ID_RO_LEVEL_DATA = 0x35, ///< RO broadcast level data + MSG_ID_RO_FLOW_DATA = 0x36, ///< RO broadcast flow data + MSG_ID_RO_CONDUCTIVITY_DATA = 0x37, ///< RO broadcast conductivity data + MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38, ///< DD requests RO to start/stop delivering the purified water. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -126,6 +133,7 @@ MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST = 0x8029, ///< TD override request for blood pump measured motor speed MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST = 0x802A, ///< TD override request for blood pump measured rotor speed MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST = 0x802B, ///< TD override request for blood pump rotor count + MSG_ID_TD_PERISTALTIC_PUMP_SET_SPEED_REQUEST = 0x802C, ///< TD set peristaltic pump set speed request MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in @@ -178,8 +186,36 @@ MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F, ///< DD Valves open/close state override request MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030, ///< DD RO CAN Communication status override request + MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000, ///< First RO test message ID + MSG_ID_RO_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_RO_TESTER_MESSAGE, ///< RO tester log-in + MSG_ID_RO_SOFTWARE_RESET_REQUEST = 0xB001, ///< RO reset request + MSG_ID_RO_SEND_TEST_CONFIGURATION = 0xB002, ///< RO send test configuration to Dialin + MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003, ///< RO valve data publish interval override request + MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004, ///< RO valve commanded state override request + MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005, ///< RO valve sensed state override request + MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST = 0xB006, ///< RO set boost pump PWM request + MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007, ///< RO override request for boost pump read PWM + MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008, ///< RO override request for boost pump speed (RPM) + MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009, ///< RO boost pumps data publish interval override request + MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST = 0xB00A, ///< RO override request for pressure (mmHg) + MSG_ID_RO_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B, ///< RO override request for pressure sensor temperature (deg C) + MSG_ID_RO_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C, ///< RO override request for pressure sensor read count + MSG_ID_RO_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D, ///< RO override request for pressure sensor error count + MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E, ///< RO pressures data publish interval override request + MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F, ///< RO level data publish interval override request + MSG_ID_RO_LEVEL_OVERRIDE_REQUEST = 0xB010, ///< RO override request for level sensor. + MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011, ///< RO flows data publish interval override request + MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST = 0xB012, ///< RO override request for flow rate (mL/min) + MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013, ///< RO override request for flow temperature (deg C) + MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014, ///< RO conductivity data publish interval override request + MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015, ///< RO conductivity override request + MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016, ///< RO conductivity sensor temperature override request + MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017, ///< RO conductivity sensor read count override request + MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018, ///< RO conductivity sensor error count override request + MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log + MSG_ID_RO_DEBUG_EVENT = 0xFFF3, ///< RO debug event text to be logged in event log MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF, ///< Acknowledgment of message that requires acknowledgment Index: RODefs.h =================================================================== diff -u -r382a620abc195451601150ed846975f90f2ced8b -r20715ecef1276ccdb303fa9603d75722df8df700 --- RODefs.h (.../RODefs.h) (revision 382a620abc195451601150ed846975f90f2ced8b) +++ RODefs.h (.../RODefs.h) (revision 20715ecef1276ccdb303fa9603d75722df8df700) @@ -31,17 +31,17 @@ /// Enumeration of init & POST mode states. enum RO_POST_States { - RO_POST_STATE_START = 0, ///< Start initialize & POST mode state - RO_POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state - RO_POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state - RO_POST_STATE_WATCHDOG, ///< Run watchdog test state - RO_POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state - RO_POST_STATE_TEMPERATURES, ///< Run temperatures POST state - RO_POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state - RO_POST_STATE_FPGA, ///< Run FPGA test state - RO_POST_STATE_COMPLETED, ///< POST self-tests completed state - RO_POST_STATE_FAILED, ///< POST self-tests failed state - NUM_OF_RO_POST_STATES ///< Number of initialize & POST mode states + RO_POST_STATE_START = 0, ///< Start initialize & POST mode state + RO_POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state + RO_POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state + RO_POST_STATE_WATCHDOG, ///< Run watchdog test state + RO_POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state + RO_POST_STATE_TEMPERATURES, ///< Run temperatures POST state + RO_POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state + RO_POST_STATE_FPGA, ///< Run FPGA test state + RO_POST_STATE_COMPLETED, ///< POST self-tests completed state + RO_POST_STATE_FAILED, ///< POST self-tests failed state + NUM_OF_RO_POST_STATES ///< Number of initialize & POST mode states }; typedef enum RO_POST_States RO_POST_STATE_T; ///< Type for RO POST states enumeration