Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -r4883713b492bdb0a8626e98fb5599841e8b17f23 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 4883713b492bdb0a8626e98fb5599841e8b17f23) @@ -31,7 +31,8 @@ D27_COND = 1 D29_COND = 2 D43_COND = 3 - NUM_OF_CONDUCTIVITY_SENSORS = 4 + D74_COND = 4 + NUM_OF_CONDUCTIVITY_SENSORS = 5 class DDConductivitySensors(AbstractSubSystem): """ @@ -60,13 +61,15 @@ self.d27_cond = 0.0 self.d29_cond = 0.0 self.d43_cond = 0.0 + self.d74_cond = 0.0 self.dd_conductivity_timestamp = 0.0 @publish(["dd_conductivity_timestamp", "d17_cond", "d27_cond", "d29_cond", - "d43_cond"]) + "d43_cond", + "d74_cond"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ Handles published DD conductivity sensor data messages. DD Conductivity sensor data are captured @@ -84,6 +87,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.d43_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.d74cond = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.dd_conductivity_timestamp = timestamp