- update different spelling to "CANopen" in comments and strings

- missing """ at <include "CO_OD.h"> in CO_OD.c  file
- corrected typo "comparability Entry" to "compatibility entry"

Author: trojanobelix

EDSTest/DeviceInfoView.Designer.cs

@@ -220,7 +220,7 @@ private void button_save_changes_Click(object sender, EventArgs e)
                 // Propagate changes through sub objects
                 // We only really need to do this for PDOMapping to fix bug #13 see report
                 // on git hub for discussion why other parameters are not propagated here
-                // tl;dr; Limitations of CanOpenNode object dictionary perms for sub array objects
+                // tl;dr; Limitations of CANopenNode object dictionary perms for sub array objects
 
                 foreach (KeyValuePair<UInt16,ODentry>kvp in selectedobject.subobjects)
                 {
@@ -1112,7 +1112,7 @@ private void changeMaxSubIndexToolStripMenuItem_Click(object sender, EventArgs e
         {
             //Change the max subindex, it is allowed to have a different max subindex to the physical array size
             //as depending on implementation it might not be a simple array behind the scenes. Even 0x1010,0x1011 
-            //do this on their implementation in CanopenNode
+            //do this on their implementation in CANopenNode
 
             if (selecteditemsub.Tag != null)
             {

EDSTest/DeviceODView.cs

@@ -236,7 +236,7 @@ private void openCanOpenNodeXMLToolStripMenuItem_Click(object sender, EventArgs
         {
 
             OpenFileDialog odf = new OpenFileDialog();
-            odf.Filter = "All supported files (*.eds;*.xml;*.xdd;*.dcf)|*.eds;*.xml;*.xdd;*.dcf|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf|CanOpen Xml Data sheet (*.xdd)|*.xdd|CanOpenNode XML (*.xml)|*.xml";
+            odf.Filter = "All supported files (*.eds;*.xml;*.xdd;*.dcf)|*.eds;*.xml;*.xdd;*.dcf|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf|CANopen Xml Data sheet (*.xdd)|*.xdd|CANopenNode XML (*.xml)|*.xml";
             if (odf.ShowDialog() == DialogResult.OK)
             {
 
@@ -484,7 +484,7 @@ private void exportDeviceFileToolStripMenuItem_Click(object sender, EventArgs e)
                 DeviceView dv = (DeviceView)tabControl1.SelectedTab.Controls[0];
                 SaveFileDialog sfd = new SaveFileDialog();
 
-                sfd.Filter = "Canopen Node XML (*.xml)|*.xml|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf";
+                sfd.Filter = "CANopen Node XML (*.xml)|*.xml|Electronic Data Sheets (*.eds)|*.eds|Device Configuration Files (*.dcf)|*.dcf";
 
                 sfd.InitialDirectory = Path.GetDirectoryName(dv.eds.xmlfilename);
                 sfd.RestoreDirectory = true;
@@ -522,7 +522,7 @@ private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
                 DeviceView dv = (DeviceView)tabControl1.SelectedTab.Controls[0];
                 SaveFileDialog sfd = new SaveFileDialog();
 
-                sfd.Filter = "CanOpen XDD (*.xdd)|*.xdd";
+                sfd.Filter = "CANopen XDD (*.xdd)|*.xdd";
 
                 sfd.InitialDirectory = Path.GetDirectoryName(dv.eds.xmlfilename);
                 sfd.RestoreDirectory = true;
@@ -733,7 +733,7 @@ private void saveNetworkXmlToolStripMenuItem_Click(object sender, EventArgs e)
         {
             SaveFileDialog sfd = new SaveFileDialog();
 
-            sfd.Filter = "CanOpen Network XDD (*.nxdd)|*.nxdd|CanOpen network XML (*.nxml)|*.nxml";
+            sfd.Filter = "CANopen Network XDD (*.nxdd)|*.nxdd|CANopen network XML (*.nxml)|*.nxml";
 
             sfd.InitialDirectory = Path.GetDirectoryName(networkfilename);
             sfd.RestoreDirectory = true;
@@ -765,7 +765,7 @@ private void loadNetworkXmlToolStripMenuItem_Click(object sender, EventArgs e)
         {
 
             OpenFileDialog odf = new OpenFileDialog();
-            odf.Filter = "CanOpen Network XDD (*.nxdd)|*.nxdd|CanOpen network XML (*.nxml)|*.nxml";
+            odf.Filter = "CANopen Network XDD (*.nxdd)|*.nxdd|CANopen network XML (*.nxml)|*.nxml";
             if (odf.ShowDialog() == DialogResult.OK)
             {
                 switch (Path.GetExtension(odf.FileName).ToLower())
@@ -967,7 +967,7 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
         private void saveExportAllToolStripMenuItem_Click(object sender, EventArgs e)
         {
             string temp;
-            //Attempt to save EDS,XML and export the CanOpen dictionary
+            //Attempt to save EDS,XML and export the CANopen dictionary
 
             if (tabControl1.SelectedTab != null)
             {

EDSTest/Form1.cs

@@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License
 /* I know I'm going to regret this
  * 
  * I quite like my eds class as it trys to validate the EDS using typing and enums etc
- * but i also want the XML wrappers for the CanOpenXML
+ * but i also want the XML wrappers for the CANOpenXML
  * so I'm going to make a converter outside of both classes hence this bridge
  * which is more code to manage ;-(
  * */
@@ -286,7 +286,7 @@ public EDSsharp convert(Device dev)
                 }
                 else
                 {
-                    //CanOpenNode Project XML did not correctly set DataTypes for record sets
+                    //CANopenNode Project XML did not correctly set DataTypes for record sets
 
                     if (entry.Index == 0x1018)
                         entry.datatype = DataType.IDENTITY;
@@ -542,7 +542,7 @@ public EDSsharp convert(Device dev)
             {
                 if (dev.Other.File != null)
                 {
-                    // CanOpenNode default project.xml contains - for fileversion, its suppose to be a byte field according to DS306
+                    // CANopenNode default project.xml contains - for fileversion, its suppose to be a byte field according to DS306
                     if (dev.Other.File.FileVersion == "-")
                     {
                         dev.Other.File.FileVersion = "0";

libEDSsharp/Bridge.cs

@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
     along with libEDSsharp.  If not, see <http://www.gnu.org/licenses/>.
  
     Copyright(c) 2016 - 2019 Robin Cornelius <robin.cornelius@gmail.com>
-    based heavily on the files CO_OD.h and CO_OD.c from CanOpenNode which are
+    based heavily on the files CO_OD.h and CO_OD.c from CANopenNode which are
     Copyright(c) 2010 - 2016 Janez Paternoster
 */
 
@@ -69,26 +69,26 @@ public void export(string folderpath, string filename, string gitVersion, EDSsha
 
         //private bool compatfixed = false;
         private void fixcompatentry()
-        {
-           // compatfixed = false;
-
-
-            // Handle the TPDO communication parameters in a special way, because of
-            // sizeof(OD_TPDOCommunicationParameter_t) != sizeof(CO_TPDOCommPar_t) in CanOpen.c
-            // the existing CO_TPDOCommPar_t has a compatibility entry so we must export one regardless
-            // of if its in the OD or not
-
+        {
+            // compatfixed = false;
+
+
+            // Handle the TPDO communication parameters in a special way, because of
+            // sizeof(OD_TPDOCommunicationParameter_t) != sizeof(CO_TPDOCommPar_t) in CANopen.c
+            // the existing CO_TPDOCommPar_t has a compatibility entry so we must export one regardless
+            // of if its in the OD or not
+
             for (UInt16 idx = 0x1800; idx < 0x1900; idx++)
             {
                 if (eds.ods.ContainsKey(idx))
                 {
                     ODentry od = eds.ods[idx];
 
                     if (!od.Containssubindex(0x04))
-                    {
-                        //compatfixed = true;
-                        ODentry compatability = new ODentry("comparability Entry", 0x05, DataType.UNSIGNED8, "0", EDSsharp.AccessType.ro, PDOMappingType.no);
-                        od.subobjects.Add(0x04, compatability);
+                    {
+                        //compatfixed = true;
+                        ODentry compatibility = new ODentry("compatibility entry", idx, DataType.UNSIGNED8, "0", EDSsharp.AccessType.ro, PDOMappingType.no, od);
+                        od.subobjects.Add(0x04, compatibility);
                     }
                 }
             }
@@ -379,9 +379,9 @@ not derived from or based on this library. If you modify this
         private void export_h(string filename)
         {
             if (filename == "")
-                filename = "CO_OD.c";
+                filename = "CO_OD";
 
-            StreamWriter file = new StreamWriter(folderpath + Path.DirectorySeparatorChar + filename);
+            StreamWriter file = new StreamWriter(folderpath + Path.DirectorySeparatorChar + filename + ".h");
 
 
             addGPLheader(file);
@@ -509,7 +509,7 @@ TYPE DEFINITIONS FOR RECORDS
 *******************************************************************************/");
 
             //We need to identify all the record types used and generate a struct for each one
-            //FIXME the original CanOpenNode exporter said how many items used this struct in the comments
+            //FIXME the original CANopenNode exporter said how many items used this struct in the comments
 
             List<string> structnamelist = new List<string>();
 
@@ -776,13 +776,13 @@ ALIASES FOR OBJECT DICTIONARY VARIABLES
         private void export_c(string filename)
         {
             if (filename == "")
-                filename =  "CO_OD.c";
+                filename =  "CO_OD";
             StreamWriter file = new StreamWriter(folderpath + Path.DirectorySeparatorChar + filename + ".c");
 
             addGPLheader(file);
 
             file.WriteLine(@"#include ""CO_driver.h""
-#include " + filename + @".h""
+#include """  +  filename + @".h""
 #include ""CO_SDO.h""
 
 /*******************************************************************************
@@ -929,14 +929,14 @@ protected string write_od_line(ODentry od)
             {
                 if ((od.Getmaxsubindex() != nosubindexs))
                 {
-                    if (od.Index != 0x1003 && od.Index != 0x1011)//ignore 0x1003, it is a special case as per canopen specs, and ignore 0x1011 canopennode uses special sub indexes for eeprom resets
+                    if (od.Index != 0x1003 && od.Index != 0x1011)//ignore 0x1003, it is a special case as per CANopen specs, and ignore 0x1011 CANopenNode uses special sub indexes for eeprom resets
                     {
                         Warnings.warning_list.Add(String.Format("Subindex discrepancy on object 0x{0:x4} arraysize: {1} vs max sub-index: {2}", od.Index, nosubindexs, od.Getmaxsubindex())); 
                     }
 
-                    //0x1003 is a special case for CanOpenNode
+                    //0x1003 is a special case for CANopenNode
                     //SubIndex 0 will probably be 0 for no errors
-                    //so we cannot read that to determine max subindex size, which is required to set up CanOpenNode so we leave it alone here
+                    //so we cannot read that to determine max subindex size, which is required to set up CANopenNode so we leave it alone here
                     //as its already set to subod.count
                     if (od.Index != 0x1003)
                     {
@@ -977,7 +977,7 @@ protected string write_od_line(ODentry od)
         }
 
         /// <summary>
-        /// Get the CanOpenNode specific flags, these flags are used internally in CanOpenNode to determine details about the object variable
+        /// Get the CANopenNode specific flags, these flags are used internally in CanOpenNode to determine details about the object variable
         /// </summary>
         /// <param name="od">An odentry to access</param>
         /// <returns>byte containing the flag value</returns>
@@ -1326,7 +1326,7 @@ protected string export_record_types()
 
                 if(od.Index>=0x1400 && od.Index<0x1600)
                 {
-                    count = 3; //CanOpenNode Fudging. Its only 3 parameters for RX PDOS in the c code despite being a PDO_COMMUNICATION_PARAMETER
+                    count = 3; //CANopenNode Fudging. Its only 3 parameters for RX PDOS in the c code despite being a PDO_COMMUNICATION_PARAMETER
                 }
 
                 returndata.AppendLine($"/*0x{od.Index:x4}*/ const CO_OD_entryRecord_t OD_record{od.Index:x4}[{count}] = {{");
@@ -1382,7 +1382,7 @@ protected string export_one_record_type(ODentry sub,string arrayaccess)
             }
             else
             {
-                //Domain type MUST have its data pointer set to 0 for CanOpenNode
+                //Domain type MUST have its data pointer set to 0 for CANopenNode
                 sb.AppendLine($"           {{(void*)0, 0x{getflags(sub):x2}, 0x{datasize:x} }},");
             }
 

libEDSsharp/CanOpenNodeExporter.cs

@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
     along with libEDSsharp.  If not, see <http://www.gnu.org/licenses/>.
  
     Copyright(c) 2016 - 2019 Robin Cornelius <robin.cornelius@gmail.com>
-    based heavily on the files CO_OD.h and CO_OD.c from CanOpenNode which are
+    based heavily on the files CO_OD.h and CO_OD.c from CANopenNode which are
     Copyright(c) 2010 - 2016 Janez Paternoster
 */
 
@@ -206,7 +206,7 @@ public ISO15745ProfileContainer convert(EDSsharp eds)
             dev.ISO15745Profile[0].ProfileHeader.ISO15745Reference = new ISO15745Reference_DataType();
             dev.ISO15745Profile[0].ProfileHeader.ISO15745Reference.ISO15745Part = "1";
             dev.ISO15745Profile[0].ProfileHeader.ISO15745Reference.ISO15745Edition = "1";
-            dev.ISO15745Profile[0].ProfileHeader.ISO15745Reference.ProfileTechnology = "Canopen";
+            dev.ISO15745Profile[0].ProfileHeader.ISO15745Reference.ProfileTechnology = "CANopen";
 
             dev.ISO15745Profile[0].ProfileBody = new ProfileBody_Device_CANopen();
 
@@ -363,7 +363,7 @@ public ISO15745ProfileContainer convert(EDSsharp eds)
             dev.ISO15745Profile[1].ProfileHeader.ISO15745Reference = new ISO15745Reference_DataType();
             dev.ISO15745Profile[1].ProfileHeader.ISO15745Reference.ISO15745Part = "1";
             dev.ISO15745Profile[1].ProfileHeader.ISO15745Reference.ISO15745Edition = "1";
-            dev.ISO15745Profile[1].ProfileHeader.ISO15745Reference.ProfileTechnology = "Canopen";
+            dev.ISO15745Profile[1].ProfileHeader.ISO15745Reference.ProfileTechnology = "CANopen";
 
             dev.ISO15745Profile[1].ProfileBody = new ProfileBody_CommunicationNetwork_CANopen();
             ProfileBody_CommunicationNetwork_CANopen comnet = (ProfileBody_CommunicationNetwork_CANopen)dev.ISO15745Profile[1].ProfileBody;

libEDSsharp/CanOpenXDD.cs

@@ -992,7 +992,7 @@ public bool PDOMapping
 
         public PDOMappingType PDOtype;
 
-        //CanOpenNode specific extra storage
+        //CANopenNode specific extra storage
         public string Label = "";
         public string Description = "";
 
@@ -1036,7 +1036,7 @@ public ODentry()
         /// <param name="index">Index of object in object dictionary</param>
         /// <param name="datatype">Type of this objects data</param>
         /// <param name="defaultvalue">Default value (always set as a string)</param>
-        /// <param name="accesstype">Allowed CanOpen access permissions</param>
+        /// <param name="accesstype">Allowed CANopen access permissions</param>
         /// <param name="PDOMapping">Allowed PDO mapping options</param>
         public ODentry(string parameter_name,UInt16 index, DataType datatype, string defaultvalue, EDSsharp.AccessType accesstype, PDOMappingType PDOMapping)
         {
@@ -1252,7 +1252,7 @@ public string Paramater_cname()
         }
 
         /// <summary>
-        /// Return the size in bytes for the given CanOpen datatype of this object, eg the size of what ever the datatype field is set to 
+        /// Return the size in bytes for the given CANopen datatype of this object, eg the size of what ever the datatype field is set to 
         /// </summary>
         /// <returns>no of bytes</returns>
         public int Sizeofdatatype()