Merge pull request #1752 from alehed/fix/make_compatible_with_mavlink…

…_pr_666 Make compatible with pymavlink type annotations PR
mavlink · Jun 7, 2022 · 9430c4e · 9430c4e
2 parents fce4ce0 + 686c531
commit 9430c4e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/mavros/mavros/cmd/checkid.py b/mavros/mavros/cmd/checkid.py
@@ -101,7 +101,15 @@ def fmt_msgid(msgid: int) -> str:
                 if msg is None:
                     return f"{msgid}"
                 else:
-                    return f"{msgid} ({msg.name})"
+                    msg_name = ""
+                    # In version 2.4.30 <TODO: replace with actual number>, the class variable name
+                    # was renamed to msgname. Since we don't know the pymavlink version we need to check
+                    # for both.
+                    if hasattr(msg, "msgname"):
+                        msg_name = msg.msgname
+                    else:
+                        msg_name = msg.name
+                    return f"{msgid} ({msg_name})"
 
             str_ids = self.fmt_ids(address)
             click.secho(