Index: scripts/MsgUtils/msgutils/MsgData.py =================================================================== diff -u -r2202de40fe8377f73b17cd3ab3d432b167dd5b66 -r088513e6ea7bad08b4fb7862127c726eabad18fd --- scripts/MsgUtils/msgutils/MsgData.py (.../MsgData.py) (revision 2202de40fe8377f73b17cd3ab3d432b167dd5b66) +++ scripts/MsgUtils/msgutils/MsgData.py (.../MsgData.py) (revision 088513e6ea7bad08b4fb7862127c726eabad18fd) @@ -146,10 +146,10 @@ if not line and row_data is not None: # check to see if data has already been collected for this msg_id_value if row_data['msg_id_value'] in self.data: - print(f"WARNING: found message ({self.data[msg_id_value]['msg_id_hex_string']}) with same ID ({self.data[row_data['msg_id_value']]['msg_id']}) will be replaced by {row_data['msg_id']} for value {row_data['msg_id_hex_string']}") + print(f"WARNING: found message with same ID ({self.data[row_data['msg_id_value']]['msg_id_hex_string']}) - {self.data[row_data['msg_id_value']]['msg_id']} will be replaced by {row_data['msg_id']} for value {row_data['msg_id_hex_string']}") for item in self.data.values(): if item['msg_name'] == row_data['msg_name']: - print(f"WARNING: found message ({item['msg_id_hex_string']}, {row_data['msg_id_hex_string']}) with same name ({row_data['msg_name']}), skipping message") + print(f"WARNING: found message {item['msg_id_hex_string']} with same name ({row_data['msg_name']}) as new message{row_data['msg_id_hex_string']}, skipping message") row_data = None break if row_data is not None: @@ -178,7 +178,7 @@ # message name (first line of message section) elif row_data is not None and row_data['msg_id'] == '': row_data['raw'] += line + '\n' - row_data['msg_id'] = 'MSG_ID_' + '_'.join(word.upper() for word in line.split('_')) + row_data['msg_id'] = line if re.fullmatch(name_regex, line): row_data['msg_name'] = self.__message_name(row_data['msg_id']) else: