Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -186,6 +186,7 @@ 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_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001 Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -58,7 +58,7 @@ self.dd_pressures_timestamp = 0 - @publish(["msg_id_dd_pressures_data", "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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -66,7 +66,7 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_temperature_data, self._handler_temperature_sensors_sync) - @publish(["msg_id_dd_temperature_data", "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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -161,7 +161,6 @@ return DEENERGIZED @publish(["msg_id_dd_valves_states_data", - "dd_valves_states_timestamp", "valve_states_all", "d14_valv", "d52_valv", @@ -187,7 +186,12 @@ "d20_valv", "d21_valv", "d22_valv", - "valve_states_enum" + "d69_valv", + "d71_valv", + "d70_valv", + "d72_valv", + "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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -56,7 +56,7 @@ self.fp_pressure_timestamp = 0.0 - @publish(["msg_id_fp_pressures_data", "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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -54,7 +54,7 @@ FPTemperaturesNames.P16_TEMP.name: 0.0 } - @publish(["msg_id_fp_temperature_data", "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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r4c41400037a9da1afe303601bd960b30de3d79da --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 4c41400037a9da1afe303601bd960b30de3d79da) @@ -124,7 +124,6 @@ @publish([ "msg_id_fp_valves_states_data", - "fp_valves_states_timestamp", "valve_states_all", "m4_valv", "p11_valv", @@ -133,8 +132,8 @@ "p37_valv", "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): """