Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r1dedb0152fd8c62eb6e2872bb9c78ec289b3f6e3 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1dedb0152fd8c62eb6e2872bb9c78ec289b3f6e3) @@ -7,8 +7,8 @@ # # @file conductivity_sensors.py # -# @author (last) Quang Nguyen -# @date (last) 05-Aug-2021 +# @author (last) Hung Nguyen +# @date (last) 08-Feb-2022 # @author (original) Quang Nguyen # @date (original) 20-Jul-2020 # @@ -60,6 +60,11 @@ self.conductivity_sensor_cd1 = 0.0 self.conductivity_sensor_cd2 = 0.0 + self.raw_conductivity_sensor_cpi = 0.0 + self.raw_conductivity_sensor_cpo = 0.0 + self.raw_conductivity_sensor_cd1 = 0.0 + self.raw_conductivity_sensor_cd2 = 0.0 + def get_conductivity_sensors(self): """ Gets the current conductivity value @@ -68,7 +73,9 @@ conductivity_sensor_cd1, conductivity_sensor_cd2 ] """ return [self.conductivity_sensor_cpi, self.conductivity_sensor_cpo, - self.conductivity_sensor_cd1, self.conductivity_sensor_cd2] + self.conductivity_sensor_cd1, self.conductivity_sensor_cd2, + self.raw_conductivity_sensor_cpi, self.raw_conductivity_sensor_cpo, + self.raw_conductivity_sensor_cd1, self.raw_conductivity_sensor_cd2] def get_ro_rejection_ratio(self): """ @@ -79,7 +86,8 @@ return self.ro_rejection_ratio @publish(["ro_rejection_ratio", "conductivity_sensor_cpi", "conductivity_sensor_cpo", "conductivity_sensor_cd1", - "conductivity_sensor_cd2"]) + "conductivity_sensor_cd2", "raw_conductivity_sensor_cpi", "raw_conductivity_sensor_cpo", + "raw_conductivity_sensor_cd1", "raw_conductivity_sensor_cd2"]) def _handler_conductivity_sensors_sync(self, message): """ Handles published conductivity sensor data messages. Conductivity sensor data are captured @@ -100,12 +108,26 @@ cd2 = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + raw_cpi = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) + raw_cpo = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + raw_cd1 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + raw_cd2 = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + self.ro_rejection_ratio = ro_rejection_ratio[0] self.conductivity_sensor_cpi = cpi[0] self.conductivity_sensor_cpo = cpo[0] self.conductivity_sensor_cd1 = cd1[0] self.conductivity_sensor_cd2 = cd2[0] + self.raw_conductivity_sensor_cpi = raw_cpi[0] + self.raw_conductivity_sensor_cpo = raw_cpo[0] + self.raw_conductivity_sensor_cd1 = raw_cd1[0] + self.raw_conductivity_sensor_cd2 = raw_cd2[0] + def cmd_conductivity_sensor_override(self, sensor: int, conductivity: float, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command