Skip to content

Commit c1071ab

Browse files
CANopenNodeCANopenNode
authored
CanOpen.proto: change name "type" to more descriptive "dataType" and "objectType" (#150)
1 parent b5820c6 commit c1071ab

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎libEDSsharp/CanOpenXDD_1_1.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ private Items1ChoiceType ConvertDataType(OdSubObject subEntry)
450450
{
451451
UInt32 byteLength;
452452
bool signed = false;
453-
var dt = subEntry.Type;
453+
var dt = subEntry.DataType;
454454

455455
switch (dt)
456456
{
@@ -474,7 +474,7 @@ private Items1ChoiceType ConvertDataType(OdSubObject subEntry)
474474
return Items1ChoiceType.BITSTRING;
475475

476476
default:
477-
subEntry.Type = LibCanOpen.OdSubObject.Types.DataType.Integer32;
477+
subEntry.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer32;
478478
return Items1ChoiceType.DINT;
479479

480480
// transform other non standard values to OCTET_STRING
@@ -508,7 +508,7 @@ private Items1ChoiceType ConvertDataType(OdSubObject subEntry)
508508
bytes.Add(String.Format("{0:X2}", value & 0xFF));
509509
value >>= 8;
510510
}
511-
subEntry.Type = LibCanOpen.OdSubObject.Types.DataType.OctetString;
511+
subEntry.DataType = LibCanOpen.OdSubObject.Types.DataType.OctetString;
512512
subEntry.DefaultValue = string.Join(" ", bytes);
513513

514514
return Items1ChoiceType.BITSTRING;
@@ -519,54 +519,54 @@ private void ConvertDataType(Items1ChoiceType choiceType, OdSubObject OdSubObjec
519519
switch (choiceType)
520520
{
521521
case Items1ChoiceType.BOOL:
522-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Boolean;
522+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Boolean;
523523
break;
524524
case Items1ChoiceType.CHAR:
525525
case Items1ChoiceType.SINT:
526-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Integer8;
526+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer8;
527527
break;
528528
case Items1ChoiceType.INT:
529-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Integer16;
529+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer16;
530530
break;
531531
case Items1ChoiceType.DINT:
532-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Integer32;
532+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer32;
533533
break;
534534
case Items1ChoiceType.LINT:
535-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Integer64;
535+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer64;
536536
break;
537537
case Items1ChoiceType.BYTE:
538538
case Items1ChoiceType.USINT:
539-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Unsigned8;
539+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Unsigned8;
540540
break;
541541
case Items1ChoiceType.WORD:
542542
case Items1ChoiceType.UINT:
543-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Unsigned16;
543+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Unsigned16;
544544
break;
545545
case Items1ChoiceType.DWORD:
546546
case Items1ChoiceType.UDINT:
547-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Unsigned32;
547+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Unsigned32;
548548
break;
549549
case Items1ChoiceType.LWORD:
550550
case Items1ChoiceType.ULINT:
551-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Unsigned64;
551+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Unsigned64;
552552
break;
553553
case Items1ChoiceType.REAL:
554-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Real32;
554+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Real32;
555555
break;
556556
case Items1ChoiceType.LREAL:
557-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Real64;
557+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Real64;
558558
break;
559559
case Items1ChoiceType.STRING:
560-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.VisibleString;
560+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.VisibleString;
561561
break;
562562
case Items1ChoiceType.WSTRING:
563-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.UnicodeString;
563+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.UnicodeString;
564564
break;
565565
case Items1ChoiceType.BITSTRING:
566-
OdSubObject.Type = OdSubObject.DefaultValue == "" ? LibCanOpen.OdSubObject.Types.DataType.Domain : LibCanOpen.OdSubObject.Types.DataType.OctetString;
566+
OdSubObject.DataType = OdSubObject.DefaultValue == "" ? LibCanOpen.OdSubObject.Types.DataType.Domain : LibCanOpen.OdSubObject.Types.DataType.OctetString;
567567
break;
568568
default:
569-
OdSubObject.Type = LibCanOpen.OdSubObject.Types.DataType.Integer32;
569+
OdSubObject.DataType = LibCanOpen.OdSubObject.Types.DataType.Integer32;
570570
break;
571571
}
572572
}
@@ -1758,12 +1758,12 @@ private CanOpenDevice ConvertToProtobuf(ISO15745ProfileContainer container)
17581758
{
17591759
Name = netObj.name ?? "",
17601760
Alias = netObj.denotation ?? "",
1761-
Type = objectType
1761+
ObjectType = objectType
17621762
};
17631763

17641764
OdSubObject subEntry0 = new OdSubObject()
17651765
{
1766-
Type = dataType,
1766+
DataType = dataType,
17671767
Sdo = accessSDO,
17681768
Pdo = accessPDO,
17691769
DefaultValue = netObj.defaultValue ?? "",
@@ -1851,7 +1851,7 @@ private CanOpenDevice ConvertToProtobuf(ISO15745ProfileContainer container)
18511851
{
18521852
Name = netSubObj.name ?? "",
18531853
Alias = netSubObj.denotation ?? "",
1854-
Type = subDataType,
1854+
DataType = subDataType,
18551855
Sdo = subAccessSDO,
18561856
Pdo = subAccessPDO,
18571857
DefaultValue = netSubObj.defaultValue ?? "",
@@ -1982,7 +1982,7 @@ private ISO15745ProfileContainer ConvertFromProtobuf(CanOpenDevice dev, string f
19821982
{
19831983
index = new byte[] { (byte)(indexInt >> 8), (byte)(indexInt & 0xFF) },
19841984
name = entry.Name,
1985-
objectType = (byte)entry.Type,
1985+
objectType = (byte)entry.ObjectType,
19861986
uniqueIDRef = "UID_OBJ_" + index
19871987
};
19881988
body_network_objectList.Add(netObj);
@@ -2006,7 +2006,7 @@ private ISO15745ProfileContainer ConvertFromProtobuf(CanOpenDevice dev, string f
20062006
}
20072007
body_device_parameterList.Add(devPar);
20082008

2009-
if (entry.Type == LibCanOpen.OdObject.Types.ObjectType.Var)
2009+
if (entry.ObjectType == LibCanOpen.OdObject.Types.ObjectType.Var)
20102010
{
20112011
if (entry.SubObjects.Count != 1)
20122012
{
@@ -2037,7 +2037,7 @@ private ISO15745ProfileContainer ConvertFromProtobuf(CanOpenDevice dev, string f
20372037
if (deviceCommissioning && subEntry0.ActualValue != null && subEntry0.ActualValue != "")
20382038
devPar.actualValue = new actualValue { value = subEntry0.ActualValue };
20392039
}
2040-
else if ((entry.Type == LibCanOpen.OdObject.Types.ObjectType.Array || entry.Type == LibCanOpen.OdObject.Types.ObjectType.Record) && entry.SubObjects != null && entry.SubObjects.Count > 0)
2040+
else if ((entry.ObjectType == LibCanOpen.OdObject.Types.ObjectType.Array || entry.ObjectType == LibCanOpen.OdObject.Types.ObjectType.Record) && entry.SubObjects != null && entry.SubObjects.Count > 0)
20412041
{
20422042
netObj.subNumber = (byte)entry.SubObjects.Count;
20432043
netObj.subNumberSpecified = true;
@@ -2103,7 +2103,7 @@ private ISO15745ProfileContainer ConvertFromProtobuf(CanOpenDevice dev, string f
21032103
if (deviceCommissioning && subEntry.ActualValue != null && subEntry.ActualValue != "")
21042104
devPar.actualValue = new actualValue { value = subEntry.ActualValue };
21052105

2106-
if (entry.Type == LibCanOpen.OdObject.Types.ObjectType.Record)
2106+
if (entry.ObjectType == LibCanOpen.OdObject.Types.ObjectType.Record)
21072107
{
21082108
devStructSubList.Add(new varDeclaration
21092109
{
@@ -2123,7 +2123,7 @@ private ISO15745ProfileContainer ConvertFromProtobuf(CanOpenDevice dev, string f
21232123
}
21242124

21252125
// add refference to data type definition and definition of array or struct data type (schema requirement)
2126-
if (entry.Type == LibCanOpen.OdObject.Types.ObjectType.Array)
2126+
if (entry.ObjectType == LibCanOpen.OdObject.Types.ObjectType.Array)
21272127
{
21282128
devPar.Items1 = new object[] { new dataTypeIDRef { uniqueIDRef = "UID_ARR_" + index } };
21292129
devPar.Items1ElementName = new Items1ChoiceType[] { Items1ChoiceType.dataTypeIDRef };

‎libEDSsharp/proto/CanOpen.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ message OdSubObject
108108

109109
string name = 1; // Name of the sub entry. If OdEntry is "VAR", this property is not relevant.
110110
string alias = 2; // Additonal sub parameter name, for the actual device. If OdEntry is "VAR", this property is not relevant.
111-
DataType type = 3; // CANopen data type
111+
DataType dataType = 3; // CANopen data type
112112
AccessSDO sdo = 4; // CANopen SDO access permissions
113113
AccessPDO pdo = 5; // CANopen PDO access permissions
114114
AccessSRDO srdo = 6; // CANopen SRDO access permissions.
@@ -146,7 +146,7 @@ message OdObject
146146
// Description of the Entry.
147147
string description = 4;
148148
// CANopen Object Type.
149-
ObjectType type = 5;
149+
ObjectType objectType = 5;
150150
// CanOpenNode OD exporter V4: it will generate a macro for each different CO_countLabel. For example, if four
151151
// OD objects have "CO_countLabel" set to "TPDO", then macro "#define ODxyz_CNT_TPDO 4" will be generated by the OD exporter.
152152
string countLabel = 101;

0 commit comments

Comments
 (0)