Index: HDDefs.h =================================================================== diff -u -r22e069cd4dbf1b8de8598fda2c09f2e91fcc609d -re9364058a5553af3c5ff14c02ebf5c4d78f528f6 --- HDDefs.h (.../HDDefs.h) (revision 22e069cd4dbf1b8de8598fda2c09f2e91fcc609d) +++ HDDefs.h (.../HDDefs.h) (revision e9364058a5553af3c5ff14c02ebf5c4d78f528f6) @@ -51,16 +51,19 @@ /// Enumeration of init & POST mode states. enum HD_POST_States { - POST_STATE_START = 0, ///< Start initialize & POST mode state. - POST_STATE_WATCHDOG, ///< Run watchdog test mode state. - POST_STATE_ALARM_LAMP, ///< Run alarm lamp test mode state. - POST_STATE_FPGA, ///< Run FPGA test mode state. - POST_STATE_RTC, ///< Run RTC test mode state. - POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test mode state. - POST_STATE_STUCK_BUTTON, ///< Run stuck button test mode state. - POST_STATE_COMPLETED, ///< POST self tests completed mode state. - POST_STATE_FAILED, ///< POST self tests failed mode state. - NUM_OF_POST_STATES ///< Number of initialize & POST mode states. + POST_STATE_START = 0, ///< Start initialize & POST mode state + POST_STATE_WATCHDOG, ///< Run watchdog test mode state + POST_STATE_ALARM_LAMP, ///< Run alarm lamp test mode state + POST_STATE_FPGA, ///< Run FPGA test mode state + POST_STATE_RTC, ///< Run RTC test mode state + POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test mode state + POST_STATE_BLOOD_FLOW, ///< Run Blood Flow test mode state + POST_STATE_DIALYSATE_FLOW, ///< Run Dialysate Flow test mode state + POST_STATE_ACCELEROMETER, ///< Run Accelerometer test mode state + POST_STATE_STUCK_BUTTON, ///< Run stuck button test mode state + POST_STATE_COMPLETED, ///< POST self tests completed mode state + POST_STATE_FAILED, ///< POST self tests failed mode state + NUM_OF_POST_STATES ///< Number of initialize & POST mode states }; typedef enum HD_POST_States HD_POST_STATE_T; Index: MsgDefs.h =================================================================== diff -u -r162a1dfdf307416ca2c47ca6434b8e5a78fdb5c3 -re9364058a5553af3c5ff14c02ebf5c4d78f528f6 --- MsgDefs.h (.../MsgDefs.h) (revision 162a1dfdf307416ca2c47ca6434b8e5a78fdb5c3) +++ MsgDefs.h (.../MsgDefs.h) (revision e9364058a5553af3c5ff14c02ebf5c4d78f528f6) @@ -74,6 +74,10 @@ MSG_ID_SALINE_BOLUS_DATA = 0x30, ///< HD broadcast of saline bolus data MSG_ID_DG_CONDUCTIVITY_DATA = 0x31, ///< DG broadcast of the conductivity sensors data MSG_ID_USER_REQUEST_ALARM_SILENCE = 0x32, ///< UI request alarm silence (or cancel) + MSG_ID_HD_ACCELEROMETER_DATA = 0x33, ///< HD broadcast of accelerometer data + MSG_ID_DG_ACCELEROMETER_DATA = 0x34, ///< DG broadcast of accelerometer data + MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35, ///< UI request to validate new treatment parameter set + MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36, ///< HD response to new treatment parameters set #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing #endif @@ -118,7 +122,13 @@ MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE = 0x8023, ///< Dialysate outlet pump measured motor speed override request MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x8024, ///< Dialysate outlet pump measured rotor speed override request MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025, ///< Load cell measured weight override request - MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026, ///< HD safety shutdown override request + MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026, ///< HD safety shutdown override request + MSG_ID_HD_ACCEL_OVERRIDE = 0x8027, ///< HD accelerometer sensor override request + MSG_ID_HD_ACCEL_MAX_OVERRIDE = 0x8028, ///< HD accelerometer sensor max. override request + MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE = 0x8029, ///< HD accelerometer data broadcast interval override request + MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A, ///< HD accelerometer set calibration factors request + MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B, ///< Blood flow set calibration factors request + MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C, ///< Dialysate flow set calibration factors request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in @@ -142,9 +152,13 @@ MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE = 0xA013, ///< Heaters data publish override MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE = 0xA014, ///< DG safety shutdown override request MSG_ID_CONDUCTIVITY_OVERRIDE = 0xA015, ///< Conductivity sensor override request - MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE = 0xA016, ///< Conductivity sensors data publish override - MSG_ID_RO_PUMP_SET_PWM = 0xA017, ///< RO pump set PWM for open loop - MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA018, ///< Drain pump set delta pressure override + MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE = 0xA016, ///< Conductivity sensors data publish override + MSG_ID_DG_ACCEL_OVERRIDE = 0xA017, ///< DG accelerometer sensor override request + MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018, ///< DG accelerometer sensor max. override request + MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019, ///< DG accelerometer data broadcast interval override request + MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A, ///< DG accelerometer set calibration factors request + MSG_ID_RO_PUMP_SET_PWM = 0xA01B, ///< RO pump set PWM for open loop + MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log