Index: dialin/hd/ui_proxy.py =================================================================== diff -u -ra2d44432a913537ca0627cd7dde7dcb1154f2156 -r0672e22226aee86ce63dd4f42968c3071e89b652 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision a2d44432a913537ca0627cd7dde7dcb1154f2156) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 0672e22226aee86ce63dd4f42968c3071e89b652) @@ -239,11 +239,11 @@ self.treatment_end_cmd_succeeded = False self.treatment_end_cmd_reject_reason = 0 - self.reject_reasons = OrderedDict() - for attr in RequestRejectReasons.__members__: - attr: RequestRejectReasons = attr - self.reject_reasons[attr.name] = attr.value - self.reject_reasons = OrderedDict(sorted(self.reject_reasons.items(), key=lambda key: key[1])) +# self.reject_reasons = OrderedDict() +# for attr in RequestRejectReasons.__members__: +# attr: RequestRejectReasons = attr +# self.reject_reasons[attr.name] = attr.value +# self.reject_reasons = OrderedDict(sorted(self.reject_reasons.items(), key=lambda key: key[1])) def get_hd_version(self): """ Index: tests/test_voltages.py =================================================================== diff -u -rdcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b -r0672e22226aee86ce63dd4f42968c3071e89b652 --- tests/test_voltages.py (.../test_voltages.py) (revision dcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b) +++ tests/test_voltages.py (.../test_voltages.py) (revision 0672e22226aee86ce63dd4f42968c3071e89b652) @@ -21,13 +21,12 @@ from time import sleep from dialin.hd.voltages import HDMonitoredVoltages from dialin.dg.voltages import DGMonitoredVoltages -#from dialin.hd.constants import RESET, NO_RESET +from dialin.hd.constants import NO_RESET if __name__ == "__main__": # create an HD object called hd hd = HD() dg = DG() - sleep(2) # log in to HD and DG as tester if hd.cmd_log_in_to_hd() == 0: @@ -36,15 +35,17 @@ if dg.cmd_log_in_to_dg() == 0: print("Failed to log into DG.") exit(1) - sleep(1) + sleep(0.1) # hd.rtc.cmd_set_rtc_time_and_date(0,0,9,7,5,2021) # exit(1) - # override alarms/voltages broadcast interval to 100 ms - #hd.voltages.cmd_monitored_voltages_broadcast_interval_override(100,NO_RESET) - #hd.alarms.cmd_alarm_info_broadcast_interval_override(100,NO_RESET) + # override alarms/voltages broadcast interval to 50 ms + hd.voltages.cmd_monitored_voltages_broadcast_interval_override(50,NO_RESET) + hd.alarms.cmd_alarm_info_broadcast_interval_override(50,NO_RESET) + x = 0 + # create log file with open("/home/fw/projects/dialin/tests/v_test.log", "w") as f: # write column header labels to log file @@ -54,11 +55,14 @@ # write monitored voltages related data from HD to log file while True: - sleep(0.1) + x = x + 1 + if x == 40: + hd.alarms.cmd_alarm_backup_audio_current_override(0.0,NO_RESET) + if x == 80: + hd.watchdog.cmd_watchdog_task_check_in_override(0,1,NO_RESET) + sleep(0.05) vHd = hd.voltages.get_monitored_voltages() vDg = dg.voltages.get_monitored_voltages() - x = DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value - y = vDg[x] hdVoltageData = '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_1_2V.value]) + \ ", " + '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_3_3V.value]) + \ ", " + '{:11.6f}'.format(vHd[HDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value]) + \ @@ -92,4 +96,3 @@ # print to console print(hdVoltageData) print(dgVoltageData) -