Index: dialin/hd/blood_leak.py =================================================================== diff -u -r2de7a22cffb2f208f930e5972f023d105f0b4119 -r25ad5c79713a1ee12a358111ebda26340459ed4e --- dialin/hd/blood_leak.py (.../blood_leak.py) (revision 2de7a22cffb2f208f930e5972f023d105f0b4119) +++ dialin/hd/blood_leak.py (.../blood_leak.py) (revision 25ad5c79713a1ee12a358111ebda26340459ed4e) @@ -94,6 +94,7 @@ self.blood_leak_serial_comm_state = 0 self.blood_leak_intensity = 0 self.blood_leak_blood_detect = 0 + self.blood_leak_intensity_moving_average = 0 for cmd in EmbModeCommands.__members__: # Initialize all the embedded mode commands @@ -152,6 +153,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.blood_leak_blood_detect = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + self.blood_leak_intensity_moving_average = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.hd_blood_leak_status_timestamp = timestamp def cmd_blood_leak_detector_override(self, detected: int, reset=NO_RESET): Index: tests/dg_tests.py =================================================================== diff -u -r2de7a22cffb2f208f930e5972f023d105f0b4119 -r25ad5c79713a1ee12a358111ebda26340459ed4e --- tests/dg_tests.py (.../dg_tests.py) (revision 2de7a22cffb2f208f930e5972f023d105f0b4119) +++ tests/dg_tests.py (.../dg_tests.py) (revision 25ad5c79713a1ee12a358111ebda26340459ed4e) @@ -362,8 +362,11 @@ def get_blood_leak_info(): - info = ('Blood_leak_state, {}, Blood_leak_status, {}, ' - .format(hd.blood_leak.get_blood_leak_state(), hd.blood_leak.get_blood_leak_status())) + info = ('Blood_leak_state, {}, Blood_leak_status, {}, Blood_leak_intensity, {}, Blood_leak_detect, {}, ' + 'Blood_leak_int_mv_avg, {}, ' + .format(hd.blood_leak.get_blood_leak_state(), hd.blood_leak.get_blood_leak_status(), + hd.blood_leak.blood_leak_intensity, hd.blood_leak.blood_leak_blood_detect, + hd.blood_leak.blood_leak_intensity_moving_average)) return info @@ -775,14 +778,15 @@ #hd.ui.cmd_set_ro_only_mode_status(1) - #while True: + while True: # print(dg.switches.dg_switches_status) - # sleep(1) + print(get_blood_leak_info()) + sleep(1) #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() #while True: # print(hd.alarms.get_alarm_state(286), hd.alarms.get_alarm_state(289), dg.alarms.get_alarm_state(286), # dg.alarms.get_alarm_state(289)) # sleep(0.5) #hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS.value) #dg.cmd_dg_set_operation_mode(3) - hd.cmd_hd_set_operation_mode(1) + #hd.cmd_hd_set_operation_mode(1)