Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r9c785697827d1a21021b48b57d5a14f157856ec2 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 9c785697827d1a21021b48b57d5a14f157856ec2) @@ -117,9 +117,17 @@ MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60 MSG_ID_DD_BLOOD_LEAK_DATA = 0x61 - MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62 - MSG_ID_DD_VOLTAGES_DATA = 0x63 + MSG_ID_DD_FP_INLET_PRESSURE_CHECK_DATA = 0x62 + MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63 + MSG_ID_TD_BLOOD_PRESSURE_RESPONSE = 0x64 + MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65 + MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST = 0x66 + MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x67 + MSG_ID_DD_VOLTAGES_DATA = 0x68 + MSG_ID_DD_RINSE_PUMP_DATA = 0x69 + + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -184,6 +192,9 @@ MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C + MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST = 0x803D + MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST = 0x803E + MSG_ID_TD_HARD_STOP_BLOOD_PUMP = 0x803F MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001 @@ -263,11 +274,17 @@ MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E - MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F - MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050 + #MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F + #MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050 + MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA04F + MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA050 MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051 MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052 + # TODO: Placeholders for Beta conflict with above messages + MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA060 # Original ID: 0xA04F + MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA061 # Original ID: 0xA050 + MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00 MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01 MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02 @@ -329,4 +346,4 @@ MSG_ID_FP_DEBUG_EVENT = 0xFFF3 - MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF \ No newline at end of file + MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF