Skip to content

Commit

Permalink
Merge pull request mavlink#399 from modnovolyk/inherit-enums-description
Browse files Browse the repository at this point in the history
mavparse: transfer enums description to child definition while merging enums
  • Loading branch information
LorenzMeier committed Jun 18, 2015
2 parents 678b2a7 + ad938c9 commit 6634482
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pymavlink/generator/mavparse.py
Expand Up @@ -310,6 +310,8 @@ def merge_enums(xml):
for enum in x.enum:
if enum.name in emap:
emap[enum.name].entry.extend(enum.entry)
if not emap[enum.name].description:
emap[enum.name].description = enum.description
print("Merged enum %s" % enum.name)
else:
newenums.append(enum)
Expand Down

0 comments on commit 6634482

Please sign in to comment.