Index: tst_ui_logs/test.py =================================================================== diff -u -r2818b83a0456c7419a3b9a297d5e9eb288ce744c -r264a09400a06be340935253b902784cfc5ca29fe --- tst_ui_logs/test.py (.../test.py) (revision 2818b83a0456c7419a3b9a297d5e9eb288ce744c) +++ tst_ui_logs/test.py (.../test.py) (revision 264a09400a06be340935253b902784cfc5ca29fe) @@ -29,27 +29,26 @@ from configuration import config import builtins from dialin.common.msg_ids import MsgIds +from dialin.common.hd_defs import HDOpSubModes from dialin.common import msg_defs from dialin.utils.conversions import byte_to_bytearray, integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array -# from dialin.utils import YES +hd_simulator = HDSimulator() +dg_simulator = DGSimulator() + logger= logging.getLogger("INFO") messenger= DenaliCanMessenger('can0') - hd_alarm= HDAlarmsSimulator(can_interface=messenger, logger=logger) -hd_simulator = HDSimulator() -dg_simulator = DGSimulator() NUMBER_OF_OPMODE = 9 NUMBER_OF_TREATMENTMODES = 3 CONDITIONS = [0,1] - -def verify_log(msg_id,msg = None, param = None): +def verify_log(msg_id,msg=None, param=None): utils.waitForGUI(2) ack = False if not msg_id in msg_defs.ACK_NOT_REQUIRED: ack = True - message_extracted = utility.get_current_log_details(message_ack = ack, message_text = msg) + message_extracted = utility.get_current_log_details(message_ack=ack, message_text=msg) test.log(str(message_extracted)) if ack == True: test.verify(config.ACK_REQ_STATUS in message_extracted, "ack request is verified") @@ -71,7 +70,7 @@ verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [200,60,0]) #0x0500 - hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt=20, measured_flow=10.5, + hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt = 20, measured_flow = 10.5, rot_speed = 112.2 , mot_speed = 120.3, mc_speed = 100.0, mc_current = 12.5, pwm = 32.3, rotor_count = 30) verify_log(msg_id = MsgIds.MSG_ID_BLOOD_FLOW_DATA.value, msg = "BloodFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3,30]) @@ -232,7 +231,8 @@ #HD Operation Mode #0x2500 for mode in range(NUMBER_OF_OPMODE): - hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = 0) + #hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = 0) + hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = HDOpSubModes.SUBMODE_START.value) verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE.value, msg = "OpMode", param = [mode,0]) #0x5C00