Skip to content

Commit 2326320

Browse files
trojanobelixtrojanobelix
committed
Merge branch 'bugfix' into feature
2 parents 44860c7 + 6cee770 commit 2326320

32 files changed

+3250
-2961
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99
jobs:
1010
build:
1111

12-
runs-on: windows-2019
13-
# runs-on: windows-latest # error MSB3644: The reference assemblies for .NETFramework,Version=v4.5 were not found.
12+
runs-on: windows-latest
1413
# runs-on: ubuntu-latest # Error: setup-msbuild can only be run on Windows runners
1514
steps:
1615
- name: Checkout

‎EDSEditorGUI/DeviceInfoView.Designer.cs‎

Lines changed: 875 additions & 809 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EDSEditorGUI/DeviceInfoView.cs‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public void populatedeviceinfo()
8585
//DCF support
8686
if (eds.dc!=null)
8787
{
88-
textBox_concretenodeid.Text = eds.dc.NodeId.ToString();
88+
textBox_concretenodeid.Text = eds.dc.NodeID.ToString();
8989
textBox_nodename.Text = eds.dc.NodeName;
90-
textBox_baudrate.Text = eds.dc.BaudRate.ToString();
90+
textBox_baudrate.Text = eds.dc.Baudrate.ToString();
9191
textBox_netnum.Text = eds.dc.NetNumber.ToString();
9292
checkBox_canopenmanager.Checked = eds.dc.CANopenManager;
9393
textBox_lssserial.Text = eds.dc.LSS_SerialNumber.ToString();
@@ -97,21 +97,16 @@ public void populatedeviceinfo()
9797

9898
}
9999

100-
101-
void InputControls_OnChange(object sender, EventArgs e)
102-
{
103-
// Do something to indicate the form is dirty like:
104-
button_update_devfile_info.BackColor = System.Drawing.Color.Red;
105-
}
100+
106101

107102
void AddOnChangeHandlerToInputControls(ControlCollection ctrl)
108103
{
109104
foreach (Control subctrl in ctrl)
110105
{
111-
//if (subctrl is TextBox)
112-
// ((TextBox)subctrl).TextChanged +=
113-
// new EventHandler(InputControls_OnChange);
114-
//else
106+
if (subctrl is TextBox)
107+
((TextBox)subctrl).TextChanged +=
108+
new EventHandler(InputControls_OnChange);
109+
else
115110
if (subctrl is CheckBox)
116111
((CheckBox)subctrl).CheckedChanged +=
117112
new EventHandler(InputControls_OnChange);
@@ -121,11 +116,9 @@ void AddOnChangeHandlerToInputControls(ControlCollection ctrl)
121116
this.AddOnChangeHandlerToInputControls(subctrl.Controls);
122117
}
123118
}
124-
}
119+
}
125120

126-
127-
128-
private void button_update_devfile_info_Click(object sender, EventArgs e)
121+
private void update_devfile_info()
129122
{
130123
if (eds == null)
131124
return;
@@ -164,22 +157,26 @@ private void button_update_devfile_info_Click(object sender, EventArgs e)
164157
//textBox_txpdos.Text = eds.di.NrOfTXPDO.ToString();
165158

166159
//DCF support
167-
eds.dc.NodeId = Convert.ToByte(textBox_concretenodeid.Text);
160+
eds.dc.NodeID = Convert.ToByte(textBox_concretenodeid.Text);
168161
eds.dc.NodeName = textBox_nodename.Text;
169-
eds.dc.BaudRate = Convert.ToUInt16(textBox_baudrate.Text);
162+
eds.dc.Baudrate = Convert.ToUInt16(textBox_baudrate.Text);
170163
eds.dc.NetNumber = Convert.ToUInt32(textBox_netnum.Text);
171164
eds.dc.CANopenManager = checkBox_canopenmanager.Checked;
172165
eds.dc.LSS_SerialNumber = Convert.ToUInt32(textBox_lssserial.Text);
173166

174167
eds.Dirty = true;
175-
button_update_devfile_info.BackColor = SystemColors.ButtonFace;
176-
button_update_devfile_info.UseVisualStyleBackColor = true;
177168

178169
}
179170
catch (Exception ex)
180171
{
181172
MessageBox.Show("Update failed, reason :-\n" + ex.ToString());
182173
}
183-
}
174+
}
175+
176+
void InputControls_OnChange(object sender, EventArgs e)
177+
{
178+
// Changes detected: Update the device info
179+
update_devfile_info();
180+
}
184181
}
185182
}

‎EDSEditorGUI/DeviceInfoView.resx‎

Lines changed: 119 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,120 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
6-
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
11-
associated with the data types.
12-
13-
Example:
14-
15-
... ado.net/XML headers & schema ...
16-
<resheader name="resmimetype">text/microsoft-resx</resheader>
17-
<resheader name="version">2.0</resheader>
18-
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19-
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20-
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21-
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22-
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23-
<value>[base64 mime encoded serialized .NET Framework object]</value>
24-
</data>
25-
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26-
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27-
<comment>This is a comment</comment>
28-
</data>
29-
30-
There are any number of "resheader" rows that contain simple
31-
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
37-
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
41-
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
45-
read any of the formats listed below.
46-
47-
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
49-
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50-
: and then encoded with base64 encoding.
51-
52-
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
54-
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55-
: and then encoded with base64 encoding.
56-
57-
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
59-
: using a System.ComponentModel.TypeConverter
60-
: and then encoded with base64 encoding.
61-
-->
62-
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63-
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64-
<xsd:element name="root" msdata:IsDataSet="true">
65-
<xsd:complexType>
66-
<xsd:choice maxOccurs="unbounded">
67-
<xsd:element name="metadata">
68-
<xsd:complexType>
69-
<xsd:sequence>
70-
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71-
</xsd:sequence>
72-
<xsd:attribute name="name" use="required" type="xsd:string" />
73-
<xsd:attribute name="type" type="xsd:string" />
74-
<xsd:attribute name="mimetype" type="xsd:string" />
75-
<xsd:attribute ref="xml:space" />
76-
</xsd:complexType>
77-
</xsd:element>
78-
<xsd:element name="assembly">
79-
<xsd:complexType>
80-
<xsd:attribute name="alias" type="xsd:string" />
81-
<xsd:attribute name="name" type="xsd:string" />
82-
</xsd:complexType>
83-
</xsd:element>
84-
<xsd:element name="data">
85-
<xsd:complexType>
86-
<xsd:sequence>
87-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88-
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89-
</xsd:sequence>
90-
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91-
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92-
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93-
<xsd:attribute ref="xml:space" />
94-
</xsd:complexType>
95-
</xsd:element>
96-
<xsd:element name="resheader">
97-
<xsd:complexType>
98-
<xsd:sequence>
99-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100-
</xsd:sequence>
101-
<xsd:attribute name="name" type="xsd:string" use="required" />
102-
</xsd:complexType>
103-
</xsd:element>
104-
</xsd:choice>
105-
</xsd:complexType>
106-
</xsd:element>
107-
</xsd:schema>
108-
<resheader name="resmimetype">
109-
<value>text/microsoft-resx</value>
110-
</resheader>
111-
<resheader name="version">
112-
<value>2.0</value>
113-
</resheader>
114-
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116-
</resheader>
117-
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119-
</resheader>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120120
</root>

‎EDSEditorGUI/DeviceODView.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)