Index: dialin/dg/temperatures.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -rd12a1772af6b17f07b8ffc50e1396dcbe500876b --- dialin/dg/temperatures.py (.../temperatures.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision d12a1772af6b17f07b8ffc50e1396dcbe500876b) @@ -60,6 +60,8 @@ self.logger = logger # Dictionary of the temperature sensors self.dg_temperatures_timestamp = 0.0 + self.dialysate_inlet_moving_avg = 0.0 + self.redundant_outlet_moving_avg = 0.0 self.temperatures = {DGTemperaturesNames.INLET_PRIMARY_HEATER.name: 0.0, DGTemperaturesNames.HEAT_DISINFECT.name: 0.0, DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name: 0.0, @@ -168,6 +170,12 @@ self.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] + self.dialysate_inlet_moving_avg = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] + + self.redundant_outlet_moving_avg = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] + self.dg_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: tests/dg_tests.py =================================================================== diff -u -rfdd68b47e0ec4dbc3be930de58641348243bb167 -rd12a1772af6b17f07b8ffc50e1396dcbe500876b --- tests/dg_tests.py (.../dg_tests.py) (revision fdd68b47e0ec4dbc3be930de58641348243bb167) +++ tests/dg_tests.py (.../dg_tests.py) (revision d12a1772af6b17f07b8ffc50e1396dcbe500876b) @@ -282,15 +282,16 @@ def get_temperature_sensors_info(): info = ('TPi, {:5.3f}, THd, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, ' - 'Baro_temp, {:5.3f}, ' + 'Baro_temp, {:5.3f}, TDi_mving_avg, {:5.3f}, TRo_mving_avg, {:5.3f}, ' .format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.HEAT_DISINFECT.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name], dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name], - dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name])) + dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name], + dg.temperatures.dialysate_inlet_moving_avg, dg.temperatures.redundant_outlet_moving_avg)) return info @@ -731,14 +732,14 @@ #run_chemical_disinfect() - #hd.alarms.cmd_alarm_state_override(301, 1) + #hd.alarms.cmd_alarm_state_override(319, 1) #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense() #run_dg() # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #run_ro_permeate_sample() @@ -768,6 +769,6 @@ # print(dg.switches.dg_switches_status) # sleep(1) - dg.temperatures.cmd_temperatures_value_override(0, 30) +