Skip to content

Commit

Permalink
insert profile DS401 (generic I/O)
Browse files Browse the repository at this point in the history 
consistent names for object types (VAR, ARRAY, RECORD,...)
CANOPENNODE_LEGACY exporter takes the "CO_disabled" bit into account
  • Loading branch information
@trojanobelix
trojanobelix committed Oct 25, 2022
1 parent b69c173 commit af4d323
Show file tree
Hide file tree
Showing 16 changed files with 170,425 additions and 118 deletions.
46 changes: 23 additions & 23 deletions EDSEditorGUI/DeviceODView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@ public DeviceODView()

if (CANopenNodeV4)
{
comboBox_dataType.Items.Add("BOOLEAN");
comboBox_dataType.Items.Add("INTEGER8");
comboBox_dataType.Items.Add("INTEGER16");
comboBox_dataType.Items.Add("INTEGER32");
comboBox_dataType.Items.Add("INTEGER64");
comboBox_dataType.Items.Add("UNSIGNED8");
comboBox_dataType.Items.Add("UNSIGNED16");
comboBox_dataType.Items.Add("UNSIGNED32");
comboBox_dataType.Items.Add("UNSIGNED64");
comboBox_dataType.Items.Add("REAL32");
comboBox_dataType.Items.Add("REAL64");
comboBox_dataType.Items.Add("VISIBLE_STRING");
comboBox_dataType.Items.Add("OCTET_STRING");
comboBox_dataType.Items.Add("UNICODE_STRING");
comboBox_dataType.Items.Add("DOMAIN");

comboBox_objectType.Items.Add("VAR");
comboBox_objectType.Items.Add("ARRAY");
comboBox_objectType.Items.Add("RECORD");
comboBox_dataType.Items.Add(DataType.BOOLEAN.ToString());
comboBox_dataType.Items.Add(DataType.INTEGER8.ToString());
comboBox_dataType.Items.Add(DataType.INTEGER16.ToString());
comboBox_dataType.Items.Add(DataType.INTEGER32.ToString());
comboBox_dataType.Items.Add(DataType.INTEGER64.ToString());
comboBox_dataType.Items.Add(DataType.UNSIGNED8.ToString());
comboBox_dataType.Items.Add(DataType.UNSIGNED16.ToString());
comboBox_dataType.Items.Add(DataType.UNSIGNED32.ToString());
comboBox_dataType.Items.Add(DataType.UNSIGNED64.ToString());
comboBox_dataType.Items.Add(DataType.REAL32.ToString());
comboBox_dataType.Items.Add(DataType.REAL64.ToString());
comboBox_dataType.Items.Add(DataType.VISIBLE_STRING.ToString());
comboBox_dataType.Items.Add(DataType.OCTET_STRING.ToString());
comboBox_dataType.Items.Add(DataType.UNICODE_STRING.ToString());
comboBox_dataType.Items.Add(DataType.DOMAIN.ToString());

comboBox_objectType.Items.Add(ObjectType.VAR.ToString());
comboBox_objectType.Items.Add(ObjectType.ARRAY.ToString());
comboBox_objectType.Items.Add(ObjectType.RECORD.ToString());

foreach (AccessSDO foo in Enum.GetValues(typeof(AccessSDO)))
comboBox_accessSDO.Items.Add(foo.ToString());
Expand Down Expand Up @@ -235,7 +235,7 @@ public void PopulateSubList()
lvi.Tag = od;
listView_subObjects.Items.Add(lvi);
}
else if (od.objecttype == ObjectType.ARRAY || od.objecttype == ObjectType.REC)
else if (od.objecttype == ObjectType.ARRAY || od.objecttype == ObjectType.RECORD)
{
ListViewItem lvi = new ListViewItem(new string[]{
" ",
Expand Down Expand Up @@ -398,7 +398,7 @@ private void Button_saveChanges_Click(object sender, EventArgs e)
od.parameter_name = textBox_name.Text;
od.denotation = textBox_denotation.Text;
od.Description = textBox_description.Text.Replace("\r\n", "\n");
od.ObjectTypeString(od.parent == null ? comboBox_objectType.SelectedItem.ToString() : "VAR");
od.ObjectTypeString(od.parent == null ? comboBox_objectType.SelectedItem.ToString() : "VAR");

if (od.objecttype == ObjectType.VAR)
{
Expand Down Expand Up @@ -570,10 +570,10 @@ private void ListView_subObjects_MouseClick(object sender, MouseEventArgs e)
{
ODentry parent = od.parent == null ? od : od.parent;

if (parent.objecttype == ObjectType.ARRAY || parent.objecttype == ObjectType.REC)
if (parent.objecttype == ObjectType.ARRAY || parent.objecttype == ObjectType.RECORD)
{
contextMenu_subObject_removeSubItemToolStripMenuItem.Enabled = od.Subindex > 0 && od.parent != null;
contextMenu_subObject_removeSubItemLeaveGapToolStripMenuItem.Enabled = parent.objecttype == ObjectType.REC && od.Subindex > 0 && od.parent != null;
contextMenu_subObject_removeSubItemLeaveGapToolStripMenuItem.Enabled = parent.objecttype == ObjectType.RECORD && od.Subindex > 0 && od.parent != null;

if (listView_subObjects.FocusedItem.Bounds.Contains(e.Location) == true)
{
Expand Down
1 change: 1 addition & 0 deletions EDSEditorGUI/EDSEditorGUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
<None Include="Profiles\DS301_profile.xpd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Profiles\DS401_profile.xpd" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
4 changes: 3 additions & 1 deletion EDSEditorGUI/NewIndex.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion EDSEditorGUI/NewIndex.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void Button_create_Click(object sender, EventArgs e)
else if (radioButton_array.Checked)
objectType = ObjectType.ARRAY;
else if (radioButton_record.Checked)
objectType = ObjectType.REC;
objectType = ObjectType.RECORD;
else
{
MessageBox.Show("Please specify the Object Type");
Expand Down
Loading

0 comments on commit af4d323

Please sign in to comment.