Index: dialin/hd/alarms.py =================================================================== diff -u -r3fb7646b2d2a5346ac5b6eecbcee97ccc643d8be -rdcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b --- dialin/hd/alarms.py (.../alarms.py) (revision 3fb7646b2d2a5346ac5b6eecbcee97ccc643d8be) +++ dialin/hd/alarms.py (.../alarms.py) (revision dcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b) @@ -105,6 +105,7 @@ self.alarm_audio_curr_hg = 0.0 self.alarm_audio_curr_lg = 0.0 self.alarm_backup_audio_curr = 0.0 + self.safety_shutdown_active = False def get_current_alarms_state(self): """ @@ -192,6 +193,48 @@ """ return self.alarms_flags + def get_alarm_volume(self): + """ + Gets the alarm audio volume level. + + @return: (int) current alarm audio volume (1..5) + """ + return self.alarm_volume + + def get_alarm_audio_current_hg(self): + """ + Gets the alarm audio current - high gain. + + @return: (float) alarm audio current - high gain (in mA) + """ + return self.alarm_audio_curr_hg + + + def get_alarm_audio_current_lg(self): + """ + Gets the alarm audio current - low gain. + + @return: (float) alarm audio current - low gain (in mA) + """ + return self.alarm_audio_curr_lg + + + def get_alarm_backup_audio_current(self): + """ + Gets the alarm backup audio current. + + @return: (float) alarm backup audio current (in mA) + """ + return self.alarm_backup_audio_curr + + def get_safety_shutdown_activated(self): + """ + Gets the state of the HD safety shutdown signal. + + @return: (bool) safety shutdown line is activated (T/F) + """ + return self.safety_shutdown_active + @_publish(["alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) def _handler_alarms_status_sync(self, message): """ @@ -276,10 +319,12 @@ ach = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) acl = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) bac = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + saf = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) self.alarm_volume = vol[0] self.alarm_audio_curr_hg = ach[0] self.alarm_audio_curr_lg = acl[0] self.alarm_backup_audio_curr = bac[0] + self.safety_shutdown_active = True if saf[0] == 1 else False def cmd_clear_all_alarms(self): """ Index: dialin/hd/syringe_pump.py =================================================================== diff -u -ra6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547 -rdcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision a6d0b0a53d05e1e6458c75f2ab77ac5bbf82b547) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision dcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b) @@ -221,7 +221,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) saf = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) - sts = struct.unpack('f', bytearray( + sts = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) self.syringe_pump_state = sta[0] Index: tests/test_syringe.py =================================================================== diff -u -r70a23d4addc204861b2b65181725ae41279d7acd -rdcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b --- tests/test_syringe.py (.../test_syringe.py) (revision 70a23d4addc204861b2b65181725ae41279d7acd) +++ tests/test_syringe.py (.../test_syringe.py) (revision dcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b) @@ -25,9 +25,9 @@ sleep(2) # log in to HD and DG as tester -# if hd.cmd_log_in_to_hd() == 0: -# exit(1) -# sleep(1) + if hd.cmd_log_in_to_hd() == 0: + exit(1) + sleep(1) # hd.syringe_pump.cmd_syringe_pump_operation(0,0.0,0.0) # stop # hd.syringe_pump.cmd_syringe_pump_operation(1,0.0,0.0) # retract Index: tests/test_voltages.py =================================================================== diff -u -r68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8 -rdcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b --- tests/test_voltages.py (.../test_voltages.py) (revision 68fbc5d620fe9e4fbaf3c61c8b9986a68b4a5de8) +++ tests/test_voltages.py (.../test_voltages.py) (revision dcc724fe28fdd2600c916f6e6ac4a9ad6f0b4a9b) @@ -38,6 +38,9 @@ exit(1) sleep(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)