Index: dialin/hd/treatment.py =================================================================== diff -u -rec4566a8f8f9731331270672df92100023cb733a -r47948eed572c352ffd10cd5246a145f2eec3266d --- dialin/hd/treatment.py (.../treatment.py) (revision ec4566a8f8f9731331270672df92100023cb733a) +++ dialin/hd/treatment.py (.../treatment.py) (revision 47948eed572c352ffd10cd5246a145f2eec3266d) @@ -401,9 +401,9 @@ """ tmo = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) cdn = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.recirc_timeout_secs = tmo[0] self.recirc_countdown_secs = cdn[0] Index: tests/test_uf.py =================================================================== diff -u -r8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21 -r47948eed572c352ffd10cd5246a145f2eec3266d --- tests/test_uf.py (.../test_uf.py) (revision 8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21) +++ tests/test_uf.py (.../test_uf.py) (revision 47948eed572c352ffd10cd5246a145f2eec3266d) @@ -22,9 +22,9 @@ if __name__ == "__main__": # create an HD object called hd - hd = HD() + hd = HD(log_level="DEBUG") # create a DG object called dg - dg = DG() + dg = DG(log_level="DEBUG") sleep(2) # hd.ui.cmd_ui_start_treatment_request() @@ -85,6 +85,10 @@ ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) + \ ", ODi, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_inlet_pump_occlusion) + \ ", ODo, " + '{:7d}'.format(hd.pressure_occlusion.dialysate_outlet_pump_occlusion) + Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.INLET_PRIMARY_HEATER)) + \ + ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.OUTLET_PRIMARY_HEATER)) + \ + ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.INLET_DIALYSATE)) + \ + ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.get_temperature(dg.temperature_sensors.TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT)) alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \ ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \ @@ -109,6 +113,7 @@ f.write(alarms) f.write(accels) f.write(hdPres) + f.write(Temps) f.write("\n") # print to console @@ -121,6 +126,7 @@ print(" Pump PWMs/DACs: "+pumpPWMs) print(" DG Pressures: "+dgPres) print(" HD Pressures: "+hdPres) + print(" Temperatures: "+Temps) print(" Accelerometer: "+accels) print(" Alarms: "+alarms)