Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -r4d5e17118983a1cc04231f4c423588fad24816b4 -rc4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 4d5e17118983a1cc04231f4c423588fad24816b4) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision c4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25) @@ -108,27 +108,25 @@ 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])) """ + 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] + 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: """ Index: dialin/dg/dialysate_fill.py =================================================================== diff -u -r6f7e1ee38afb4fba5bedfcfcea5f4b5ee631ac95 -rc4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25 --- dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision 6f7e1ee38afb4fba5bedfcfcea5f4b5ee631ac95) +++ dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision c4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25) @@ -81,24 +81,24 @@ @param message: published dialysate fill' data message @return: None """ - self.avg_acid = struct.unpack('f', bytearray( + self.avg_acid = struct.unpack(' int: """ - Constructs and sends the concentrate pump target speed override command + Constructs and sends the used acid volume override command @param volume: float - desired used acid volume to override @return: 1 if successful, zero otherwise @@ -129,7 +129,7 @@ def cmd_used_bicarb_volume_override(self, volume: float) -> int: """ - Constructs and sends the concentrate pump target speed override command + Constructs and sends the used bicarb volume override command @param volume: float - desired used acid volume to override @return: 1 if successful, zero otherwise Index: dialin/dg/gen_idle.py =================================================================== diff -u -r4d5e17118983a1cc04231f4c423588fad24816b4 -rc4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25 --- dialin/dg/gen_idle.py (.../gen_idle.py) (revision 4d5e17118983a1cc04231f4c423588fad24816b4) +++ dialin/dg/gen_idle.py (.../gen_idle.py) (revision c4e2aaf6ce54297baf4b034e8c95fc9a3f6dfe25) @@ -66,7 +66,7 @@ @param message: published bad fill sub-states message @return: none """ - state = struct.unpack('i', bytearray( + state = struct.unpack('