Index: .gitignore =================================================================== diff -u -r8a4783c11ec826a2b84480ffb6b033edcac12954 -r908be8a294b5ff1216e02dcdfd0128e8037a1107 --- .gitignore (.../.gitignore) (revision 8a4783c11ec826a2b84480ffb6b033edcac12954) +++ .gitignore (.../.gitignore) (revision 908be8a294b5ff1216e02dcdfd0128e8037a1107) @@ -25,4 +25,5 @@ docs/source/dialin.common.rst *.swp testsuites +squishtesting *.pyc Index: dialin/common/msg_defs.py =================================================================== diff -u -rf7cd7cb24f34bc40f718ecd8824c600ee1565134 -r908be8a294b5ff1216e02dcdfd0128e8037a1107 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision f7cd7cb24f34bc40f718ecd8824c600ee1565134) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 908be8a294b5ff1216e02dcdfd0128e8037a1107) @@ -89,15 +89,17 @@ MSG_ID_DG_PRIMING_STATUS_DATA = 0x43 # HD priming status during cartridge prime MSG_ID_DG_UV_REACTORS_DATA = 0x44 # DG broadcast UV reactors data MSG_ID_DG_THERMISTORS_DATA = 0x45 # DG broadcast thermistors data - MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46 # DG broadcast thermistors data - MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47 # DG broadcast thermistors data + MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46 # UI request to change pressure limits + MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47 # HD response to change pressure limits request MSG_ID_DG_FANS_DATA = 0x48 # DG broadcast fans data MSG_ID_HD_CALIBRATION_DATA = 0x49 # HD broadcast calibration data MSG_ID_DG_CALIBRATION_DATA = 0x4A # DG broadcast calibration data - MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C # HD Heparin Pause/Resume Response - MSG_ID_HD_HEPARIN_DATA = 0x4D # HD Broadcast heparin data - MSG_ID_UI_PRE_TREATMENT_UF_REQUEST = 0x4F # UI UF Initialization Request - MSG_ID_HD_PRE_TREATMENT_UF_RESPONSE = 0x50 # HD response to user request to adjust the ultrafiltration in pre-treatment + MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B # UI request to pause/resume Heparin delivery + MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C # HD response to pause/resume Heparing delivery request + MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D # HD broadcast of Heparin delivery data + MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0x4E # UI command to set alarm audio volume level + MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F # UI request to validate new ultrafiltration volume treatment parameter + MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50 # HD response to new treatment parameters set MSG_ID_CAN_ERROR_COUNT = 0x999 # test code in support of EMC testing @@ -115,7 +117,7 @@ MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x800A # Blood pump motor controller speed override request MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE = 0x800B # Blood pump motor controller current override request MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE = 0x800C # Blood flow broadcast interval override request - MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE = 0x800D # Alarm status broadcast interval override request + MSG_ID___AVAILABLE_1 = 0x800D # This msg ID is available for use MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E # Blood pump measured motor speed override request MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x800F # Blood pump measured rotor speed override request MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE = 0x8010 # Dialysate inlet flow set point override request @@ -210,6 +212,10 @@ MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE = 0xA02C # DG UV reactors health override request MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D # DG thermistors data publish interval override MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E # DG thermistors value override + MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F # DG RO pump duty cycle override + MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030 # DG RO flow rate override + MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE = 0xA031 # DG RO pump target flow rate override + MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032 # DG RO pump target 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