Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added functionality to CSharpGenerator to create an enum with the messageIDs #20

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions mavlink.net/UasMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ THE SOFTWARE.

namespace MavLinkNet
{
[Serializable]
public class UasMessage
{
public byte CrcExtra
Expand Down Expand Up @@ -78,14 +79,14 @@ protected virtual void InitMetadata()
protected UasMessageMetadata mMetadata;
}


[Serializable]
public class UasMessageMetadata
{
public string Description;
public List<UasFieldMetadata> Fields = new List<UasFieldMetadata>();
}


[Serializable]
public class UasFieldMetadata
{
public string Name;
Expand All @@ -94,15 +95,15 @@ public class UasFieldMetadata
public UasEnumMetadata EnumMetadata;
}


[Serializable]
public class UasEnumMetadata
{
public string Name;
public string Description;
public List<UasEnumEntryMetadata> Entries = new List<UasEnumEntryMetadata>();
}


[Serializable]
public class UasEnumEntryMetadata
{
public int Value;
Expand Down
28 changes: 27 additions & 1 deletion mavlinkobjectgenerator/CSharpGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public override void Write(ProtocolData data, TextWriter w)

WriteHeader();
WriteEnums();
WriteMsgIds();
WriteClasses();
WriteSummary();
WriteFooter();
Expand All @@ -67,6 +68,7 @@ public override void Write(ProtocolData data, TextWriter w)
private void WriteHeader()
{
WL("/* This file is automatically generated. Any changes made to it may be overwritten. */");
WL("/* Generated by MAVLink.NET on {0} at {1} */", DateTime.Now.ToLongDateString(),DateTime.Now.ToLongTimeString());
WL();
WL("using System;");
WL("using System.IO;");
Expand Down Expand Up @@ -94,6 +96,30 @@ private void WriteEnums()

}

private void WriteMsgIds()
{
List<string> escapedEnum = new List<string>();

foreach (MessageData m in mProtocolData.Messages.Values)
{
if (m.Description != null)
{
escapedEnum.Add(string.Format("\r\n\r\n /// <summary> {0} </summary>\r\n {1} = {2}",
GetSanitizedComment(m.Description),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please indent

escapedEnum.Add(string.Format("\r\n\r\n        /// <summary> {0} </summary>\r\n        {1} = {2}",
    GetSanitizedComment(m.Description),
    GetClassName(m),
    m.Id));

GetClassName(m),
m.Id));
}
else
{
escapedEnum.Add(string.Format("\r\n\r\n {0} = {1}",
GetClassName(m),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

m.Id));
}
}
WL(" public enum MavMsgIds{{ {0} }};", GetCommaSeparatedValues(escapedEnum, ""));
WL();
}

private void WriteClasses()
{
foreach (MessageData m in mProtocolData.Messages.Values)
Expand Down Expand Up @@ -238,7 +264,7 @@ private void WriteClassHeader(MessageData m)
WL(" /// {0}", GetSanitizedComment(m.Description));
WL(" /// </summary>");
}

WL(" [Serializable]");
WL(" public class {0}: UasMessage", GetClassName(m));
WL(" {");
}
Expand Down