Update SysML Import

TrakHound · Oct 29, 2023 · 595b061 · 595b061
1 parent 0ae6419
commit 595b061
Show file tree

Hide file tree

Showing 236 changed files with 271 additions and 251 deletions.
diff --git a/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs b/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs
@@ -13,6 +13,8 @@ public class DataItemType : MTConnectDataItemType, ITemplateModel
     {
         public string Namespace => NamespaceHelper.GetNamespace(Id);
 
+        public string DefaultName => Type.ToCamelCase();
+
         public string UnitsEnum => Units != null ? $"Devices.{Units}" : null;
 
         public string MaximumVersionEnum => MTConnectVersion.GetVersionEnum(MaximumVersion);

diff --git a/src/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs b/src/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs
@@ -1079,6 +1079,19 @@ private IDeviceStreamOutput CreateDeviceStream(IDevice device, ref IObservationB
             var components = device.GetComponents();
             var componentStreams = new List<IComponentStreamOutput>();
 
+            // Add ComponentStream for Device
+            var deviceComponentStream = new ComponentStreamOutput();
+            deviceComponentStream.ComponentId = device.Id;
+            deviceComponentStream.ComponentType = device.Type;
+            deviceComponentStream.Component = device;
+            deviceComponentStream.Name = device.Name;
+            deviceComponentStream.Uuid = device.Uuid;
+            deviceComponentStream.Observations = GetObservations(device.Uuid, ref dataItemResults, device.DataItems, mtconnectVersion);
+            if (deviceComponentStream.Observations != null && deviceComponentStream.Observations.Length > 0)
+            {
+                componentStreams.Add(deviceComponentStream);
+            }
+
             if (!components.IsNullOrEmpty())
             {
                 foreach (var component in components)
@@ -1113,18 +1126,18 @@ private IDeviceStreamOutput CreateDeviceStream(IDevice device, ref IObservationB
                 }
             }
 
-            // Add ComponentStream for Device
-            var deviceComponentStream = new ComponentStreamOutput();
-            deviceComponentStream.ComponentId = device.Id;
-            deviceComponentStream.ComponentType = device.Type;
-            deviceComponentStream.Component = device;
-            deviceComponentStream.Name = device.Name;
-            deviceComponentStream.Uuid = device.Uuid;
-            deviceComponentStream.Observations = GetObservations(device.Uuid, ref dataItemResults, device.DataItems, mtconnectVersion);
-            if (deviceComponentStream.Observations != null && deviceComponentStream.Observations.Length > 0)
-            {
-                componentStreams.Add(deviceComponentStream);
-            }
+            //// Add ComponentStream for Device
+            //var deviceComponentStream = new ComponentStreamOutput();
+            //deviceComponentStream.ComponentId = device.Id;
+            //deviceComponentStream.ComponentType = device.Type;
+            //deviceComponentStream.Component = device;
+            //deviceComponentStream.Name = device.Name;
+            //deviceComponentStream.Uuid = device.Uuid;
+            //deviceComponentStream.Observations = GetObservations(device.Uuid, ref dataItemResults, device.DataItems, mtconnectVersion);
+            //if (deviceComponentStream.Observations != null && deviceComponentStream.Observations.Length > 0)
+            //{
+            //    componentStreams.Add(deviceComponentStream);
+            //}
 
             if (componentStreams.Count > 0)
             {

diff --git a/src/MTConnect.NET-Common/Devices/DataItem.cs b/src/MTConnect.NET-Common/Devices/DataItem.cs
@@ -370,14 +370,19 @@ public static string CreateDataItemId(string parentId, string type, string subTy
 
         public static string CreateId(string parentId, string name, string suffix)
         {
-            if (!string.IsNullOrEmpty(suffix))
+            if (!string.IsNullOrEmpty(name))
             {
-                return $"{parentId}_{name}_{suffix}";
-            }
-            else
-            {
-                return $"{parentId}_{name}";
+                if (!string.IsNullOrEmpty(suffix))
+                {
+                    return $"{parentId}_{name}_{suffix}";
+                }
+                else
+                {
+                    return $"{parentId}_{name}";
+                }
             }
+
+            return null;
         }
 
         /// <summary>

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs
@@ -10,7 +10,7 @@ public class AccelerationDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ACCELERATION";
-        public const string NameId = "";
+        public const string NameId = "acceleration";
         public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND_SQUARED;     
         public new const string DescriptionText = "Positive rate of change of velocity.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs
@@ -10,7 +10,7 @@ public class AccumulatedTimeDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ACCUMULATED_TIME";
-        public const string NameId = "";
+        public const string NameId = "accumulatedTime";
         public const string DefaultUnits = Devices.Units.SECOND;     
         public new const string DescriptionText = "Accumulated time for an activity or event.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs
@@ -10,7 +10,7 @@ public class ActivationCountDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ACTIVATION_COUNT";
-        public const string NameId = "";
+        public const string NameId = "activationCount";
 
         public new const string DescriptionText = "Accumulation of the number of times a function has attempted to, or is planned to attempt to, activate or be performed.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs
@@ -10,7 +10,7 @@ public class ActiveAxesDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ACTIVE_AXES";
-        public const string NameId = "";
+        public const string NameId = "activeAxes";
 
         public new const string DescriptionText = "Set of axes currently associated with a Path or Controller.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs
@@ -10,7 +10,7 @@ public class ActuatorDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.CONDITION;
         public const string TypeId = "ACTUATOR";
-        public const string NameId = "";
+        public const string NameId = "actuator";
 
         public new const string DescriptionText = "Indication of a fault associated with an actuator.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs
@@ -10,7 +10,7 @@ public class ActuatorStateDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ACTUATOR_STATE";
-        public const string NameId = "";
+        public const string NameId = "actuatorState";
 
         public new const string DescriptionText = "Operational state of an apparatus for moving or controlling a mechanism or system.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs
@@ -10,7 +10,7 @@ public class AdapterSoftwareVersionDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ADAPTER_SOFTWARE_VERSION";
-        public const string NameId = "";
+        public const string NameId = "adapterSoftwareVersion";
 
         public new const string DescriptionText = "Originator’s software version of the adapter.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs
@@ -10,7 +10,7 @@ public class AdapterUriDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ADAPTER_URI";
-        public const string NameId = "";
+        public const string NameId = "adapterUri";
 
         public new const string DescriptionText = "URI of the adapter.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs
@@ -10,7 +10,7 @@ public class AlarmDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ALARM";
-        public const string NameId = "";
+        public const string NameId = "alarm";
 
         public new const string DescriptionText = "**DEPRECATED:** Replaced with `CONDITION` category data items in Version 1.1.0.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs
@@ -10,7 +10,7 @@ public class AlarmLimitDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ALARM_LIMIT";
-        public const string NameId = "";
+        public const string NameId = "alarmLimit";
 
         public new const string DescriptionText = "Set of limits used to trigger warning or alarm indicators.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs
@@ -10,7 +10,7 @@ public class AmperageACDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "AMPERAGE_AC";
-        public const string NameId = "";
+        public const string NameId = "amperageAc";
         public const string DefaultUnits = Devices.Units.AMPERE;     
         public new const string DescriptionText = "Electrical current that reverses direction at regular short intervals.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs
@@ -10,7 +10,7 @@ public class AmperageDCDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "AMPERAGE_DC";
-        public const string NameId = "";
+        public const string NameId = "amperageDc";
         public const string DefaultUnits = Devices.Units.AMPERE;     
         public new const string DescriptionText = "Electric current flowing in one direction only.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs
@@ -10,7 +10,7 @@ public class AmperageDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "AMPERAGE";
-        public const string NameId = "";
+        public const string NameId = "amperage";
 
         public new const string DescriptionText = "Strength of electrical current.**DEPRECATED** in *Version 1.6*. Replaced by `AMPERAGE_AC` and `AMPERAGE_DC`.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs
@@ -10,7 +10,7 @@ public class AngleDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ANGLE";
-        public const string NameId = "";
+        public const string NameId = "angle";
         public const string DefaultUnits = Devices.Units.DEGREE;     
         public new const string DescriptionText = "Angular position.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs
@@ -10,7 +10,7 @@ public class AngularAccelerationDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ANGULAR_ACCELERATION";
-        public const string NameId = "";
+        public const string NameId = "angularAcceleration";
         public const string DefaultUnits = Devices.Units.DEGREE_PER_SECOND_SQUARED;     
         public new const string DescriptionText = "Positive rate of change of angular velocity.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs
@@ -10,7 +10,7 @@ public class AngularDecelerationDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ANGULAR_DECELERATION";
-        public const string NameId = "";
+        public const string NameId = "angularDeceleration";
         public const string DefaultUnits = Devices.Units.DEGREE_PER_SECOND_SQUARED;     
         public new const string DescriptionText = "Negative rate of change of angular velocity.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs
@@ -10,7 +10,7 @@ public class AngularVelocityDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ANGULAR_VELOCITY";
-        public const string NameId = "";
+        public const string NameId = "angularVelocity";
         public const string DefaultUnits = Devices.Units.DEGREE_PER_SECOND;     
         public new const string DescriptionText = "Rate of change of angular position.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs
@@ -10,7 +10,7 @@ public class ApplicationDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "APPLICATION";
-        public const string NameId = "";
+        public const string NameId = "application";
 
         public new const string DescriptionText = "Application on a Component.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs
@@ -10,7 +10,7 @@ public class AssetChangedDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ASSET_CHANGED";
-        public const string NameId = "";
+        public const string NameId = "assetChanged";
 
         public new const string DescriptionText = "AssetId of the Asset that has been added or changed.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs
@@ -10,7 +10,7 @@ public class AssetCountDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ASSET_COUNT";
-        public const string NameId = "";
+        public const string NameId = "assetCount";
 
         public new const string DescriptionText = "Data set of the number of Asset of a given type for a Device.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs
@@ -10,7 +10,7 @@ public class AssetRemovedDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "ASSET_REMOVED";
-        public const string NameId = "";
+        public const string NameId = "assetRemoved";
 
         public new const string DescriptionText = "AssetId of the Asset that has been removed.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs
@@ -10,7 +10,7 @@ public class AssetUpdateRateDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "ASSET_UPDATE_RATE";
-        public const string NameId = "";
+        public const string NameId = "assetUpdateRate";
         public const string DefaultUnits = Devices.Units.COUNT_PER_SECOND;     
         public new const string DescriptionText = "Average rate of change of values for assets in the MTConnect streams. The average is computed over a rolling window defined by the implementation.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs
@@ -10,7 +10,7 @@ public class AvailabilityDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "AVAILABILITY";
-        public const string NameId = "";
+        public const string NameId = "availability";
 
         public new const string DescriptionText = "Agent's ability to communicate with the data source.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs
@@ -10,7 +10,7 @@ public class AxisCouplingDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "AXIS_COUPLING";
-        public const string NameId = "";
+        public const string NameId = "axisCoupling";
 
         public new const string DescriptionText = "Describes the way the axes will be associated to each other.   This is used in conjunction with `COUPLED_AXES` to indicate the way they are interacting.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs
@@ -10,7 +10,7 @@ public class AxisFeedrateDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "AXIS_FEEDRATE";
-        public const string NameId = "";
+        public const string NameId = "axisFeedrate";
         public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND;     
         public new const string DescriptionText = "Feedrate of a linear axis.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs
@@ -10,7 +10,7 @@ public class AxisFeedrateOverrideDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "AXIS_FEEDRATE_OVERRIDE";
-        public const string NameId = "";
+        public const string NameId = "axisFeedrateOverride";
 
         public new const string DescriptionText = "Value of a signal or calculation issued to adjust the feedrate of an individual linear type axis.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs
@@ -10,7 +10,7 @@ public class AxisInterlockDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "AXIS_INTERLOCK";
-        public const string NameId = "";
+        public const string NameId = "axisInterlock";
 
         public new const string DescriptionText = "State of the axis lockout function when power has been removed and the axis is allowed to move freely.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs
@@ -10,7 +10,7 @@ public class AxisStateDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "AXIS_STATE";
-        public const string NameId = "";
+        public const string NameId = "axisState";
 
         public new const string DescriptionText = "State of a Linear or Rotary component representing an axis.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs
@@ -10,7 +10,7 @@ public class BatteryCapacityDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "BATTERY_CAPACITY";
-        public const string NameId = "";
+        public const string NameId = "batteryCapacity";
         public const string DefaultUnits = Devices.Units.COULOMB;     
         public new const string DescriptionText = "Maximum rated charge a battery is capable of maintaining based on the battery discharging at a specified current over a specified time period.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs
@@ -10,7 +10,7 @@ public class BatteryChargeDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "BATTERY_CHARGE";
-        public const string NameId = "";
+        public const string NameId = "batteryCharge";
         public const string DefaultUnits = Devices.Units.PERCENT;     
         public new const string DescriptionText = "Value of the battery's present capacity expressed as a percentage of the battery's maximum rated capacity.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs
@@ -10,7 +10,7 @@ public class BatteryStateDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "BATTERY_STATE";
-        public const string NameId = "";
+        public const string NameId = "batteryState";
 
         public new const string DescriptionText = "Present status of the battery.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs
@@ -10,7 +10,7 @@ public class BlockCountDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "BLOCK_COUNT";
-        public const string NameId = "";
+        public const string NameId = "blockCount";
 
         public new const string DescriptionText = "Total count of the number of blocks of program code that have been executed since execution started.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs
@@ -10,7 +10,7 @@ public class BlockDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.EVENT;
         public const string TypeId = "BLOCK";
-        public const string NameId = "";
+        public const string NameId = "block";
 
         public new const string DescriptionText = "Line of code or command being executed by a Controller entity.";
 

diff --git a/src/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs b/src/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs
@@ -10,7 +10,7 @@ public class CapacityFluidDataItem : DataItem
     {
         public const DataItemCategory CategoryId = DataItemCategory.SAMPLE;
         public const string TypeId = "CAPACITY_FLUID";
-        public const string NameId = "";
+        public const string NameId = "capacityFluid";
         public const string DefaultUnits = Devices.Units.MILLILITER;     
         public new const string DescriptionText = "Fluid capacity of an object or container.";