Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817 -r9704b6d2e632edb5084358361a6b264202ea4e94 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 9704b6d2e632edb5084358361a6b264202ea4e94) @@ -39,6 +39,7 @@ from .service_record import DGServiceNVRecord from .scheduled_runs_record import DGScheduledRunsNVRecord from .valves import DGValves +from .voltages import DGVoltages from ..utils.conversions import integer_to_bytearray from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish, _LogManager @@ -166,6 +167,7 @@ self.service_record = DGServiceNVRecord(self.can_interface, self.logger) self.scheduled_runs_record = DGScheduledRunsNVRecord(self.can_interface, self.logger) self.valves = DGValves(self.can_interface, self.logger) + self.voltages = DGVoltages(self.can_interface, self.logger) self.flush = FlushMode(self.can_interface, self.logger) def get_version(self): Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -rf89093ee0f0b9159df2ae4e0b86971f0e0e1b448 -r9704b6d2e632edb5084358361a6b264202ea4e94 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision f89093ee0f0b9159df2ae4e0b86971f0e0e1b448) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 9704b6d2e632edb5084358361a6b264202ea4e94) @@ -187,19 +187,19 @@ sensors_data = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] - self.primary_raw_cold_junc = sensors_data + self.trimmer_raw_thermo_couple = sensors_data sensors_data = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] - self.trimmer_raw_thermo_couple = sensors_data + self.trimmer_raw_cold_junc = sensors_data sensors_data = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] - self.trimmer_raw_cold_junc = sensors_data + self.conductivity_1_raw = sensors_data sensors_data = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] - self.conductivity_1_raw = sensors_data + self.conductivity_2_raw = sensors_data def cmd_temperature_sensors_broadcast_interval_override(self, ms, reset=NO_RESET): """