Commit 47acffbc authored by ankraft's avatar ankraft

Merge branch...

Merge branch 'MAS-2018-0139-SDT_4_0_–_Adding_support_for_enumeration_types_and_values' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_DataType.png
parents 8a9274ae 1027bce6
......@@ -752,7 +752,7 @@ fontsize=12</panel_attributes>
</coordinates>
<panel_attributes>EnumType
--
*- enumValue : EnumValue*
*- EnumValue : EnumValue*
fg=blue</panel_attributes>
<additional_attributes/>
</element>
......@@ -780,7 +780,7 @@ fontsize=12</panel_attributes>
<panel_attributes>EnumValue
--
*@ name : Name*
*@ value : value*
*@ value : text*
/@ type : BasicType = integer/
/@ semanticURI : uri/
/- Doc : Doc/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment