Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r76d5c2f8d0b12af4d95a9d94073be1d3afa08d78 -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 76d5c2f8d0b12af4d95a9d94073be1d3afa08d78) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -117,15 +117,20 @@ MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60 MSG_ID_DD_BLOOD_LEAK_DATA = 0x61 + 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_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 + MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002 @@ -269,8 +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_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 @@ -332,4 +346,4 @@ MSG_ID_FP_DEBUG_EVENT = 0xFFF3 - MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF + MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF \ No newline at end of file Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -ref1a96c75c42aea1fbc1241fc01b5fb0135f9562 -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision ef1a96c75c42aea1fbc1241fc01b5fb0135f9562) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -44,8 +44,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_pressures_data = MsgIds.MSG_ID_DD_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pressures_data, self._handler_pressures_sync) self.dd_pressures = { @@ -58,7 +58,7 @@ self.dd_pressures_timestamp = 0 - @publish(["dd_pressures_timestamp", "dd_pressures"]) + @publish(["msg_id_dd_pressures_data", "dd_pressures", "dd_pressures_timestamp"]) def _handler_pressures_sync(self, message,timestamp=0.0): """ Handles published DD pressure data messages. DD Pressure data are captured Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -62,11 +62,11 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_temperature_data = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_temperature_data, self._handler_temperature_sensors_sync) - @publish(["dd_temperatures_timestamp", "dd_temperatures"]) + @publish(["msg_id_dd_temperature_data", "dd_temperatures", "dd_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ Handles published DD temperature sensors message Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -59,8 +59,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + self.msg_id_dd_valves_states_data = MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x00000000 self.d14_valv = {"id": DDValveNames.D14_VALV.value, "state": DEENERGIZED} @@ -160,8 +160,7 @@ else: return DEENERGIZED - @publish([ - "dd_valves_states_timestamp", + @publish(["msg_id_dd_valves_states_data", "valve_states_all", "d14_valv", "d52_valv", @@ -187,7 +186,8 @@ "d20_valv", "d21_valv", "d22_valv", - "valve_states_enum" + "valve_states_enum", + "dd_valves_states_timestamp" ]) def _handler_valves_sync(self, message, timestamp=0.0): """ Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_pressures_data = MsgIds.MSG_ID_FP_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_pressures_data, self._handler_pressure_sync) self.fp_pressures = { @@ -56,7 +56,7 @@ self.fp_pressure_timestamp = 0.0 - @publish(["fp_pressure_timestamp", "fp_pressures"]) + @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"]) def _handler_pressure_sync(self, message, timestamp=0.0): """ Handles published FP pressure sensor data messages. Pressure data are captured Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -37,8 +37,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data, self._handler_temperature_sensors_sync) self.fp_temperature_sensors_timestamp = 0 @@ -54,7 +54,7 @@ FPTemperaturesNames.P16_TEMP.name: 0.0 } - @publish(["fp_temperatures_timestamp", "fp_temperatures"]) + @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ Handles published FP temperature sensors message Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -56,8 +56,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + self.msg_id_fp_valves_states_data = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} @@ -123,7 +123,7 @@ return DEENERGIZED @publish([ - "fp_valves_states_timestamp", + "msg_id_fp_valves_states_data", "valve_states_all", "m4_valv", "p11_valv", @@ -133,7 +133,8 @@ "p39_valv", "p43_valv", "p6_valv", - "valve_states_enum" + "valve_states_enum", + "fp_valves_states_timestamp" ]) def _handler_valves_sync(self, message, timestamp=0.0): """