Index: shared/scripts/configuration/config.py =================================================================== diff -u -r0cc92d3b75bfb96dc4ecafd760a9ce15e455033b -r57644f8662735736c07ea303b6f5c17cfc929ce7 --- shared/scripts/configuration/config.py (.../config.py) (revision 0cc92d3b75bfb96dc4ecafd760a9ce15e455033b) +++ shared/scripts/configuration/config.py (.../config.py) (revision 57644f8662735736c07ea303b6f5c17cfc929ce7) @@ -32,3 +32,9 @@ BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" + + +RESET_BINARY = "0" +SET_BINARY = "1" #Message binaries appending with for easy identification +ACK_REQ_STATUS = 'Ack Req' +ACK_BAK_STATUS = 'Ack Bak' \ No newline at end of file Index: shared/scripts/configuration/utility.py =================================================================== diff -u -redbf7a246b6ef2adbcacb3c3a427b60bdf2fefb0 -r57644f8662735736c07ea303b6f5c17cfc929ce7 --- shared/scripts/configuration/utility.py (.../utility.py) (revision edbf7a246b6ef2adbcacb3c3a427b60bdf2fefb0) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 57644f8662735736c07ea303b6f5c17cfc929ce7) @@ -16,9 +16,13 @@ import sys import test import squish +import csv +from builtins import format +from datetime import datetime from configuration import config from builtins import int as pyInt + def start_application(app_name): """ Index: tst_unhandled_message_log/test.py =================================================================== diff -u -redbf7a246b6ef2adbcacb3c3a427b60bdf2fefb0 -r57644f8662735736c07ea303b6f5c17cfc929ce7 --- tst_unhandled_message_log/test.py (.../test.py) (revision edbf7a246b6ef2adbcacb3c3a427b60bdf2fefb0) +++ tst_unhandled_message_log/test.py (.../test.py) (revision 57644f8662735736c07ea303b6f5c17cfc929ce7) @@ -17,6 +17,9 @@ from dialin.ui.hd_simulator import HDSimulator from dialin.hd.reservoirs import HDReservoirs +from dialin.hd.valves import HDValves +from dialin.dg.reservoirs import DGReservoirs + from dialin.hd.rtc import HDRTC from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator import logging @@ -38,6 +41,8 @@ reservoirs = HDReservoirs(can_interface=messenger, logger=logger) alarm = HDAlarmsSimulator(can_interface=messenger, logger=logger) rtc = HDRTC(can_interface=messenger, logger=logger) +valves = HDValves(can_interface=messenger, logger=logger) +reservoirs = DGReservoirs(can_interface=messenger, logger=logger) def verify_log(msg_id,msg = None, param = None): @@ -46,6 +51,7 @@ 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) + test.log(str(message_extracted)) if ack == True: test.verify(config.ACK_REQ_STATUS in message_extracted, "ack request is verified") test.verify(config.ACK_BAK_STATUS in message_extracted, "ack back is verified") @@ -54,15 +60,22 @@ test.verify(message_id_str in message_extracted, "message ID is verified") if param != None: test.verify(param in message_extracted, "parameters are verified") - test.log(str(message_extracted)) + def main(): startApplication("denaliSquish") + snooze(5) alarm._send_alarm_volume_broadcast() - #verify_log(msg_id,msg = '~HD_Alarm_Information', param = None) + snooze(5) + verify_log(msg_id = MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, msg = '~HD_Alarm_Information', param = [5,1,1,1,'?']) + hd_simulator.cmd_send_hd_general_response(message_id = 33, accepted = 1, reason = 1) + + #reservoirs.cmd_switch_reservoirs(reservoir = 1) + snooze(5) + #valves = HDValves(can_interface=messenger, logger=logger) - rtc.cmd_set_rtc_time_and_date(second = 25, minute = 30, hour = 2, day = 5, month = 5, year = 2015) + #rtc.cmd_set_rtc_time_and_date(second = 25, minute = 30, hour = 2, day = 5, month = 5, year = 2015)