Index: dialin/common/msg_ids.py =================================================================== diff -u -rde91e248f2fa117580b0a863fdc13b39b9427148 -r59b592b33c4d5e1105ea0bbd5131ac32d02a605d --- dialin/common/msg_ids.py (.../msg_ids.py) (revision de91e248f2fa117580b0a863fdc13b39b9427148) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 59b592b33c4d5e1105ea0bbd5131ac32d02a605d) @@ -8,7 +8,7 @@ # @file msg_ids.py # # @author (last) Dara Navaei -# @date (last) 11-Jan-2023 +# @date (last) 02-Feb-2023 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # @@ -461,6 +461,7 @@ MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE = 0xA061 MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE = 0xA062 MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE = 0xA063 + MSG_ID_DG_NELSON_DISINFECT_SUPPORT = 0xA064 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/hd/alarms.py =================================================================== diff -u -r7e923bbdc3b74e8987de2ffbad17c84970454cb6 -r59b592b33c4d5e1105ea0bbd5131ac32d02a605d --- dialin/hd/alarms.py (.../alarms.py) (revision 7e923bbdc3b74e8987de2ffbad17c84970454cb6) +++ dialin/hd/alarms.py (.../alarms.py) (revision 59b592b33c4d5e1105ea0bbd5131ac32d02a605d) @@ -131,7 +131,7 @@ # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is # the corresponding format in the python struct - if 'U32' in event_data_type or 'BOOL' in event_data_type: + if 'U32' in event_data_type or 'BOOL' in event_data_type or 'NONE' in event_data_type: struct_unpack_type = 'I' elif 'S32' in event_data_type: struct_unpack_type = 'i' @@ -443,15 +443,15 @@ data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) # Get the corresponding structure format - struct_data_type = self.alarm_data_type[HDEventDataType(data_typ_1).name] + struct_data_type_1 = self.alarm_data_type[HDEventDataType(data_typ_1[0]).name] # Get the data value by unpacking the data type - data_1 = struct.unpack(struct_data_type, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) # Get the corresponding structure format - struct_data_type = self.alarm_data_type[HDEventDataType(data_typ_2).name] + struct_data_type_2 = self.alarm_data_type[HDEventDataType(data_typ_2[0]).name] # Get the data value by unpacking the data type - data_2 = struct.unpack(struct_data_type, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) priority = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) rank = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))