Index: dialin/hd/blood_leak.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -r0110f05bf353d1d2b38eb530c6e588e67c8f370d --- dialin/hd/blood_leak.py (.../blood_leak.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ dialin/hd/blood_leak.py (.../blood_leak.py) (revision 0110f05bf353d1d2b38eb530c6e588e67c8f370d) @@ -101,14 +101,9 @@ self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED self.blood_leak_state = self.BLOOD_LEAK_INIT_STATE - self.blood_leak_zeroed_status_counter = 0 - self.blood_leak_counter = 0 - self.blood_leak_zeroed_status = 0 self.blood_leak_detect_set_point = 0 self.blood_leak_detect_level = 0 - self.blood_leak_st_count = 0 self.blood_leak_led_intensity = 0 - self.blood_leak_register_counter = 0 self.blood_leak_emb_mode_cmd_response = '' self._is_emb_mode_command_in_progress = False @@ -128,30 +123,6 @@ """ return self.blood_leak_state - def get_blood_leak_zero_status_counter(self): - """ - Gets the current blood leak zero status counter - - @return: integer - blood leak zero status counter - """ - return self.blood_leak_zeroed_status_counter - - def get_blood_leak_counter(self): - """ - Gets the current blood leak counter - - @return: integer - blood leak counter - """ - return self.blood_leak_counter - - def get_blood_leak_zeroed_status(self): - """ - Gets the current blood leak zeroed status - - @return: integer - blood leak zeroed status - """ - return self.blood_leak_zeroed_status - def get_blood_leak_detect_set_point(self): """ Gets the current blood leak detect set point @@ -168,14 +139,6 @@ """ return self.blood_leak_detect_level - def get_blood_leak_st_count(self): - """ - Gets the current blood leak st count - - @return: integer - blood leak st count - """ - return self.blood_leak_st_count - def get_blood_leak_led_intensity(self): """ Gets the current blood leak LED intensity @@ -184,14 +147,6 @@ """ return self.blood_leak_led_intensity - def get_blood_leak_register_counter(self): - """ - Gets the current blood leak register counter - - @return: integer - blood leak register counter - """ - return self.blood_leak_register_counter - def get_blood_leak_emb_mode_command_response(self): """ Gets the embedded mode command response @@ -221,9 +176,8 @@ return self.blood_leak_emb_mode_cmd_response - @publish(['blood_leak_status', 'blood_leak_state', 'blood_leak_zeroed_status_counter', 'blood_leak_counter', - 'blood_leak_zeroed_status', 'blood_leak_detect_set_point', 'blood_leak_detect_level', - 'blood_leak_st_count', 'blood_leak_led_intensity', 'blood_leak_register_counter']) + @publish(['blood_leak_status', 'blood_leak_state', 'blood_leak_detect_set_point', 'blood_leak_detect_level', + 'blood_leak_led_intensity']) def _handler_blood_leak_sync(self, message): """ Handles published blood leak status messages. Blood leak status is captured @@ -232,27 +186,16 @@ @param message: published blood leak status message @return: None """ - self.blood_leak_status = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.blood_leak_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.blood_leak_zeroed_status_counter = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.blood_leak_counter = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.blood_leak_zeroed_status = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.blood_leak_detect_set_point = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.blood_leak_detect_level = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.blood_leak_st_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.blood_leak_led_intensity = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.blood_leak_register_counter = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] def cmd_blood_leak_detector_override(self, detected, reset=NO_RESET): """ Index: tests/dg_tests.py =================================================================== diff -u -r1c5dbffa6b205c14f92e05badc563f2a84980bfa -r0110f05bf353d1d2b38eb530c6e588e67c8f370d --- tests/dg_tests.py (.../dg_tests.py) (revision 1c5dbffa6b205c14f92e05badc563f2a84980bfa) +++ tests/dg_tests.py (.../dg_tests.py) (revision 0110f05bf353d1d2b38eb530c6e588e67c8f370d) @@ -494,6 +494,8 @@ def run_heat_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") + dg.heaters.cmd_heaters_broadcast_interval_override(50) + sleep(1) dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() try: @@ -515,21 +517,21 @@ print(var) f.write(var) - sleep(1) + sleep(0.05) # If the mode came back to standby or standby solo - if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4: + #if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4: # If it is the first call, stop heat disinfect - if complete_counter == 1: - dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) + # if complete_counter == 1: + # dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) # Write a few more complete states to make sure the complete state items are recorded - elif complete_counter == 3: + # elif complete_counter == 3: # pass - f.close() - break + # f.close() + # break - complete_counter += 1 + # complete_counter += 1 except KeyboardInterrupt: dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) @@ -684,7 +686,7 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() @@ -694,7 +696,7 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment() Index: tests/hd_blood_leak_data.py =================================================================== diff -u -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee -r0110f05bf353d1d2b38eb530c6e588e67c8f370d --- tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) +++ tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision 0110f05bf353d1d2b38eb530c6e588e67c8f370d) @@ -24,14 +24,11 @@ def get_blood_leak_info(): - info = ('Blood_leak_state, {}, Blood_leak_status, {}, Blood_leak_zero_status_counter, {}, Blood_leak_counter, {}, ' - 'Blood_leak_zeroed_status, {}, Blood_leak_detect_set_point, {}, Blood_leak_detect_level, {}, ' - 'Blood_leak_st_count, {}, Blood_leak_led_intensity, {}, Blood_leak_register_counter, {}, ' + info = ('Blood_leak_state, {}, Blood_leak_status, {}, Blood_leak_detect_set_point, {}, Blood_leak_detect_level, {},' + ' Blood_leak_led_intensity, {}, ' .format(hd.blood_leak.get_blood_leak_state(), hd.blood_leak.get_blood_leak_status(), - hd.blood_leak.get_blood_leak_zero_status_counter(), hd.blood_leak.get_blood_leak_counter(), - hd.blood_leak.get_blood_leak_zeroed_status(), hd.blood_leak.get_blood_leak_detect_set_point(), - hd.blood_leak.get_blood_leak_detect_level(), hd.blood_leak.get_blood_leak_st_count(), - hd.blood_leak.get_blood_leak_led_intensity(), hd.blood_leak.get_blood_leak_register_counter())) + hd.blood_leak.get_blood_leak_detect_set_point(), hd.blood_leak.get_blood_leak_detect_level(), + hd.blood_leak.get_blood_leak_led_intensity())) return info