Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -re9a32dcd15e9112f38ad3de850db56e029aae861 -r47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision e9a32dcd15e9112f38ad3de850db56e029aae861) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b) @@ -502,13 +502,14 @@ D28_AVG_TEMP = 14 # D28 Filtered value D30_AVG_TEMP = 15 # D30 Filtered value D78_AVG_TEMP = 16 # D78 Filtered value - D9_TEMP = 17 # D9 Pressure sensor temperature value - D66_TEMP = 18 # D66 Pressure sensor temperature value - D51_TEMP = 19 # D51 Pressure sensor temperature value - D18_TEMP = 20 # D18 Pressure sensor temperature value - D41_TEMP = 21 # D41 Pressure sensor temperature value - D87_TEMP = 22 # D87 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 23 # Number of Temperature Sensors + D1_AVG_TEMP = 17 # D1 Filtered value + D9_TEMP = 18 # D9 Pressure sensor temperature value + D66_TEMP = 19 # D66 Pressure sensor temperature value + D51_TEMP = 20 # D51 Pressure sensor temperature value + D18_TEMP = 21 # D18 Pressure sensor temperature value + D41_TEMP = 22 # D41 Pressure sensor temperature value + D87_TEMP = 23 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 24 # Number of Temperature Sensors # Aliases FIRST_PRESSURE_SENSOR = D9_TEMP Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -r47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b) @@ -200,6 +200,7 @@ MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3 MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4 MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5 + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -462,13 +463,14 @@ 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_SET_OP_SUB_MODE_REQUEST = 0xB046 - + MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047 + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C - 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