Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r1c451317473549058db3e3b8d9455c969bbb1516 -r1a42589087b53ee3c38ed5b9cf7951e047c33a70 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 1c451317473549058db3e3b8d9455c969bbb1516) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 1a42589087b53ee3c38ed5b9cf7951e047c33a70) @@ -131,6 +131,7 @@ MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F + MSG_ID_DD_DRY_BICART_DATA = 0x70 MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71 MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x72 MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x73 @@ -164,14 +165,25 @@ MSG_ID_TD_RINSEBACK_PROGRESS = 0x8F MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x90 MSG_ID_TD_RINSEBACK_CMD_RESPONSE = 0x91 - + MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST = 0x92 + MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE = 0x93 + MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST = 0x94 + MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0x95 + MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA = 0x97 + MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST = 0x98 + MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE = 0x99 + MSG_ID_TD_ISOLATED_UF_DATA = 0x9A + MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST = 0x9B + MSG_ID_TD_ISOLATED_UF_DURATION_CHANGE_RESPONSE = 0x9C + MSG_ID_UI_ISOLATED_UF_VOLUME_GOAL_CHANGE_REQUEST = 0x9D + MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE = 0x9E + MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST = 0x9F + MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE = 0xA0 + MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST = 0xA1 + MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE = 0xA2 + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 - MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST = 0X92 - MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE = 0X93 - MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST = 0X94 - MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0X95 - MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002 @@ -272,8 +284,8 @@ MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA018 MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST = 0xA019 MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA01A - MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST = 0xA01B - MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST = 0xA01C + MSG_ID_DD_TEMPERATURE_SENSOR_FILTERED_TEMP_OVERRIDE_REQUEST = 0xA01B + MSG_ID_DD_AVAILABLE_3 = 0xA01C MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA01D MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST = 0xA01E MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST = 0xA01F @@ -330,8 +342,16 @@ MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053 MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 - MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA056 + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA057 + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA058 + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 + MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A + MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101 + # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04 @@ -348,8 +368,8 @@ MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009 MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST = 0xB00A MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B - MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C - MSG_ID_FP_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D + MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xB00C + MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xB00D MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010 @@ -382,21 +402,37 @@ MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D - MSG_ID_FP_GET_TEST_CONFIGURATION = 0XB02E - MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0XB02F + MSG_ID_FP_GET_TEST_CONFIGURATION = 0xB02E + MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0xB02F MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030 MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031 MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032 - # MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032 - MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033 - MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034 - MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035 - MSG_ID_FP_DEF_STATUS_REQUEST = 0xB049 - MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB04A + MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB033 + MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB034 + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB035 + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB036 + MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST = 0xB037 + MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE = 0xB038 + MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB039 + MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB03A + MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03B + MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST = 0xB03C + MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST = 0xB03D + MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03E + MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST = 0xB03F + MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB040 + MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB041 + MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB042 + MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043 + MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044 + MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100 + MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 MSG_ID_FP_DEBUG_EVENT = 0xFFF3 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF +MsgIds._str_list = {}