From 280e0d839ea3e45d986e767ac0342e02b2d48c78 Mon Sep 17 00:00:00 2001 From: Patrick Ritchie Date: Fri, 2 Feb 2024 01:58:06 -0500 Subject: [PATCH] Update 6.0.11 - Fixed issue with Conditions with same Native Code - Added methods to Device, Component, Composition to set IDs and Add DataItems - Added MTConnectInputAgentModule class to use for embedded adapters - Fixed issues with SHDR Adapter in Agent Device - Fixed various minor issues --- MTConnect.NET.sln | 10 + adapter/MTConnect.NET-Adapter/Program.cs | 4 +- agent/MTConnect.NET-Agent/Program.cs | 4 +- .../MTConnectAgentApplication.cs | 14 +- .../Module.cs | 2 +- .../Module.cs | 2 +- .../Module.cs | 2 +- .../Module.cs | 2 +- .../Module.cs | 2 +- .../Module.cs | 72 +- build/AssemblyInfo.cs | 6 +- .../CSharp/DataItemType.cs | 20 +- .../CSharp/TemplateRenderer.cs | 9 +- .../Assets.CuttingToolMeasurement.scriban | 2 +- .../Templates/Devices.ComponentType.scriban | 8 +- .../Templates/Devices.CompositionType.scriban | 2 +- .../Templates/Devices.DataItemType.scriban | 8 +- .../CSharp/Templates/Devices.Device.scriban | 2 +- .../CSharp/Templates/Enum.scriban | 2 +- .../CSharp/Templates/EnumDescriptions.scriban | 2 +- .../CSharp/Templates/EnumString.scriban | 2 +- .../Templates/EnumStringDescriptions.scriban | 2 +- .../CSharp/Templates/Interface.scriban | 2 +- .../Interfaces.InterfaceDataItemType.scriban | 2 +- .../CSharp/Templates/Model.scriban | 2 +- .../Templates/ModelDescriptions.scriban | 2 +- .../Observations.Observation.scriban | 2 +- .../Agents/IMTConnectAgent.cs | 142 ++-- .../Agents/IMTConnectAgentBroker.cs | 4 +- .../Agents/IMTConnectAgentModule.cs | 6 +- .../Agents/MTConnectAgent.cs | 514 +++++++----- .../Agents/MTConnectAgentBroker.cs | 4 +- .../Agents/MTConnectAgentModule.cs | 14 +- .../Agents/MTConnectAgentModules.cs | 29 +- .../Agents/MTConnectInputAgentModule.cs | 487 +++++++++++ .../MTConnect.NET-Common/Assets/Asset.g.cs | 2 +- .../Assets/AssetDescriptions.g.cs | 2 +- ...ComponentConfigurationParametersAsset.g.cs | 2 +- ...figurationParametersAssetDescriptions.g.cs | 2 +- ...ComponentConfigurationParametersAsset.g.cs | 2 +- .../IParameter.g.cs | 2 +- .../IParameterSet.g.cs | 2 +- .../Parameter.g.cs | 2 +- .../ParameterDescriptions.g.cs | 2 +- .../ParameterSet.g.cs | 2 +- .../ParameterSetDescriptions.g.cs | 2 +- .../CuttingTools/CountDirectionType.g.cs | 2 +- .../CountDirectionTypeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/CutterStatusType.g.cs | 2 +- .../CutterStatusTypeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/CuttingItem.g.cs | 2 +- .../CuttingTools/CuttingItemDescriptions.g.cs | 2 +- .../CuttingToolArchetypeAsset.g.cs | 2 +- ...CuttingToolArchetypeAssetDescriptions.g.cs | 2 +- .../CuttingToolArchetypeReference.g.cs | 2 +- ...ingToolArchetypeReferenceDescriptions.g.cs | 2 +- .../Assets/CuttingTools/CuttingToolAsset.g.cs | 2 +- .../CuttingToolAssetDescriptions.g.cs | 2 +- .../CuttingTools/CuttingToolDefinition.g.cs | 2 +- .../CuttingToolDefinitionDescriptions.g.cs | 2 +- .../CuttingTools/CuttingToolLifeCycle.g.cs | 2 +- .../CuttingToolLifeCycleDescriptions.g.cs | 2 +- .../Assets/CuttingTools/FormatType.g.cs | 2 +- .../CuttingTools/FormatTypeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/ICuttingItem.g.cs | 2 +- .../ICuttingToolArchetypeAsset.g.cs | 2 +- .../ICuttingToolArchetypeReference.g.cs | 2 +- .../CuttingTools/ICuttingToolAsset.g.cs | 2 +- .../CuttingTools/ICuttingToolDefinition.g.cs | 2 +- .../CuttingTools/ICuttingToolLifeCycle.g.cs | 2 +- .../Assets/CuttingTools/IItemLife.g.cs | 2 +- .../Assets/CuttingTools/ILocation.g.cs | 2 +- .../Assets/CuttingTools/IMeasurement.g.cs | 2 +- .../Assets/CuttingTools/IProcessFeedRate.g.cs | 2 +- .../CuttingTools/IProcessSpindleSpeed.g.cs | 2 +- .../CuttingTools/IReconditionCount.g.cs | 2 +- .../Assets/CuttingTools/IToolLife.g.cs | 2 +- .../Assets/CuttingTools/ItemLife.g.cs | 2 +- .../CuttingTools/ItemLifeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/Location.g.cs | 2 +- .../CuttingTools/LocationDescriptions.g.cs | 2 +- .../Assets/CuttingTools/LocationType.g.cs | 2 +- .../LocationTypeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/Measurement.g.cs | 2 +- .../CuttingTools/MeasurementDescriptions.g.cs | 2 +- .../BodyDiameterMaxMeasurement.g.cs | 2 +- .../BodyLengthMaxMeasurement.g.cs | 2 +- .../ChamferFlatLengthMeasurement.g.cs | 2 +- .../Measurements/ChamferWidthMeasurement.g.cs | 2 +- .../Measurements/CornerRadiusMeasurement.g.cs | 2 +- .../CuttingDiameterMaxMeasurement.g.cs | 2 +- .../CuttingDiameterMeasurement.g.cs | 2 +- .../CuttingEdgeLengthMeasurement.g.cs | 2 +- .../CuttingHeightMeasurement.g.cs | 2 +- .../CuttingReferencePointMeasurement.g.cs | 2 +- .../DepthOfCutMaxMeasurement.g.cs | 2 +- .../Measurements/DriveAngleMeasurement.g.cs | 2 +- .../FlangeDiameterMaxMeasurement.g.cs | 2 +- .../FlangeDiameterMeasurement.g.cs | 2 +- .../FunctionalLengthMeasurement.g.cs | 2 +- .../FunctionalWidthMeasurement.g.cs | 2 +- .../IncribedCircleDiameterMeasurement.g.cs | 2 +- .../Measurements/InsertWidthMeasurement.g.cs | 2 +- .../Measurements/MeasurementCode.g.cs | 2 +- .../MeasurementCodeDescriptions.g.cs | 2 +- .../OverallToolLengthMeasurement.g.cs | 2 +- .../Measurements/PointAngleMeasurement.g.cs | 2 +- .../ProtrudingLengthMeasurement.g.cs | 2 +- .../ShankDiameterMeasurement.g.cs | 2 +- .../Measurements/ShankHeightMeasurement.g.cs | 2 +- .../Measurements/ShankLengthMeasurement.g.cs | 2 +- .../StepDiameterLengthMeasurement.g.cs | 2 +- .../StepIncludedAngleMeasurement.g.cs | 2 +- .../ToolCuttingEdgeAngleMeasurement.g.cs | 2 +- .../ToolLeadAngleMeasurement.g.cs | 2 +- .../ToolOrientationMeasurement.g.cs | 2 +- .../UsableLengthMaxMeasurement.g.cs | 2 +- .../Measurements/WeightMeasurement.g.cs | 2 +- .../WiperEdgeLengthMeasurement.g.cs | 2 +- .../Assets/CuttingTools/ProcessFeedRate.g.cs | 2 +- .../ProcessFeedRateDescriptions.g.cs | 2 +- .../CuttingTools/ProcessSpindleSpeed.g.cs | 2 +- .../ProcessSpindleSpeedDescriptions.g.cs | 2 +- .../Assets/CuttingTools/ReconditionCount.g.cs | 2 +- .../ReconditionCountDescriptions.g.cs | 2 +- .../Assets/CuttingTools/ToolLife.g.cs | 2 +- .../CuttingTools/ToolLifeDescriptions.g.cs | 2 +- .../Assets/CuttingTools/ToolLifeType.g.cs | 2 +- .../ToolLifeTypeDescriptions.g.cs | 2 +- .../Assets/Files/AbstractFileAsset.g.cs | 2 +- .../Files/AbstractFileAssetDescriptions.g.cs | 2 +- .../Assets/Files/ApplicationCategory.g.cs | 2 +- .../ApplicationCategoryDescriptions.g.cs | 2 +- .../Assets/Files/ApplicationType.g.cs | 2 +- .../Files/ApplicationTypeDescriptions.g.cs | 2 +- .../Assets/Files/Destination.g.cs | 2 +- .../Assets/Files/DestinationDescriptions.g.cs | 2 +- .../Assets/Files/FileArchetypeAsset.g.cs | 2 +- .../Files/FileArchetypeAssetDescriptions.g.cs | 2 +- .../Assets/Files/FileAsset.g.cs | 2 +- .../Assets/Files/FileAssetDescriptions.g.cs | 2 +- .../Assets/Files/FileComment.g.cs | 2 +- .../Assets/Files/FileCommentDescriptions.g.cs | 2 +- .../Assets/Files/FileLocation.g.cs | 2 +- .../Files/FileLocationDescriptions.g.cs | 2 +- .../Assets/Files/FileProperty.g.cs | 2 +- .../Files/FilePropertyDescriptions.g.cs | 2 +- .../Assets/Files/FileState.g.cs | 2 +- .../Assets/Files/FileStateDescriptions.g.cs | 2 +- .../Assets/Files/IAbstractFileAsset.g.cs | 2 +- .../Assets/Files/IDestination.g.cs | 2 +- .../Assets/Files/IFileArchetypeAsset.g.cs | 2 +- .../Assets/Files/IFileAsset.g.cs | 2 +- .../Assets/Files/IFileComment.g.cs | 2 +- .../Assets/Files/IFileLocation.g.cs | 2 +- .../Assets/Files/IFileProperty.g.cs | 2 +- .../MTConnect.NET-Common/Assets/IAsset.g.cs | 2 +- .../Assets/QIF/IQIFDocument.g.cs | 2 +- .../Assets/QIF/IQIFDocumentWrapperAsset.g.cs | 2 +- .../Assets/QIF/QIFDocument.g.cs | 2 +- .../Assets/QIF/QIFDocumentDescriptions.g.cs | 2 +- .../Assets/QIF/QIFDocumentType.g.cs | 2 +- .../QIF/QIFDocumentTypeDescriptions.g.cs | 2 +- .../Assets/QIF/QIFDocumentWrapperAsset.g.cs | 2 +- .../QIFDocumentWrapperAssetDescriptions.g.cs | 2 +- .../Assets/RawMaterials/Form.g.cs | 2 +- .../Assets/RawMaterials/FormDescriptions.g.cs | 2 +- .../Assets/RawMaterials/IMaterial.g.cs | 2 +- .../RawMaterials/IRawMaterialAsset.g.cs | 2 +- .../Assets/RawMaterials/Material.g.cs | 2 +- .../RawMaterials/MaterialDescriptions.g.cs | 2 +- .../Assets/RawMaterials/RawMaterialAsset.g.cs | 2 +- .../RawMaterialAssetDescriptions.g.cs | 2 +- .../AgentApplicationConfiguration.cs | 21 +- .../Configurations/DataSourceConfiguration.cs | 2 +- .../IAgentApplicationConfiguration.cs | 4 +- .../Devices/AbstractDataItemRelationship.g.cs | 2 +- ...tractDataItemRelationshipDescriptions.g.cs | 2 +- .../MTConnect.NET-Common/Devices/Agent.cs | 2 + .../Devices/CellDefinition.g.cs | 2 +- .../Devices/CellDefinitionDescriptions.g.cs | 2 +- .../MTConnect.NET-Common/Devices/Component.cs | 781 ++++++++++++++++-- .../Devices/Component.g.cs | 2 +- .../Devices/ComponentDescriptions.g.cs | 2 +- .../Devices/Components/ActuatorComponent.g.cs | 10 +- .../Devices/Components/AdapterComponent.g.cs | 10 +- .../Devices/Components/AdaptersComponent.g.cs | 10 +- .../Components/AmplifierComponent.g.cs | 10 +- .../AutomaticToolChangerComponent.g.cs | 10 +- .../Components/AuxiliariesComponent.g.cs | 10 +- .../Components/AuxiliaryComponent.g.cs | 10 +- .../Devices/Components/AxesComponent.g.cs | 10 +- .../Devices/Components/AxisComponent.g.cs | 10 +- .../Components/BallscrewComponent.g.cs | 10 +- .../Components/BarFeederComponent.g.cs | 10 +- .../Devices/Components/BeltComponent.g.cs | 10 +- .../Devices/Components/BrakeComponent.g.cs | 10 +- .../Devices/Components/ChainComponent.g.cs | 10 +- .../Devices/Components/ChopperComponent.g.cs | 10 +- .../Devices/Components/ChuckComponent.g.cs | 10 +- .../Devices/Components/ChuteComponent.g.cs | 10 +- .../Components/CircuitBreakerComponent.g.cs | 10 +- .../Devices/Components/ClampComponent.g.cs | 10 +- .../Components/CompressorComponent.g.cs | 10 +- .../Components/ControllerComponent.g.cs | 10 +- .../Components/ControllersComponent.g.cs | 11 +- .../Devices/Components/CoolantComponent.g.cs | 10 +- .../Devices/Components/CoolingComponent.g.cs | 10 +- .../Components/CoolingTowerComponent.g.cs | 10 +- .../Components/DepositionComponent.g.cs | 10 +- .../Components/DielectricComponent.g.cs | 10 +- .../Devices/Components/DoorComponent.g.cs | 10 +- .../Devices/Components/DrainComponent.g.cs | 10 +- .../Devices/Components/ElectricComponent.g.cs | 10 +- .../Components/EnclosureComponent.g.cs | 10 +- .../Devices/Components/EncoderComponent.g.cs | 10 +- .../Components/EndEffectorComponent.g.cs | 10 +- .../Components/EnvironmentalComponent.g.cs | 10 +- .../Components/ExpiredPotComponent.g.cs | 10 +- .../Components/ExposureUnitComponent.g.cs | 10 +- .../Components/ExtrusionUnitComponent.g.cs | 10 +- .../Devices/Components/FanComponent.g.cs | 10 +- .../FeatureOccurrenceComponent.g.cs | 10 +- .../Devices/Components/FeederComponent.g.cs | 10 +- .../Devices/Components/FilterComponent.g.cs | 10 +- .../Components/GalvanomotorComponent.g.cs | 10 +- .../Components/GangToolBarComponent.g.cs | 10 +- .../Devices/Components/GripperComponent.g.cs | 10 +- .../Devices/Components/HeatingComponent.g.cs | 10 +- .../Devices/Components/HopperComponent.g.cs | 10 +- .../Components/HydraulicComponent.g.cs | 10 +- .../Components/InterfacesComponent.g.cs | 10 +- .../Devices/Components/LinearComponent.g.cs | 10 +- .../LinearPositionFeedbackComponent.g.cs | 10 +- .../Devices/Components/LinkComponent.g.cs | 10 +- .../Devices/Components/LoaderComponent.g.cs | 10 +- .../Devices/Components/LockComponent.g.cs | 10 +- .../Components/LubricationComponent.g.cs | 10 +- .../Devices/Components/MaterialComponent.g.cs | 10 +- .../Components/MaterialsComponent.g.cs | 10 +- .../Devices/Components/MotorComponent.g.cs | 10 +- .../Devices/Components/OilComponent.g.cs | 10 +- .../Devices/Components/PartComponent.g.cs | 10 +- .../Components/PartOccurrenceComponent.g.cs | 10 +- .../Devices/Components/PartsComponent.g.cs | 10 +- .../Devices/Components/PathComponent.g.cs | 10 +- .../Components/PersonnelComponent.g.cs | 10 +- .../Components/PneumaticComponent.g.cs | 10 +- .../Devices/Components/PotComponent.g.cs | 10 +- .../Devices/Components/PowerComponent.g.cs | 10 +- .../Components/PowerSupplyComponent.g.cs | 10 +- .../Devices/Components/PressureComponent.g.cs | 10 +- .../Devices/Components/ProcessComponent.g.cs | 10 +- .../ProcessOccurrenceComponent.g.cs | 10 +- .../Components/ProcessPowerComponent.g.cs | 10 +- .../Components/ProcessesComponent.g.cs | 10 +- .../Components/ProtectiveComponent.g.cs | 10 +- .../Devices/Components/PulleyComponent.g.cs | 10 +- .../Devices/Components/PumpComponent.g.cs | 10 +- .../Devices/Components/ReelComponent.g.cs | 10 +- .../Components/RemovalPotComponent.g.cs | 10 +- .../Devices/Components/ResourceComponent.g.cs | 10 +- .../Components/ResourcesComponent.g.cs | 10 +- .../Components/ReturnPotComponent.g.cs | 10 +- .../Devices/Components/RotaryComponent.g.cs | 10 +- .../Components/SensingElementComponent.g.cs | 10 +- .../Devices/Components/SensorComponent.g.cs | 10 +- .../Devices/Components/SpindleComponent.g.cs | 10 +- .../Devices/Components/SpreaderComponent.g.cs | 10 +- .../Components/StagingPotComponent.g.cs | 10 +- .../Devices/Components/StationComponent.g.cs | 10 +- .../Devices/Components/StockComponent.g.cs | 10 +- .../Components/StorageBatteryComponent.g.cs | 10 +- .../Components/StructureComponent.g.cs | 10 +- .../Components/StructuresComponent.g.cs | 10 +- .../Devices/Components/SwitchComponent.g.cs | 10 +- .../Devices/Components/SystemComponent.g.cs | 10 +- .../Devices/Components/SystemsComponent.g.cs | 10 +- .../Devices/Components/TableComponent.g.cs | 10 +- .../Devices/Components/TankComponent.g.cs | 10 +- .../Components/TensionerComponent.g.cs | 10 +- .../Components/ThermostatComponent.g.cs | 10 +- .../Components/ToolMagazineComponent.g.cs | 10 +- .../Devices/Components/ToolRackComponent.g.cs | 10 +- .../Components/ToolingDeliveryComponent.g.cs | 10 +- .../Components/TransferArmComponent.g.cs | 10 +- .../Components/TransferPotComponent.g.cs | 10 +- .../Components/TransformerComponent.g.cs | 10 +- .../Devices/Components/TurretComponent.g.cs | 10 +- .../Devices/Components/VacuumComponent.g.cs | 10 +- .../Devices/Components/ValveComponent.g.cs | 10 +- .../Devices/Components/VatComponent.g.cs | 10 +- .../Components/VibrationComponent.g.cs | 10 +- .../Components/WasteDisposalComponent.g.cs | 10 +- .../Devices/Components/WaterComponent.g.cs | 10 +- .../Devices/Components/WireComponent.g.cs | 10 +- .../Components/WorkEnvelopeComponent.g.cs | 10 +- .../Components/WorkpieceComponent.g.cs | 10 +- .../Devices/Composition.cs | 261 +++++- .../Devices/Composition.g.cs | 2 +- .../Devices/CompositionDescriptions.g.cs | 2 +- .../Compositions/ActuatorComposition.g.cs | 2 +- .../Compositions/AmplifierComposition.g.cs | 2 +- .../Compositions/BallscrewComposition.g.cs | 2 +- .../Devices/Compositions/BeltComposition.g.cs | 2 +- .../Compositions/BrakeComposition.g.cs | 2 +- .../Compositions/ChainComposition.g.cs | 2 +- .../Compositions/ChopperComposition.g.cs | 2 +- .../Compositions/ChuckComposition.g.cs | 2 +- .../Compositions/ChuteComposition.g.cs | 2 +- .../CircuitBreakerComposition.g.cs | 2 +- .../Compositions/ClampComposition.g.cs | 2 +- .../Compositions/CompressorComposition.g.cs | 2 +- .../Compositions/CoolingTowerComposition.g.cs | 2 +- .../Devices/Compositions/DoorComposition.g.cs | 2 +- .../Compositions/DrainComposition.g.cs | 2 +- .../Compositions/EncoderComposition.g.cs | 2 +- .../Compositions/ExpiredPotComposition.g.cs | 2 +- .../Compositions/ExposureUnitComposition.g.cs | 2 +- .../ExtrusionUnitComposition.g.cs | 2 +- .../Devices/Compositions/FanComposition.g.cs | 2 +- .../Compositions/FilterComposition.g.cs | 2 +- .../Compositions/GalvanomotorComposition.g.cs | 2 +- .../Compositions/GripperComposition.g.cs | 2 +- .../Compositions/HopperComposition.g.cs | 2 +- .../LinearPositionFeedbackComposition.g.cs | 2 +- .../Compositions/MotorComposition.g.cs | 2 +- .../Devices/Compositions/OilComposition.g.cs | 2 +- .../Devices/Compositions/PotComposition.g.cs | 2 +- .../Compositions/PowerSupplyComposition.g.cs | 2 +- .../Compositions/PulleyComposition.g.cs | 2 +- .../Devices/Compositions/PumpComposition.g.cs | 2 +- .../Devices/Compositions/ReelComposition.g.cs | 2 +- .../Compositions/RemovalPotComposition.g.cs | 2 +- .../Compositions/ReturnPotComposition.g.cs | 2 +- .../SensingElementComposition.g.cs | 2 +- .../Compositions/SpreaderComposition.g.cs | 2 +- .../Compositions/StagingPotComposition.g.cs | 2 +- .../Compositions/StationComposition.g.cs | 2 +- .../StorageBatteryComposition.g.cs | 2 +- .../Compositions/SwitchComposition.g.cs | 2 +- .../Compositions/TableComposition.g.cs | 2 +- .../Devices/Compositions/TankComposition.g.cs | 2 +- .../Compositions/TensionerComposition.g.cs | 2 +- .../Compositions/TransferArmComposition.g.cs | 2 +- .../Compositions/TransferPotComposition.g.cs | 2 +- .../Compositions/TransformerComposition.g.cs | 2 +- .../Compositions/ValveComposition.g.cs | 2 +- .../Devices/Compositions/VatComposition.g.cs | 2 +- .../Compositions/WaterComposition.g.cs | 2 +- .../Devices/Compositions/WireComposition.g.cs | 2 +- .../Compositions/WorkpieceComposition.g.cs | 2 +- .../Devices/Configurations/AlarmLimits.g.cs | 2 +- .../AlarmLimitsDescriptions.g.cs | 2 +- .../Configurations/AssetRelationship.g.cs | 2 +- .../AssetRelationshipDescriptions.g.cs | 2 +- .../Devices/Configurations/Channel.g.cs | 2 +- .../Configurations/ChannelDescriptions.g.cs | 2 +- .../Configurations/ComponentRelationship.g.cs | 2 +- .../ComponentRelationshipDescriptions.g.cs | 2 +- .../Devices/Configurations/Configuration.g.cs | 2 +- .../ConfigurationDescriptions.g.cs | 2 +- .../ConfigurationRelationship.g.cs | 2 +- ...ConfigurationRelationshipDescriptions.g.cs | 2 +- .../Devices/Configurations/ControlLimits.g.cs | 2 +- .../ControlLimitsDescriptions.g.cs | 2 +- .../Configurations/CoordinateSystem.g.cs | 2 +- .../CoordinateSystemDescriptions.g.cs | 2 +- .../Configurations/CoordinateSystemType.g.cs | 2 +- .../CoordinateSystemTypeDescriptions.g.cs | 2 +- .../Configurations/CriticalityType.g.cs | 2 +- .../CriticalityTypeDescriptions.g.cs | 2 +- .../Configurations/DeviceRelationship.g.cs | 2 +- .../DeviceRelationshipDescriptions.g.cs | 2 +- .../Devices/Configurations/IAlarmLimits.g.cs | 2 +- .../Configurations/IAssetRelationship.g.cs | 2 +- .../Devices/Configurations/IChannel.g.cs | 2 +- .../IComponentRelationship.g.cs | 2 +- .../Configurations/IConfiguration.g.cs | 2 +- .../IConfigurationRelationship.g.cs | 2 +- .../Configurations/IControlLimits.g.cs | 2 +- .../Configurations/ICoordinateSystem.g.cs | 2 +- .../Configurations/IDeviceRelationship.g.cs | 2 +- .../Devices/Configurations/IImageFile.g.cs | 2 +- .../Devices/Configurations/IMotion.g.cs | 2 +- .../Configurations/IProcessSpecification.g.cs | 2 +- .../Configurations/ISensorConfiguration.g.cs | 2 +- .../Devices/Configurations/ISolidModel.g.cs | 2 +- .../Configurations/ISpecification.g.cs | 2 +- .../Configurations/ISpecificationLimits.g.cs | 2 +- .../Configurations/ITransformation.g.cs | 2 +- .../Devices/Configurations/ImageFile.g.cs | 2 +- .../Configurations/ImageFileDescriptions.g.cs | 2 +- .../Devices/Configurations/MediaType.g.cs | 2 +- .../Configurations/MediaTypeDescriptions.g.cs | 2 +- .../Devices/Configurations/Motion.g.cs | 2 +- .../Configurations/MotionActuationType.g.cs | 2 +- .../MotionActuationTypeDescriptions.g.cs | 2 +- .../Configurations/MotionDescriptions.g.cs | 2 +- .../Devices/Configurations/MotionType.g.cs | 2 +- .../MotionTypeDescriptions.g.cs | 2 +- .../Devices/Configurations/Originator.g.cs | 2 +- .../OriginatorDescriptions.g.cs | 2 +- .../Configurations/ProcessSpecification.g.cs | 2 +- .../ProcessSpecificationDescriptions.g.cs | 2 +- .../Configurations/RelationshipType.g.cs | 2 +- .../RelationshipTypeDescriptions.g.cs | 2 +- .../Devices/Configurations/RoleType.g.cs | 2 +- .../Configurations/RoleTypeDescriptions.g.cs | 2 +- .../Configurations/SensorConfiguration.g.cs | 2 +- .../SensorConfigurationDescriptions.g.cs | 2 +- .../Devices/Configurations/SolidModel.g.cs | 2 +- .../SolidModelDescriptions.g.cs | 2 +- .../Devices/Configurations/Specification.g.cs | 2 +- .../SpecificationDescriptions.g.cs | 2 +- .../Configurations/SpecificationLimits.g.cs | 2 +- .../SpecificationLimitsDescriptions.g.cs | 2 +- .../Configurations/Transformation.g.cs | 2 +- .../TransformationDescriptions.g.cs | 2 +- .../Devices/Constraints.g.cs | 2 +- .../Devices/ConstraintsDescriptions.g.cs | 2 +- .../Devices/DataItem.g.cs | 2 +- .../Devices/DataItemCategory.g.cs | 2 +- .../Devices/DataItemCategoryDescriptions.g.cs | 2 +- .../Devices/DataItemCoordinateSystem.g.cs | 2 +- .../DataItemCoordinateSystemDescriptions.g.cs | 2 +- .../Devices/DataItemDefinition.g.cs | 2 +- .../DataItemDefinitionDescriptions.g.cs | 2 +- .../Devices/DataItemDescriptions.g.cs | 2 +- .../Devices/DataItemFilterType.g.cs | 2 +- .../DataItemFilterTypeDescriptions.g.cs | 2 +- .../Devices/DataItemRelationship.g.cs | 2 +- .../DataItemRelationshipDescriptions.g.cs | 2 +- .../Devices/DataItemRelationshipType.g.cs | 2 +- .../DataItemRelationshipTypeDescriptions.g.cs | 2 +- .../Devices/DataItemRepresentation.g.cs | 2 +- .../DataItemRepresentationDescriptions.g.cs | 2 +- .../Devices/DataItemResetTrigger.g.cs | 2 +- .../DataItemResetTriggerDescriptions.g.cs | 2 +- .../Devices/DataItemStatistic.g.cs | 2 +- .../DataItemStatisticDescriptions.g.cs | 2 +- .../DataItems/AccelerationDataItem.g.cs | 6 +- .../DataItems/AccumulatedTimeDataItem.g.cs | 7 +- .../DataItems/ActivationCountDataItem.g.cs | 6 +- .../Devices/DataItems/ActiveAxesDataItem.g.cs | 7 +- .../Devices/DataItems/ActuatorDataItem.g.cs | 7 +- .../DataItems/ActuatorStateDataItem.g.cs | 7 +- .../AdapterSoftwareVersionDataItem.g.cs | 7 +- .../Devices/DataItems/AdapterUriDataItem.g.cs | 7 +- .../Devices/DataItems/AlarmDataItem.g.cs | 7 +- .../Devices/DataItems/AlarmLimitDataItem.g.cs | 7 +- .../Devices/DataItems/AmperageACDataItem.g.cs | 6 +- .../Devices/DataItems/AmperageDCDataItem.g.cs | 6 +- .../Devices/DataItems/AmperageDataItem.g.cs | 6 +- .../Devices/DataItems/AngleDataItem.g.cs | 6 +- .../AngularAccelerationDataItem.g.cs | 6 +- .../AngularDecelerationDataItem.g.cs | 6 +- .../DataItems/AngularVelocityDataItem.g.cs | 7 +- .../DataItems/ApplicationDataItem.g.cs | 6 +- .../DataItems/AssetChangedDataItem.g.cs | 7 +- .../Devices/DataItems/AssetCountDataItem.g.cs | 7 +- .../DataItems/AssetRemovedDataItem.g.cs | 7 +- .../DataItems/AssetUpdateRateDataItem.g.cs | 7 +- .../DataItems/AvailabilityDataItem.g.cs | 7 +- .../DataItems/AxisCouplingDataItem.g.cs | 7 +- .../DataItems/AxisFeedrateDataItem.g.cs | 6 +- .../AxisFeedrateOverrideDataItem.g.cs | 6 +- .../DataItems/AxisInterlockDataItem.g.cs | 7 +- .../Devices/DataItems/AxisStateDataItem.g.cs | 7 +- .../DataItems/BatteryCapacityDataItem.g.cs | 6 +- .../DataItems/BatteryChargeDataItem.g.cs | 6 +- .../DataItems/BatteryStateDataItem.g.cs | 7 +- .../Devices/DataItems/BlockCountDataItem.g.cs | 7 +- .../Devices/DataItems/BlockDataItem.g.cs | 7 +- .../DataItems/CapacityFluidDataItem.g.cs | 7 +- .../DataItems/CapacitySpatialDataItem.g.cs | 7 +- .../CharacteristicPersistentIdDataItem.g.cs | 7 +- .../CharacteristicStatusDataItem.g.cs | 7 +- .../Devices/DataItems/ChargeRateDataItem.g.cs | 6 +- .../DataItems/ChuckInterlockDataItem.g.cs | 6 +- .../Devices/DataItems/ChuckStateDataItem.g.cs | 7 +- .../Devices/DataItems/ClockTimeDataItem.g.cs | 7 +- .../Devices/DataItems/CodeDataItem.g.cs | 7 +- .../DataItems/CommunicationsDataItem.g.cs | 7 +- .../DataItems/ComponentDataDataItem.g.cs | 7 +- .../DataItems/CompositionStateDataItem.g.cs | 6 +- .../DataItems/ConcentrationDataItem.g.cs | 7 +- .../DataItems/ConductivityDataItem.g.cs | 7 +- .../DataItems/ConnectionStatusDataItem.g.cs | 7 +- .../DataItems/ControlLimitDataItem.g.cs | 7 +- .../DataItems/ControllerModeDataItem.g.cs | 9 +- .../ControllerModeOverrideDataItem.g.cs | 6 +- .../DataItems/CoupledAxesDataItem.g.cs | 7 +- .../DataItems/CuttingSpeedDataItem.g.cs | 6 +- .../Devices/DataItems/CycleCountDataItem.g.cs | 6 +- .../Devices/DataItems/DataRangeDataItem.g.cs | 7 +- .../Devices/DataItems/DateCodeDataItem.g.cs | 6 +- .../DataItems/DeactivationCountDataItem.g.cs | 6 +- .../DataItems/DecelerationDataItem.g.cs | 6 +- .../Devices/DataItems/DensityDataItem.g.cs | 7 +- ...ositionAccelerationVolumetricDataItem.g.cs | 6 +- .../DataItems/DepositionDensityDataItem.g.cs | 6 +- .../DataItems/DepositionMassDataItem.g.cs | 6 +- .../DepositionRateVolumetricDataItem.g.cs | 6 +- .../DataItems/DepositionVolumeDataItem.g.cs | 6 +- .../DataItems/DeviceAddedDataItem.g.cs | 7 +- .../DataItems/DeviceChangedDataItem.g.cs | 7 +- .../DataItems/DeviceRemovedDataItem.g.cs | 7 +- .../Devices/DataItems/DeviceUuidDataItem.g.cs | 7 +- .../Devices/DataItems/DewPointDataItem.g.cs | 7 +- .../Devices/DataItems/DiameterDataItem.g.cs | 7 +- .../Devices/DataItems/DirectionDataItem.g.cs | 6 +- .../DataItems/DischargeRateDataItem.g.cs | 6 +- .../DisplacementAngularDataItem.g.cs | 7 +- .../DataItems/DisplacementDataItem.g.cs | 7 +- .../DataItems/DisplacementLinearDataItem.g.cs | 7 +- .../Devices/DataItems/DoorStateDataItem.g.cs | 7 +- .../DataItems/ElectricalEnergyDataItem.g.cs | 7 +- .../DataItems/EmergencyStopDataItem.g.cs | 9 +- .../Devices/DataItems/EndOfBarDataItem.g.cs | 6 +- .../DataItems/EquipmentModeDataItem.g.cs | 6 +- .../DataItems/EquipmentTimerDataItem.g.cs | 6 +- .../Devices/DataItems/ExecutionDataItem.g.cs | 9 +- .../DataItems/FeatureMeasurementDataItem.g.cs | 7 +- .../Devices/DataItems/FillLevelDataItem.g.cs | 7 +- .../Devices/DataItems/FirmwareDataItem.g.cs | 6 +- .../Devices/DataItems/FixtureIdDataItem.g.cs | 7 +- .../Devices/DataItems/FlowDataItem.g.cs | 7 +- .../FollowingErrorAngularDataItem.g.cs | 6 +- .../DataItems/FollowingErrorDataItem.g.cs | 6 +- .../FollowingErrorLinearDataItem.g.cs | 6 +- .../Devices/DataItems/FrequencyDataItem.g.cs | 7 +- .../DataItems/FunctionalModeDataItem.g.cs | 7 +- .../DataItems/GlobalPositionDataItem.g.cs | 6 +- .../GravitationalAccelerationDataItem.g.cs | 7 +- .../DataItems/GravitationalForceDataItem.g.cs | 7 +- .../Devices/DataItems/HardnessDataItem.g.cs | 6 +- .../Devices/DataItems/HardwareDataItem.g.cs | 6 +- .../Devices/DataItems/HostNameDataItem.g.cs | 7 +- .../DataItems/HumidityAbsoluteDataItem.g.cs | 6 +- .../DataItems/HumidityRelativeDataItem.g.cs | 6 +- .../DataItems/HumiditySpecificDataItem.g.cs | 6 +- .../Devices/DataItems/LeakDetectDataItem.g.cs | 7 +- .../Devices/DataItems/LengthDataItem.g.cs | 6 +- .../Devices/DataItems/LevelDataItem.g.cs | 7 +- .../Devices/DataItems/LibraryDataItem.g.cs | 6 +- .../Devices/DataItems/LineDataItem.g.cs | 6 +- .../Devices/DataItems/LineLabelDataItem.g.cs | 7 +- .../Devices/DataItems/LineNumberDataItem.g.cs | 6 +- .../DataItems/LinearForceDataItem.g.cs | 7 +- .../Devices/DataItems/LoadCountDataItem.g.cs | 6 +- .../Devices/DataItems/LoadDataItem.g.cs | 7 +- .../Devices/DataItems/LockStateDataItem.g.cs | 7 +- .../DataItems/LogicProgramDataItem.g.cs | 7 +- .../DataItems/MTConnectVersionDataItem.g.cs | 7 +- .../DataItems/MaintenanceListDataItem.g.cs | 7 +- .../Devices/DataItems/MassDataItem.g.cs | 7 +- .../Devices/DataItems/MaterialDataItem.g.cs | 7 +- .../DataItems/MaterialLayerDataItem.g.cs | 6 +- .../DataItems/MeasurementTypeDataItem.g.cs | 7 +- .../DataItems/MeasurementUnitsDataItem.g.cs | 7 +- .../DataItems/MeasurementValueDataItem.g.cs | 7 +- .../Devices/DataItems/MessageDataItem.g.cs | 7 +- .../DataItems/MotionProgramDataItem.g.cs | 7 +- .../Devices/DataItems/NetworkDataItem.g.cs | 6 +- .../DataItems/NetworkPortDataItem.g.cs | 7 +- .../ObservationUpdateRateDataItem.g.cs | 7 +- .../Devices/DataItems/OpennessDataItem.g.cs | 7 +- .../DataItems/OperatingModeDataItem.g.cs | 7 +- .../DataItems/OperatingSystemDataItem.g.cs | 6 +- .../Devices/DataItems/OperatorIdDataItem.g.cs | 7 +- .../DataItems/OrientationDataItem.g.cs | 6 +- .../Devices/DataItems/PHDataItem.g.cs | 7 +- .../Devices/DataItems/PalletIdDataItem.g.cs | 7 +- .../Devices/DataItems/PartCountDataItem.g.cs | 6 +- .../DataItems/PartCountTypeDataItem.g.cs | 7 +- .../Devices/DataItems/PartDetectDataItem.g.cs | 7 +- .../DataItems/PartGroupIdDataItem.g.cs | 6 +- .../Devices/DataItems/PartIdDataItem.g.cs | 7 +- .../Devices/DataItems/PartKindIdDataItem.g.cs | 6 +- .../Devices/DataItems/PartNumberDataItem.g.cs | 7 +- .../PartProcessingStateDataItem.g.cs | 7 +- .../Devices/DataItems/PartStatusDataItem.g.cs | 7 +- .../DataItems/PartUniqueIdDataItem.g.cs | 6 +- .../DataItems/PathFeedrateDataItem.g.cs | 6 +- .../PathFeedrateOverrideDataItem.g.cs | 6 +- .../PathFeedratePerRevolutionDataItem.g.cs | 6 +- .../Devices/DataItems/PathModeDataItem.g.cs | 7 +- .../DataItems/PathPositionDataItem.g.cs | 6 +- .../DataItems/PositionCartesianDataItem.g.cs | 7 +- .../Devices/DataItems/PositionDataItem.g.cs | 8 +- .../DataItems/PowerFactorDataItem.g.cs | 7 +- .../Devices/DataItems/PowerStateDataItem.g.cs | 6 +- .../DataItems/PowerStatusDataItem.g.cs | 7 +- .../DataItems/PressureAbsoluteDataItem.g.cs | 7 +- .../Devices/DataItems/PressureDataItem.g.cs | 7 +- .../DataItems/PressurizationRateDataItem.g.cs | 6 +- .../DataItems/ProcessAggregateIdDataItem.g.cs | 6 +- .../DataItems/ProcessKindIdDataItem.g.cs | 6 +- .../ProcessOccurrenceIdDataItem.g.cs | 6 +- .../DataItems/ProcessStateDataItem.g.cs | 7 +- .../DataItems/ProcessTimeDataItem.g.cs | 6 +- .../DataItems/ProcessTimerDataItem.g.cs | 6 +- .../DataItems/ProgramCommentDataItem.g.cs | 6 +- .../Devices/DataItems/ProgramDataItem.g.cs | 6 +- .../DataItems/ProgramEditDataItem.g.cs | 7 +- .../DataItems/ProgramEditNameDataItem.g.cs | 7 +- .../DataItems/ProgramHeaderDataItem.g.cs | 6 +- .../DataItems/ProgramLocationDataItem.g.cs | 6 +- .../ProgramLocationTypeDataItem.g.cs | 6 +- .../DataItems/ProgramNestLevelDataItem.g.cs | 7 +- .../Devices/DataItems/ResistanceDataItem.g.cs | 7 +- .../Devices/DataItems/RotaryModeDataItem.g.cs | 7 +- .../DataItems/RotaryVelocityDataItem.g.cs | 6 +- .../RotaryVelocityOverrideDataItem.g.cs | 7 +- .../Devices/DataItems/RotationDataItem.g.cs | 7 +- .../DataItems/SensorAttachmentDataItem.g.cs | 7 +- .../DataItems/SensorStateDataItem.g.cs | 6 +- .../DataItems/SerialNumberDataItem.g.cs | 7 +- .../SettlingErrorAngularDataItem.g.cs | 6 +- .../DataItems/SettlingErrorDataItem.g.cs | 6 +- .../SettlingErrorLinearDataItem.g.cs | 6 +- .../Devices/DataItems/SoundLevelDataItem.g.cs | 6 +- .../DataItems/SpecificationLimitDataItem.g.cs | 7 +- .../DataItems/SpindleInterlockDataItem.g.cs | 7 +- .../DataItems/SpindleSpeedDataItem.g.cs | 6 +- .../Devices/DataItems/StrainDataItem.g.cs | 7 +- .../Devices/DataItems/SystemDataItem.g.cs | 7 +- .../DataItems/TemperatureDataItem.g.cs | 9 +- .../Devices/DataItems/TensionDataItem.g.cs | 7 +- .../Devices/DataItems/TiltDataItem.g.cs | 7 +- .../DataItems/ToolAssetIdDataItem.g.cs | 7 +- .../Devices/DataItems/ToolGroupDataItem.g.cs | 7 +- .../Devices/DataItems/ToolIdDataItem.g.cs | 7 +- .../Devices/DataItems/ToolNumberDataItem.g.cs | 7 +- .../Devices/DataItems/ToolOffsetDataItem.g.cs | 6 +- .../DataItems/ToolOffsetsDataItem.g.cs | 7 +- .../Devices/DataItems/TorqueDataItem.g.cs | 7 +- .../DataItems/TransferCountDataItem.g.cs | 6 +- .../DataItems/TranslationDataItem.g.cs | 7 +- .../DataItems/UncertaintyDataItem.g.cs | 7 +- .../DataItems/UncertaintyTypeDataItem.g.cs | 7 +- .../DataItems/UnloadCountDataItem.g.cs | 6 +- .../Devices/DataItems/UserDataItem.g.cs | 6 +- .../Devices/DataItems/ValveStateDataItem.g.cs | 6 +- .../Devices/DataItems/VariableDataItem.g.cs | 7 +- .../Devices/DataItems/VelocityDataItem.g.cs | 7 +- .../Devices/DataItems/ViscosityDataItem.g.cs | 7 +- .../Devices/DataItems/VoltAmpereDataItem.g.cs | 7 +- .../DataItems/VoltAmpereReactiveDataItem.g.cs | 7 +- .../Devices/DataItems/VoltageACDataItem.g.cs | 6 +- .../Devices/DataItems/VoltageDCDataItem.g.cs | 6 +- .../Devices/DataItems/VoltageDataItem.g.cs | 6 +- .../DataItems/VolumeFluidDataItem.g.cs | 6 +- .../DataItems/VolumeSpatialDataItem.g.cs | 6 +- .../Devices/DataItems/WaitStateDataItem.g.cs | 7 +- .../Devices/DataItems/WattageDataItem.g.cs | 6 +- .../Devices/DataItems/WireDataItem.g.cs | 7 +- .../Devices/DataItems/WorkOffsetDataItem.g.cs | 7 +- .../DataItems/WorkOffsetsDataItem.g.cs | 7 +- .../DataItems/WorkholdingIdDataItem.g.cs | 7 +- .../Devices/DataItems/XDimensionDataItem.g.cs | 7 +- .../Devices/DataItems/YDimensionDataItem.g.cs | 7 +- .../Devices/DataItems/ZDimensionDataItem.g.cs | 7 +- .../Devices/Description.g.cs | 2 +- .../Devices/DescriptionDescriptions.g.cs | 2 +- .../MTConnect.NET-Common/Devices/Device.cs | 535 ++++++++++-- .../MTConnect.NET-Common/Devices/Device.g.cs | 2 +- .../Devices/DeviceDescriptions.g.cs | 2 +- .../Devices/EntryDefinition.g.cs | 2 +- .../Devices/EntryDefinitionDescriptions.g.cs | 2 +- .../MTConnect.NET-Common/Devices/Filter.g.cs | 2 +- .../Devices/FilterDescriptions.g.cs | 2 +- .../IAbstractDataItemRelationship.g.cs | 2 +- .../Devices/ICellDefinition.g.cs | 2 +- .../Devices/IComponent.cs | 88 +- .../Devices/IComponent.g.cs | 2 +- .../Devices/IComposition.cs | 35 +- .../Devices/IComposition.g.cs | 2 +- .../Devices/IConstraints.g.cs | 2 +- .../Devices/IContainer.cs | 9 +- .../Devices/IContainer.g.cs | 2 +- .../MTConnect.NET-Common/Devices/IDataItem.cs | 4 - .../Devices/IDataItem.g.cs | 2 +- .../Devices/IDataItemDefinition.g.cs | 2 +- .../Devices/IDataItemRelationship.g.cs | 2 +- .../Devices/IDescription.g.cs | 2 +- .../MTConnect.NET-Common/Devices/IDevice.cs | 2 +- .../MTConnect.NET-Common/Devices/IDevice.g.cs | 2 +- .../Devices/IEntryDefinition.g.cs | 2 +- .../MTConnect.NET-Common/Devices/IFilter.g.cs | 2 +- .../MTConnect.NET-Common/Devices/ISource.g.cs | 2 +- .../Devices/ISpecificationRelationship.g.cs | 2 +- .../Devices/NativeUnits.g.cs | 2 +- .../Devices/NativeUnitsDescriptions.g.cs | 2 +- .../References/ComponentReference.g.cs | 2 +- .../Devices/References/DataItemReference.g.cs | 2 +- .../References/IComponentReference.g.cs | 2 +- .../References/IDataItemReference.g.cs | 2 +- .../Devices/References/IReference.g.cs | 2 +- .../Devices/References/Reference.g.cs | 2 +- .../References/ReferenceDescriptions.g.cs | 2 +- .../Devices/SearchType.cs | 11 + .../MTConnect.NET-Common/Devices/Source.g.cs | 2 +- .../Devices/SourceDescriptions.g.cs | 2 +- .../Devices/SpecificationRelationship.g.cs | 2 +- ...SpecificationRelationshipDescriptions.g.cs | 2 +- .../SpecificationRelationshipType.g.cs | 2 +- ...ificationRelationshipTypeDescriptions.g.cs | 2 +- .../MTConnect.NET-Common/Devices/Units.g.cs | 2 +- .../Devices/UnitsDescriptions.g.cs | 2 +- .../Extensions/StringFunctions.cs | 6 +- .../Input/MTConnectDataSource.cs | 35 +- .../Interfaces/CloseChuckDataItem.g.cs | 2 +- .../Interfaces/CloseDoorDataItem.g.cs | 2 +- .../Interfaces/InterfaceStateDataItem.g.cs | 2 +- .../Interfaces/MaterialChangeDataItem.g.cs | 2 +- .../Interfaces/MaterialFeedDataItem.g.cs | 2 +- .../Interfaces/MaterialLoadDataItem.g.cs | 2 +- .../Interfaces/MaterialRetractDataItem.g.cs | 2 +- .../Interfaces/MaterialUnloadDataItem.g.cs | 2 +- .../Interfaces/OpenChuckDataItem.g.cs | 2 +- .../Interfaces/OpenDoorDataItem.g.cs | 2 +- .../Interfaces/PartChangeDataItem.g.cs | 2 +- .../Observations/Events/ActuatorState.g.cs | 2 +- .../Events/ActuatorStateDescriptions.g.cs | 2 +- .../Observations/Events/Availability.g.cs | 2 +- .../Events/AvailabilityDescriptions.g.cs | 2 +- .../Observations/Events/AxisCoupling.g.cs | 2 +- .../Events/AxisCouplingDescriptions.g.cs | 2 +- .../Observations/Events/AxisInterlock.g.cs | 2 +- .../Events/AxisInterlockDescriptions.g.cs | 2 +- .../Observations/Events/AxisState.g.cs | 2 +- .../Events/AxisStateDescriptions.g.cs | 2 +- .../Observations/Events/BatteryState.g.cs | 2 +- .../Events/BatteryStateDescriptions.g.cs | 2 +- .../Events/CharacteristicStatus.g.cs | 2 +- .../CharacteristicStatusDescriptions.g.cs | 2 +- .../Observations/Events/ChuckInterlock.g.cs | 2 +- .../Events/ChuckInterlockDescriptions.g.cs | 2 +- .../Observations/Events/ChuckState.g.cs | 2 +- .../Events/ChuckStateDescriptions.g.cs | 2 +- .../Observations/Events/ConnectionStatus.g.cs | 2 +- .../Events/ConnectionStatusDescriptions.g.cs | 2 +- .../Observations/Events/ControllerMode.g.cs | 2 +- .../Events/ControllerModeDescriptions.g.cs | 2 +- .../Events/ControllerModeOverride.g.cs | 2 +- .../ControllerModeOverrideDescriptions.g.cs | 2 +- .../Observations/Events/Direction.g.cs | 2 +- .../Events/DirectionDescriptions.g.cs | 2 +- .../Observations/Events/DoorState.g.cs | 2 +- .../Events/DoorStateDescriptions.g.cs | 2 +- .../Observations/Events/EmergencyStop.g.cs | 2 +- .../Events/EmergencyStopDescriptions.g.cs | 2 +- .../Observations/Events/EndOfBar.g.cs | 2 +- .../Events/EndOfBarDescriptions.g.cs | 2 +- .../Observations/Events/EquipmentMode.g.cs | 2 +- .../Events/EquipmentModeDescriptions.g.cs | 2 +- .../Observations/Events/Execution.g.cs | 2 +- .../Events/ExecutionDescriptions.g.cs | 2 +- .../Observations/Events/FunctionalMode.g.cs | 2 +- .../Events/FunctionalModeDescriptions.g.cs | 2 +- .../Observations/Events/InterfaceState.g.cs | 2 +- .../Events/InterfaceStateDescriptions.g.cs | 2 +- .../Observations/Events/LeakDetect.g.cs | 2 +- .../Events/LeakDetectDescriptions.g.cs | 2 +- .../Observations/Events/LockState.g.cs | 2 +- .../Events/LockStateDescriptions.g.cs | 2 +- .../Observations/Events/OperatingMode.g.cs | 2 +- .../Events/OperatingModeDescriptions.g.cs | 2 +- .../Observations/Events/PartCountType.g.cs | 2 +- .../Events/PartCountTypeDescriptions.g.cs | 2 +- .../Observations/Events/PartDetect.g.cs | 2 +- .../Events/PartDetectDescriptions.g.cs | 2 +- .../Events/PartProcessingState.g.cs | 2 +- .../PartProcessingStateDescriptions.g.cs | 2 +- .../Observations/Events/PartStatus.g.cs | 2 +- .../Events/PartStatusDescriptions.g.cs | 2 +- .../Observations/Events/PathMode.g.cs | 2 +- .../Events/PathModeDescriptions.g.cs | 2 +- .../Observations/Events/PowerState.g.cs | 2 +- .../Events/PowerStateDescriptions.g.cs | 2 +- .../Observations/Events/PowerStatus.g.cs | 2 +- .../Events/PowerStatusDescriptions.g.cs | 2 +- .../Observations/Events/ProcessState.g.cs | 2 +- .../Events/ProcessStateDescriptions.g.cs | 2 +- .../Observations/Events/ProgramEdit.g.cs | 2 +- .../Events/ProgramEditDescriptions.g.cs | 2 +- .../Events/ProgramLocationType.g.cs | 2 +- .../ProgramLocationTypeDescriptions.g.cs | 2 +- .../Observations/Events/RotaryMode.g.cs | 2 +- .../Events/RotaryModeDescriptions.g.cs | 2 +- .../Observations/Events/SpindleInterlock.g.cs | 2 +- .../Events/SpindleInterlockDescriptions.g.cs | 2 +- .../Observations/Events/UncertaintyType.g.cs | 2 +- .../Events/UncertaintyTypeDescriptions.g.cs | 2 +- .../Observations/Events/ValveState.g.cs | 2 +- .../Events/ValveStateDescriptions.g.cs | 2 +- .../Observations/Events/WaitState.g.cs | 2 +- .../Events/WaitStateDescriptions.g.cs | 2 +- .../Configurations/HttpServerConfiguration.cs | 2 + .../Adapters/ShdrAdapterClient.cs | 13 +- .../ShdrAdapterClientConfiguration.cs | 2 +- .../Models/Devices/MTConnectComponentType.cs | 13 +- .../Devices/XmlDevicesHeader.cs | 6 +- 805 files changed, 5204 insertions(+), 1465 deletions(-) create mode 100644 libraries/MTConnect.NET-Common/Agents/MTConnectInputAgentModule.cs create mode 100644 libraries/MTConnect.NET-Common/Devices/SearchType.cs diff --git a/MTConnect.NET.sln b/MTConnect.NET.sln index 74363503..3c76cb5b 100644 --- a/MTConnect.NET.sln +++ b/MTConnect.NET.sln @@ -108,6 +108,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-AgentModule-M EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-Client-MQTT", "clients\MTConnect.NET-Client-MQTT\MTConnect.NET-Client-MQTT.csproj", "{2844E2F1-8CC0-437B-A730-9045A25971F6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp41", "C:\temp\ConsoleApp41\ConsoleApp41.csproj", "{05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -388,6 +390,14 @@ Global {2844E2F1-8CC0-437B-A730-9045A25971F6}.Package|Any CPU.Build.0 = Debug|Any CPU {2844E2F1-8CC0-437B-A730-9045A25971F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {2844E2F1-8CC0-437B-A730-9045A25971F6}.Release|Any CPU.Build.0 = Release|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Docker|Any CPU.ActiveCfg = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Docker|Any CPU.Build.0 = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Package|Any CPU.ActiveCfg = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Package|Any CPU.Build.0 = Debug|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05289E74-4CBE-4B3C-BCCC-5B2BAD2D4825}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/adapter/MTConnect.NET-Adapter/Program.cs b/adapter/MTConnect.NET-Adapter/Program.cs index e5379a26..b29ef7e8 100644 --- a/adapter/MTConnect.NET-Adapter/Program.cs +++ b/adapter/MTConnect.NET-Adapter/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using System; @@ -14,7 +14,7 @@ public class Program // Copyright statement for the application. If you are implementing this into your own application, you can change this to your own copyright, or set it to 'null'. // This is just what is shown in the console header. - private const string ApplicationCopyright = "Copyright 2023 TrakHound Inc., All Rights Reserved"; + private const string ApplicationCopyright = "Copyright 2024 TrakHound Inc., All Rights Reserved"; public static void Main(string[] args) diff --git a/agent/MTConnect.NET-Agent/Program.cs b/agent/MTConnect.NET-Agent/Program.cs index 2edcabd1..daaa9edb 100644 --- a/agent/MTConnect.NET-Agent/Program.cs +++ b/agent/MTConnect.NET-Agent/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using System; @@ -14,7 +14,7 @@ public class Program // Copyright statement for the application. If you are implementing this into your own application, you can change this to your own copyright. // This is just what is shown in the console header. If you want to show support for the MTConnect.NET project, you can reference it using the links in the default header - private const string ApplicationCopyright = "Copyright 2023 TrakHound Inc., All Rights Reserved"; + private const string ApplicationCopyright = "Copyright 2024 TrakHound Inc., All Rights Reserved"; public static void Main(string[] args) { diff --git a/agent/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs b/agent/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs index 0c860b1c..26cc40ee 100644 --- a/agent/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs +++ b/agent/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Agents; @@ -21,10 +21,10 @@ namespace MTConnect.Applications { - /// - /// An MTConnect Agent Application base class supporting Command line arguments, Device management, Buffer management, Logging, Windows Service, and Configuration File management - /// - public class MTConnectAgentApplication : IMTConnectAgentApplication + /// + /// An MTConnect Agent Application base class supporting Command line arguments, Device management, Buffer management, Logging, Windows Service, and Configuration File management + /// + public class MTConnectAgentApplication : IMTConnectAgentApplication { private const string DefaultServiceName = "MTConnect.NET-Agent"; private const string DefaultServiceDisplayName = "MTConnect.NET Agent"; @@ -392,7 +392,7 @@ public void StartAgent(IAgentApplicationConfiguration configuration, bool verbos } OnStartAgentBeforeLoad(null, initializeDataItems); - _modules.StartBeforeLoad(); + _modules.StartBeforeLoad(initializeDataItems); // Read Device Configuration Files var devicesPath = configuration.Devices; @@ -449,7 +449,7 @@ public void StartAgent(IAgentApplicationConfiguration configuration, bool verbos _mtconnectAgent.InitializeCurrentObservations(_observationBuffer.CurrentConditions.SelectMany(o => o.Value)); } - _modules.StartAfterLoad(); + _modules.StartAfterLoad(initializeDataItems); OnStartAgentAfterLoad(devices, initializeDataItems); // Save Indexes for Buffer diff --git a/agent/Modules/MTConnect.NET-AgentModule-HttpAdapter/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-HttpAdapter/Module.cs index 74ab5ce3..be9e4c84 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-HttpAdapter/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-HttpAdapter/Module.cs @@ -36,7 +36,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base } - protected override void OnStartAfterLoad() + protected override void OnStartAfterLoad(bool initializeDataItems) { if (_configuration != null && !string.IsNullOrEmpty(_configuration.Address)) { diff --git a/agent/Modules/MTConnect.NET-AgentModule-HttpServer/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-HttpServer/Module.cs index f0821fc0..8276af90 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-HttpServer/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-HttpServer/Module.cs @@ -32,7 +32,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object controllerConfigurati } - protected override void OnStartAfterLoad() + protected override void OnStartAfterLoad(bool initializeDataItems) { // Intialize the Http Server _httpServer = new MTConnectShdrHttpAgentServer(_configuration, _mtconnectAgent); diff --git a/agent/Modules/MTConnect.NET-AgentModule-MqttAdapter/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-MqttAdapter/Module.cs index 08842b61..a95e4e7e 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-MqttAdapter/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-MqttAdapter/Module.cs @@ -49,7 +49,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base } - protected override void OnStartAfterLoad() + protected override void OnStartAfterLoad(bool initializeDataItems) { if (_configuration != null) { diff --git a/agent/Modules/MTConnect.NET-AgentModule-MqttBroker/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-MqttBroker/Module.cs index 1ae0844c..a4f22b2b 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-MqttBroker/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-MqttBroker/Module.cs @@ -46,7 +46,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base } - protected override void OnStartBeforeLoad() + protected override void OnStartBeforeLoad(bool initializeDataItems) { _stop = new CancellationTokenSource(); diff --git a/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs index e81e094b..e467f3bd 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs @@ -48,7 +48,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base } - protected override void OnStartAfterLoad() + protected override void OnStartAfterLoad(bool initializeDataItems) { _stop = new CancellationTokenSource(); diff --git a/agent/Modules/MTConnect.NET-AgentModule-ShdrAdapter/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-ShdrAdapter/Module.cs index b915a2b0..5d93b7d3 100644 --- a/agent/Modules/MTConnect.NET-AgentModule-ShdrAdapter/Module.cs +++ b/agent/Modules/MTConnect.NET-AgentModule-ShdrAdapter/Module.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Adapters; @@ -8,13 +8,14 @@ using MTConnect.Devices.Components; using MTConnect.Devices.DataItems; using MTConnect.Logging; +using MTConnect.Observations.Events; using System; using System.Collections.Generic; using System.Linq; namespace MTConnect.Modules { - public class Module : MTConnectAgentModule + public class Module : MTConnectAgentModule { public const string ConfigurationTypeId = "shdr-adapter"; private const string ModuleId = "SHDR Adapter"; @@ -33,7 +34,7 @@ public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base } - protected override void OnStartAfterLoad() + protected override void OnStartAfterLoad(bool initializeDataItems) { if (_configuration != null) { @@ -44,14 +45,12 @@ protected override void OnStartAfterLoad() { // Find Device matching DeviceKey var device = devices.FirstOrDefault(o => o.Uuid == _configuration.DeviceKey || o.Name == _configuration.DeviceKey); - if (device != null) AddAdapter(_configuration, device); - //if (device != null) AddAdapter(_configuration, device, initializeDataItems); + if (device != null) AddAdapter(_configuration, device, initializeDataItems); } else { // Add Adapter for each Device (every device reads from the same adapter) - foreach (var device in devices) AddAdapter(_configuration, device, true, device.Id); - //foreach (var device in devices) AddAdapter(adapter, device, initializeDataItems, device.Id); + foreach (var device in devices) AddAdapter(_configuration, device, initializeDataItems, device.Id); } } else if (_configuration.AllowShdrDevice) // Prevent accidental generic Adapter creation @@ -90,20 +89,20 @@ private void AddAdapter(IShdrAdapterClientConfiguration configuration, IDevice d { if (configuration != null) { - var adapterComponent = new ShdrAdapterComponent(configuration, idSuffix, device, device); + var adapterComponent = new ShdrAdapterComponent(configuration, idSuffix, _mtconnectAgent.Agent, _mtconnectAgent.Agent); // Add Adapter Component to Agent Device _mtconnectAgent.Agent.AddAdapterComponent(adapterComponent); - if (!adapterComponent.DataItems.IsNullOrEmpty()) + if (configuration.OutputConnectionInformation) { - // Initialize Adapter URI Observation - var adapterUriDataItem = adapterComponent.DataItems.FirstOrDefault(o => o.Type == AdapterUriDataItem.TypeId); - if (adapterUriDataItem != null && initializeDataItems) - { - _mtconnectAgent.AddObservation(_mtconnectAgent.Uuid, adapterUriDataItem.Id, adapterComponent.Uri); - } - } + // Initialize Adapter URI Observation + var adapterUriDataItem = adapterComponent.GetDataItemByType(AdapterUriDataItem.TypeId); + if (adapterUriDataItem != null && initializeDataItems) + { + _mtconnectAgent.AddObservation(adapterUriDataItem, adapterComponent.Uri); + } + } // Create new SHDR Adapter Client to read from SHDR stream var adapterClient = new ShdrAdapterClient(configuration, _mtconnectAgent, device, idSuffix); @@ -117,9 +116,13 @@ private void AddAdapter(IShdrAdapterClientConfiguration configuration, IDevice d adapterClient.PongReceived += AdapterPongReceived; adapterClient.ProtocolReceived += AdapterProtocolReceived; - // Start the Adapter Client - adapterClient.Start(); - } + // Set ConnectionStatus DataItem + var connectionStatusDataItem = _mtconnectAgent.Agent.GetDataItemByKey(DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId)); + _mtconnectAgent.AddObservation(connectionStatusDataItem, ConnectionStatus.LISTEN); + + // Start the Adapter Client + adapterClient.Start(); + } } @@ -127,8 +130,16 @@ private void AdapterConnected(object sender, string message) { var adapterClient = (ShdrAdapterClient)sender; - var dataItemId = DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId); - _mtconnectAgent.AddObservation(_mtconnectAgent.Uuid, dataItemId, Observations.Events.ConnectionStatus.ESTABLISHED); + // Set ConnectionStatus DataItem + var connectionStatusDataItem = _mtconnectAgent.Agent.GetDataItemByKey(DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId)); + _mtconnectAgent.AddObservation(connectionStatusDataItem, ConnectionStatus.ESTABLISHED); + + // Set Availability (if AvailableOnConnection = TRUE) + if (_configuration.AvailableOnConnection) + { + var availabilityDataItem = adapterClient.Device.GetDataItemByType(AvailabilityDataItem.TypeId); + _mtconnectAgent.AddObservation(availabilityDataItem, Availability.AVAILABLE); + } Log(MTConnectLogLevel.Information, $"ID = " + adapterClient.Id + " : " + message); } @@ -137,10 +148,18 @@ private void AdapterDisconnected(object sender, string message) { var adapterClient = (ShdrAdapterClient)sender; - var dataItemId = DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId); - _mtconnectAgent.AddObservation(_mtconnectAgent.Uuid, dataItemId, Observations.Events.ConnectionStatus.CLOSED); + // Set ConnectionStatus DataItem + var connectionStatusDataItem = _mtconnectAgent.Agent.GetDataItemByKey(DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId)); + _mtconnectAgent.AddObservation(connectionStatusDataItem, ConnectionStatus.CLOSED); - Log(MTConnectLogLevel.Information, $"ID = " + adapterClient.Id + " : " + message); + // Set Availability (if AvailableOnConnection = TRUE) + if (_configuration.AvailableOnConnection) + { + var availabilityDataItem = adapterClient.Device.GetDataItemByType(AvailabilityDataItem.TypeId); + _mtconnectAgent.AddObservation(availabilityDataItem, Availability.UNAVAILABLE); + } + + Log(MTConnectLogLevel.Information, $"ID = " + adapterClient.Id + " : " + message); } private void AdapterConnectionError(object sender, Exception exception) @@ -153,8 +172,9 @@ private void AdapterListening(object sender, string message) { var adapterClient = (ShdrAdapterClient)sender; - var dataItemId = DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId); - _mtconnectAgent.AddObservation(_mtconnectAgent.Uuid, dataItemId, Observations.Events.ConnectionStatus.LISTEN); + // Set ConnectionStatus DataItem + var connectionStatusDataItem = _mtconnectAgent.Agent.GetDataItemByKey(DataItem.CreateId(adapterClient.Id, ConnectionStatusDataItem.NameId)); + _mtconnectAgent.AddObservation(connectionStatusDataItem, ConnectionStatus.LISTEN); Log(MTConnectLogLevel.Debug, $"ID = " + adapterClient.Id + " : " + message); } diff --git a/build/AssemblyInfo.cs b/build/AssemblyInfo.cs index eba6c6d7..a80929fc 100644 --- a/build/AssemblyInfo.cs +++ b/build/AssemblyInfo.cs @@ -1,6 +1,6 @@ using System.Reflection; -[assembly: AssemblyVersion("6.0.10")] -[assembly: AssemblyFileVersion("6.0.10")] +[assembly: AssemblyVersion("6.0.11")] +[assembly: AssemblyFileVersion("6.0.11")] [assembly: AssemblyCompany("TrakHound Inc.")] -[assembly: AssemblyCopyright("Copyright (c) 2023 TrakHound Inc., All Rights Reserved.")] +[assembly: AssemblyCopyright("Copyright (c) 2024 TrakHound Inc., All Rights Reserved.")] diff --git a/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs b/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs index 9455a07e..295bd9b9 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs +++ b/build/MTConnect.NET-SysML-Import/CSharp/DataItemType.cs @@ -13,7 +13,7 @@ public class DataItemType : MTConnectDataItemType, ITemplateModel { public string Namespace => NamespaceHelper.GetNamespace(Id); - public string DefaultName => Type.ToCamelCase(); + public string DefaultName => GetName(Type); public string UnitsEnum => Units != null ? $"Devices.{Units}" : null; @@ -98,5 +98,21 @@ public virtual string RenderModel() public string RenderInterface() => null; public string RenderDescriptions() => null; - } + + + private static string GetName(string type) + { + switch (type) + { + case "EMERGENCY_STOP": return "estop"; + case "CONTROLLER_MODE": return "mode"; + case "EXECUTION": return "exec"; + case "LOAD": return "load"; + case "POSITION": return "pos"; + case "TEMPERATURE": return "temp"; + } + + return type.ToCamelCase(); + } + } } diff --git a/build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs b/build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs index 00ad45af..874eabbc 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs +++ b/build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs @@ -75,7 +75,11 @@ public static void Render(MTConnectModel mtconnectModel, string outputPath) if (typeof(MTConnectInterfaceDataItemType).IsAssignableFrom(type)) template = InterfaceDataItemType.Create((MTConnectInterfaceDataItemType)exportModel); else if (typeof(MTConnectDataItemType).IsAssignableFrom(type)) template = DataItemType.Create((MTConnectDataItemType)exportModel); else if (typeof(MTConnectCompositionType).IsAssignableFrom(type)) template = CompositionType.Create((MTConnectCompositionType)exportModel); - else if (typeof(MTConnectComponentType).IsAssignableFrom(type)) template = ComponentType.Create((MTConnectComponentType)exportModel); + else if (typeof(MTConnectComponentType).IsAssignableFrom(type)) + { + if (((MTConnectComponentType)exportModel).Type == "Controllers") ((MTConnectComponentType)exportModel).MinimumVersion = new Version(1, 0); + template = ComponentType.Create((MTConnectComponentType)exportModel); + } else if (typeof(MTConnectCuttingToolMeasurementModel).IsAssignableFrom(type)) template = CuttingToolMeasurementModel.Create((MTConnectCuttingToolMeasurementModel)exportModel); else if (typeof(MTConnectClassModel).IsAssignableFrom(type)) template = ClassModel.Create((MTConnectClassModel)exportModel); else if (typeof(MTConnectObservationModel).IsAssignableFrom(type)) template = ObservationModel.Create((MTConnectObservationModel)exportModel); @@ -108,6 +112,9 @@ public static void Render(MTConnectModel mtconnectModel, string outputPath) case "Devices.References.DataItemReference": ((ClassModel)template).HasDescriptions = false; break; case "Devices.Units": ((EnumStringModel)template).IsPartial = true; break; + case "Devices.DataItems.ToolOffsetsDataItem": ((DataItemType)template).Representation = "TABLE"; break; + case "Devices.DataItems.WorkOffsetsDataItem": ((DataItemType)template).Representation = "TABLE"; break; + //case "Devices.DataItemResetTrigger": ((EnumModel)template).Values.Add(new MTConnectEnumValueModel { Name = "NONE" }); break; //case "Devices.DataItemStatistic": ((EnumModel)template).Values.Add(new MTConnectEnumValueModel { Name = "NONE" }); break; //case "Devices.Configurations.CriticalityType": ((EnumModel)template).Values.Add(new MTConnectEnumValueModel { Name = "NOT_SPECIFIED" }); break; diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban index bf0e01d4..66c8d36d 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.ComponentType.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.ComponentType.scriban index 560d2161..935cb330 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.ComponentType.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.ComponentType.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = {{uml_id}} @@ -19,6 +19,10 @@ namespace MTConnect.Devices.Components {{ if (minimum_version_enum) }}public override System.Version MinimumVersion => {{minimum_version_enum}};{{ end }} - public {{name}}() { Type = TypeId; } + public {{name}}() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.CompositionType.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.CompositionType.scriban index 419ef9da..4d7317e1 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.CompositionType.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.CompositionType.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.DataItemType.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.DataItemType.scriban index 12353c0c..3b55edff 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.DataItemType.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.DataItemType.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ namespace MTConnect.Devices.DataItems public const DataItemCategory CategoryId = DataItemCategory.{{category}}; public const string TypeId = "{{type}}"; public const string NameId = "{{default_name}}"; + {{ if (representation) }}public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.{{representation}};{{ end }} {{ if (units_enum) }}public const string DefaultUnits = {{units_enum}};{{ end }} public new const string DescriptionText = "{{description}}"; @@ -36,6 +37,8 @@ namespace MTConnect.Devices.DataItems { Category = CategoryId; Type = TypeId; + Name = NameId; + {{ if (representation) }}Representation = DefaultRepresentation;{{ end }} {{ if (units_enum) }}Units = DefaultUnits;{{ end }} } @@ -51,6 +54,7 @@ namespace MTConnect.Devices.DataItems Type = TypeId; SubType = subType.ToString(); Name = NameId; + {{ if (representation) }}Representation = DefaultRepresentation;{{ end }} {{ if (units_enum) }}Units = DefaultUnits;{{ end }} } @@ -93,6 +97,8 @@ namespace MTConnect.Devices.DataItems Category = CategoryId; Type = TypeId; Name = NameId; + {{ if (representation) }}Representation = DefaultRepresentation;{{ end }} + {{ if (units_enum) }}Units = DefaultUnits;{{ end }} } {{- end }} } diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.Device.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.Device.scriban index d8756883..d600f0bd 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.Device.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.Device.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices.Configurations; diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Enum.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Enum.scriban index 61bd89ec..5919dc32 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Enum.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Enum.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumDescriptions.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumDescriptions.scriban index 266fde59..41be9a73 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumDescriptions.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumDescriptions.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumString.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumString.scriban index 172f4a46..cbee5bb3 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumString.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumString.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumStringDescriptions.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumStringDescriptions.scriban index ab281456..18cdb936 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumStringDescriptions.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumStringDescriptions.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interface.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interface.scriban index 5b596896..4694091f 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interface.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interface.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interfaces.InterfaceDataItemType.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interfaces.InterfaceDataItemType.scriban index 93987bb3..acc4d464 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interfaces.InterfaceDataItemType.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Interfaces.InterfaceDataItemType.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Model.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Model.scriban index 6a272ddc..bc06b192 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Model.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Model.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = {{uml_id}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/ModelDescriptions.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/ModelDescriptions.scriban index 812abe63..529dbcb3 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/ModelDescriptions.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/ModelDescriptions.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Observations.Observation.scriban b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Observations.Observation.scriban index 2814ee91..56bdce75 100644 --- a/build/MTConnect.NET-SysML-Import/CSharp/Templates/Observations.Observation.scriban +++ b/build/MTConnect.NET-SysML-Import/CSharp/Templates/Observations.Observation.scriban @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace {{namespace}} diff --git a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgent.cs b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgent.cs index 5e8da710..cd4e2220 100644 --- a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgent.cs +++ b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgent.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Agents.Metrics; @@ -14,11 +14,11 @@ namespace MTConnect.Agents { - /// - /// An Agent is the centerpiece of an MTConnect implementation. - /// It organizes and manages individual pieces of information published by one or more pieces of equipment. - /// - public interface IMTConnectAgent + /// + /// An Agent is the centerpiece of an MTConnect implementation. + /// It organizes and manages individual pieces of information published by one or more pieces of equipment. + /// + public interface IMTConnectAgent { /// /// Gets the Device that represents the Agent in the Information Model @@ -198,32 +198,64 @@ public interface IMTConnectAgent /// Returns True if the Assets were successfully removed bool RemoveAllAssets(string assetType, DateTime timestamp); - #endregion - - - #region "Add" - - /// - /// Add a new MTConnectDevice to the Agent's Buffer - /// - bool AddDevice(IDevice device, bool intializeDataItems = true); - - /// - /// Add new MTConnectDevices to the Agent's Buffer - /// - bool AddDevices(IEnumerable devices, bool intializeDataItems = true); - - - /// - /// Add a new Observation to the Agent for the specified Device and DataItem - /// - /// The (Name or Uuid) of the Device - /// The (Name, ID, or Source) of the DataItem - /// The Value of the Observation (equivalent to ValueKey = Value) - /// Used to override the default configuration for the Agent to ConvertUnits - /// Used to override the default configuration for the Agent to IgnoreCase of the Value - /// True if the Observation was added successfully - bool AddObservation(string deviceKey, string dataItemKey, object value, bool? convertUnits = null, bool? ignoreCase = null); + #endregion + + + #region "Add" + + /// + /// Add a new MTConnectDevice to the Agent's Buffer + /// + IDevice AddDevice(IDevice device, bool intializeDataItems = true); + + /// + /// Add new MTConnectDevices to the Agent's Buffer + /// + IEnumerable AddDevices(IEnumerable devices, bool intializeDataItems = true); + + + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(IDataItem dataItem, object value, bool? convertUnits = null, bool? ignoreCase = null); + + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation in Unix Ticks (1/10,000 of a millisecond) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(IDataItem dataItem, object value, long timestamp, bool? convertUnits = null, bool? ignoreCase = null); + + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(IDataItem dataItem, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null); + + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device + /// The (Name, ID, or Source) of the DataItem + /// The Value of the Observation (equivalent to ValueKey = Value) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(string deviceKey, string dataItemKey, object value, bool? convertUnits = null, bool? ignoreCase = null); /// /// Add a new Observation to the Agent for the specified Device and DataItem @@ -287,21 +319,37 @@ public interface IMTConnectAgent /// True if the Observation was added successfully bool AddObservation(string deviceKey, string dataItemKey, string valueKey, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null); - /// - /// Add a new Observation to the Agent for the specified Device and DataItem - /// - /// The (Name or Uuid) of the Device - /// The Observation to add - /// Used to override the default configuration for the Agent to IgnoreTimestamp - /// Used to override the default configuration for the Agent to ConvertUnits - /// Used to override the default configuration for the Agent to IgnoreCase of the Value - /// True if the Observation was added successfully - bool AddObservation(string deviceKey, IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null); - - /// - /// Add new Observations to the Agent for the specified Device - /// - bool AddObservations(string deviceKey, IEnumerable observationInputs); + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The Observation to add + /// Used to override the default configuration for the Agent to IgnoreTimestamp + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null); + + + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device. This overrides what is set in the "observationInput" parameter + /// The Observation to add + /// Used to override the default configuration for the Agent to IgnoreTimestamp + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + bool AddObservation(string deviceKey, IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null); + + /// + /// Add new Observations to the Agent for the specified Device + /// + bool AddObservations(IEnumerable observationInputs); + + /// + /// Add new Observations for DataItems to the Agent using the "deviceKey" property to override the DeviceKey set in each ObservationInput + /// + bool AddObservations(string deviceKey, IEnumerable observationInputs); /// diff --git a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentBroker.cs b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentBroker.cs index ded99ec7..1dfa924d 100644 --- a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentBroker.cs +++ b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentBroker.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Assets; @@ -11,7 +11,7 @@ namespace MTConnect.Agents { /// - /// Publishes MTConnect information in the form of a Response Document to client software applications. + /// Retrieve MTConnect information in the form of MTConnect Response Documents. /// public interface IMTConnectAgentBroker : IMTConnectAgent { diff --git a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentModule.cs b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentModule.cs index 1a1fae19..11615473 100644 --- a/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentModule.cs +++ b/libraries/MTConnect.NET-Common/Agents/IMTConnectAgentModule.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Logging; @@ -15,9 +15,9 @@ public interface IMTConnectAgentModule event MTConnectLogEventHandler LogReceived; - void StartBeforeLoad(); + void StartBeforeLoad(bool initializeDataItems); - void StartAfterLoad(); + void StartAfterLoad(bool initializeDataItems); void Stop(); } diff --git a/libraries/MTConnect.NET-Common/Agents/MTConnectAgent.cs b/libraries/MTConnect.NET-Common/Agents/MTConnectAgent.cs index 93a37bb7..bf11d330 100644 --- a/libraries/MTConnect.NET-Common/Agents/MTConnectAgent.cs +++ b/libraries/MTConnect.NET-Common/Agents/MTConnectAgent.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Agents.Metrics; @@ -790,22 +790,27 @@ protected bool UpdateCurrentCondition(string deviceUuid, IDataItem dataItem, IOb if (_currentConditions != null && observation != null && !string.IsNullOrEmpty(deviceUuid) && dataItem != null) { var observations = new List(); + var addedNew = false; + var i = 0; // Get Existing Condition Observations for DataItem var hash = $"{deviceUuid}:{dataItem.Id}"; _currentConditions.TryGetValue(hash, out var existingObservations); - if (existingObservations.IsNullOrEmpty() || !existingObservations.Any(o => o.ChangeId == observation.ChangeId)) + if (existingObservations.IsNullOrEmpty() || !existingObservations.Any(o => ObjectExtensions.ByteArraysEqual(o.ChangeId, observation.ChangeId))) { + addedNew = true; observations.Add(observation); + i++; } + // Add previous Condition Observations (if new Condition is not NORMAL or UNAVAILABLE) byte[] existingHash = null; - if (observation != null && !existingObservations.IsNullOrEmpty()) + if (!existingObservations.IsNullOrEmpty()) { - existingHash = StringFunctions.ToMD5HashBytes(existingObservations.Select(o => o.ChangeId).ToArray()); + existingHash = StringFunctions.ToMD5HashBytes(existingObservations.OrderBy(o => o.GetValue(ValueKeys.NativeCode)).Select(o => o.ChangeId).ToArray()); var conditionLevelValue = observation.GetValue(ValueKeys.Level); var conditionLevel = conditionLevelValue.ConvertEnum(); @@ -813,7 +818,6 @@ protected bool UpdateCurrentCondition(string deviceUuid, IDataItem dataItem, IOb if (!(conditionLevel == ConditionLevel.NORMAL && string.IsNullOrEmpty(nativeCode)) && conditionLevel != ConditionLevel.UNAVAILABLE) { - var i = 0; foreach (var existingObservation in existingObservations) { var existingLevel = existingObservation.GetValue(ValueKeys.Level); @@ -824,16 +828,27 @@ protected bool UpdateCurrentCondition(string deviceUuid, IDataItem dataItem, IOb observations.Insert(i, existingObservation); i++; } + else + { + if (!addedNew) + { + observations.Insert(i, existingObservation); + i++; + } + } } } } - // Compare Hashes. If different, then update current list - byte[] newHash = StringFunctions.ToMD5HashBytes(observations.Select(o => o.ChangeId).ToArray()); - if (!ObjectExtensions.ByteArraysEqual(existingHash, newHash)) + if (!observations.IsNullOrEmpty()) { - _currentConditions.TryRemove(hash, out var _); - return _currentConditions.TryAdd(hash, observations); + // Compare Hashes. If different, then update current list + byte[] newHash = StringFunctions.ToMD5HashBytes(observations.OrderBy(o => o.GetValue(ValueKeys.NativeCode)).Select(o => o.ChangeId).ToArray()); + if (!ObjectExtensions.ByteArraysEqual(existingHash, newHash)) + { + _currentConditions.TryRemove(hash, out var _); + return _currentConditions.TryAdd(hash, observations); + } } } @@ -1281,7 +1296,7 @@ private bool AddDeviceRemovedObservation(IDevice device, long timestamp = 0) /// /// Add a new MTConnectDevice to the Agent's Buffer /// - public bool AddDevice(IDevice device, bool initializeDataItems = true) + public IDevice AddDevice(IDevice device, bool initializeDataItems = true) { if (device != null) { @@ -1295,7 +1310,7 @@ public bool AddDevice(IDevice device, bool initializeDataItems = true) // Check if Device Already Exists in the Device Buffer and is changed if (existingDevice != null && obj.Hash == existingDevice.Hash) { - return true; + return existingDevice; } // Add the Device to the Buffer @@ -1332,34 +1347,37 @@ public bool AddDevice(IDevice device, bool initializeDataItems = true) } DeviceAdded?.Invoke(this, obj); - } - return success; + return obj; + } } } - return false; + return null; } /// /// Add new MTConnectDevices to the Agent's Buffer /// - public bool AddDevices(IEnumerable devices, bool initializeDataItems = true) + public IEnumerable AddDevices(IEnumerable devices, bool initializeDataItems = true) { if (!devices.IsNullOrEmpty()) { - bool success = false; + var addedDevices = new List(); + bool success; foreach (var device in devices) { - success = AddDevice(device, initializeDataItems); + var addedDevice = AddDevice(device, initializeDataItems); + success = addedDevice != null; if (!success) break; + else addedDevices.Add(addedDevice); } - return success; + return addedDevices; } - return false; + return null; } #endregion @@ -1471,42 +1489,97 @@ private string Remove3dSuffix(string s) return s; } - #endregion + #endregion - /// - /// Add a new Observation to the Agent for the specified Device and DataItem - /// - /// The (Name or Uuid) of the Device - /// The (Name, ID, or Source) of the DataItem - /// The Value of the Observation (equivalent to ValueKey = Value) - /// Used to override the default configuration for the Agent to ConvertUnits - /// Used to override the default configuration for the Agent to IgnoreCase of the Value - /// True if the Observation was added successfully - public bool AddObservation(string deviceKey, string dataItemKey, object value, bool? convertUnits = null, bool? ignoreCase = null) - { - return AddObservation(deviceKey, new ObservationInput + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(IDataItem dataItem, object value, bool? convertUnits = null, bool? ignoreCase = null) + { + if (dataItem != null && dataItem.Device != null && !string.IsNullOrEmpty(dataItem.Device.Uuid) && !string.IsNullOrEmpty(dataItem.Id)) + { + var input = new ObservationInput + { + DeviceKey = dataItem.Device.Uuid, + DataItemKey = dataItem.Id, + Values = new List { new ObservationValue(ValueKeys.Result, value) }, + Timestamp = UnixDateTime.Now + }; + + return AddObservation(input, convertUnits: convertUnits, ignoreCase: ignoreCase); + } + + return false; + } + + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device + /// The (Name, ID, or Source) of the DataItem + /// The Value of the Observation (equivalent to ValueKey = Value) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(string deviceKey, string dataItemKey, object value, bool? convertUnits = null, bool? ignoreCase = null) + { + var input = new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, Values = new List { new ObservationValue(ValueKeys.Result, value) }, Timestamp = UnixDateTime.Now - }); - } - - /// - /// Add a new Observation to the Agent for the specified Device and DataItem - /// - /// The (Name or Uuid) of the Device - /// The (Name, ID, or Source) of the DataItem - /// The Value of the Observation (equivalent to ValueKey = Value) - /// The Timestamp of the Observation in Unix Ticks (1/10,000 of a millisecond) - /// Used to override the default configuration for the Agent to ConvertUnits - /// Used to override the default configuration for the Agent to IgnoreCase of the Value - /// True if the Observation was added successfully - public bool AddObservation(string deviceKey, string dataItemKey, object value, long timestamp, bool? convertUnits = null, bool? ignoreCase = null) - { - return AddObservation(deviceKey, new ObservationInput + }; + + return AddObservation(input, convertUnits: convertUnits, ignoreCase: ignoreCase); + } + + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation in Unix Ticks (1/10,000 of a millisecond) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(IDataItem dataItem, object value, long timestamp, bool? convertUnits = null, bool? ignoreCase = null) + { + if (dataItem != null && dataItem.Device != null && !string.IsNullOrEmpty(dataItem.Device.Uuid) && !string.IsNullOrEmpty(dataItem.Id)) + { + var input = new ObservationInput + { + DeviceKey = dataItem.Device.Uuid, + DataItemKey = dataItem.Id, + Values = new List { new ObservationValue(ValueKeys.Result, value) }, + Timestamp = timestamp + }; + + return AddObservation(input, convertUnits: convertUnits, ignoreCase: ignoreCase); + } + + return false; + } + + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device + /// The (Name, ID, or Source) of the DataItem + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation in Unix Ticks (1/10,000 of a millisecond) + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(string deviceKey, string dataItemKey, object value, long timestamp, bool? convertUnits = null, bool? ignoreCase = null) + { + return AddObservation(new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, @@ -1515,19 +1588,46 @@ public bool AddObservation(string deviceKey, string dataItemKey, object value, l }); } - /// - /// Add a new Observation to the Agent for the specified Device and DataItem - /// - /// The (Name or Uuid) of the Device - /// The (Name, ID, or Source) of the DataItem - /// The Value of the Observation (equivalent to ValueKey = Value) - /// The Timestamp of the Observation - /// Used to override the default configuration for the Agent to ConvertUnits - /// Used to override the default configuration for the Agent to IgnoreCase of the Value - /// True if the Observation was added successfully - public bool AddObservation(string deviceKey, string dataItemKey, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null) - { - return AddObservation(deviceKey, new ObservationInput + /// + /// Add a new Observation to the Agent for the specified DataItem + /// + /// The DataItem to report + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(IDataItem dataItem, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null) + { + if (dataItem != null && dataItem.Device != null && !string.IsNullOrEmpty(dataItem.Device.Uuid) && !string.IsNullOrEmpty(dataItem.Id)) + { + var input = new ObservationInput + { + DeviceKey = dataItem.Device.Uuid, + DataItemKey = dataItem.Id, + Values = new List { new ObservationValue(ValueKeys.Result, value) }, + Timestamp = timestamp.ToUnixTime() + }; + + return AddObservation(input, convertUnits: convertUnits, ignoreCase: ignoreCase); + } + + return false; + } + + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device + /// The (Name, ID, or Source) of the DataItem + /// The Value of the Observation (equivalent to ValueKey = Value) + /// The Timestamp of the Observation + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(string deviceKey, string dataItemKey, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null) + { + return AddObservation(new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, @@ -1536,7 +1636,6 @@ public bool AddObservation(string deviceKey, string dataItemKey, object value, D }); } - /// /// Add a new Observation to the Agent for the specified Device and DataItem /// @@ -1549,7 +1648,7 @@ public bool AddObservation(string deviceKey, string dataItemKey, object value, D /// True if the Observation was added successfully public bool AddObservation(string deviceKey, string dataItemKey, string valueKey, object value, bool? convertUnits = null, bool? ignoreCase = null) { - return AddObservation(deviceKey, new ObservationInput + return AddObservation(new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, @@ -1571,7 +1670,7 @@ public bool AddObservation(string deviceKey, string dataItemKey, string valueKey /// True if the Observation was added successfully public bool AddObservation(string deviceKey, string dataItemKey, string valueKey, object value, long timestamp, bool? convertUnits = null, bool? ignoreCase = null) { - return AddObservation(deviceKey, new ObservationInput + return AddObservation(new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, @@ -1593,7 +1692,7 @@ public bool AddObservation(string deviceKey, string dataItemKey, string valueKey /// True if the Observation was added successfully public bool AddObservation(string deviceKey, string dataItemKey, string valueKey, object value, DateTime timestamp, bool? convertUnits = null, bool? ignoreCase = null) { - return AddObservation(deviceKey, new ObservationInput + return AddObservation(new ObservationInput { DeviceKey = deviceKey, DataItemKey = dataItemKey, @@ -1605,138 +1704,156 @@ public bool AddObservation(string deviceKey, string dataItemKey, string valueKey /// /// Add a new Observation to the Agent for the specified Device and DataItem /// - /// The (Name or Uuid) of the Device /// The Observation to add /// Used to override the default configuration for the Agent to IgnoreTimestamp /// Used to override the default configuration for the Agent to ConvertUnits /// Used to override the default configuration for the Agent to IgnoreCase of the Value /// True if the Observation was added successfully - public bool AddObservation(string deviceKey, IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null) + public bool AddObservation(IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null) { - if (observationInput != null) + if (observationInput != null && !string.IsNullOrEmpty(observationInput.DeviceKey)) { - ObservationReceived?.Invoke(this, observationInput); - - IObservationInput input = new ObservationInput(); - input.DeviceKey = deviceKey; - input.DataItemKey = observationInput.DataItemKey; - input.IsUnavailable = observationInput.IsUnavailable; - - // Convert Case (if Ignored) - if ((!ignoreCase.HasValue && _configuration.IgnoreObservationCase) || (ignoreCase.HasValue && ignoreCase.Value)) - { - input.Values = Observation.UppercaseValues(observationInput.Values); - } - else input.Values = observationInput.Values; - - // Set Timestamp - if ((!ignoreTimestamp.HasValue && _configuration.IgnoreTimestamps) || (ignoreTimestamp.HasValue && ignoreTimestamp.Value)) - { - input.Timestamp = UnixDateTime.Now; - } - else input.Timestamp = observationInput.Timestamp > 0 ? observationInput.Timestamp : UnixDateTime.Now; - - // Get Device UUID from deviceKey - var deviceUuid = GetDeviceUuid(deviceKey); - - // Get DataItem based on Observation's Key - var dataItem = GetDataItem(deviceUuid, input.DataItemKey); - if (dataItem != null) - { - // Add required properties - switch (dataItem.Representation) - { - case DataItemRepresentation.DATA_SET: if (input.IsUnavailable) input.AddValue(ValueKeys.Count, 0); break; - case DataItemRepresentation.TABLE: if (input.IsUnavailable) input.AddValue(ValueKeys.Count, 0); break; - case DataItemRepresentation.TIME_SERIES: if (input.IsUnavailable) input.AddValue(ValueKeys.SampleCount, 0); break; - } - - // Process Observation using Processers - if (ProcessObservationFunction != null) - { - input = ProcessObservationFunction(new ProcessObservation(this, dataItem, input)); - } - - var success = false; - var validationResult = new ValidationResult(true); - - if (_configuration.InputValidationLevel > InputValidationLevel.Ignore) - { - // Validate Observation Input with DataItem type - validationResult = dataItem.IsValid(MTConnectVersion, input); - if (!validationResult.IsValid) validationResult.Message = $"{dataItem.Type} : {dataItem.Id} : {validationResult.Message}"; - } - - if (validationResult.IsValid || _configuration.InputValidationLevel != InputValidationLevel.Strict) - { - // Convert Units (if needed) - if ((!convertUnits.HasValue && _configuration.ConvertUnits) || (convertUnits.HasValue && convertUnits.Value)) - { - input = ConvertObservationValue(dataItem, input); - if (input == null) return false; - } - - bool update; - - // Check if Observation Needs to be Updated - if (dataItem.Category == DataItemCategory.CONDITION) - { - update = UpdateCurrentCondition(deviceUuid, dataItem, input); - } - else - { - update = UpdateCurrentObservation(deviceUuid, dataItem, input); - } - - // Check if Observation Needs to be Updated - if (update) - { - // Call Update to Observation Buffer - HERE - success = OnAddObservation(deviceUuid, dataItem, input); - if (success) - { - if (_metrics != null) - { - if (dataItem.Type != ObservationUpdateRateDataItem.TypeId && dataItem.Type != AssetUpdateRateDataItem.TypeId) - { - // Update Agent Metrics - _metrics.UpdateObservation(deviceUuid, dataItem.Id); - } - } - - var observation = Observation.Create(dataItem); - observation.DeviceUuid = deviceUuid; - observation.DataItem = dataItem; - observation.InstanceId = _instanceId; - observation.Timestamp = input.Timestamp.ToDateTime(); - observation.AddValues(input.Values); - OnObservationAdded(observation); - } - } - else success = true; // Return true if no update needed - } - - if (!validationResult.IsValid && InvalidObservationAdded != null) - { - InvalidObservationAdded.Invoke(deviceUuid, input.DataItemKey, validationResult); - } - - return success; - } - else if (InvalidObservationAdded != null) - { - InvalidObservationAdded.Invoke(deviceUuid, input.DataItemKey, new ValidationResult(false, $"DataItemKey \"{input.DataItemKey}\" not Found in Device")); - } + return AddObservation(observationInput.DeviceKey, observationInput, ignoreTimestamp, convertUnits, ignoreCase); } return false; } - - /// - /// Add new Observations for DataItems to the Agent - /// - public bool AddObservations(string deviceKey, IEnumerable observationInputs) + /// + /// Add a new Observation to the Agent for the specified Device and DataItem + /// + /// The (Name or Uuid) of the Device. This overrides what is set in the "observationInput" parameter + /// The Observation to add + /// Used to override the default configuration for the Agent to IgnoreTimestamp + /// Used to override the default configuration for the Agent to ConvertUnits + /// Used to override the default configuration for the Agent to IgnoreCase of the Value + /// True if the Observation was added successfully + public bool AddObservation(string deviceKey, IObservationInput observationInput, bool? ignoreTimestamp = null, bool? convertUnits = null, bool? ignoreCase = null) + { + if (observationInput != null) + { + ObservationReceived?.Invoke(this, observationInput); + + IObservationInput input = new ObservationInput(); + input.DeviceKey = deviceKey; + input.DataItemKey = observationInput.DataItemKey; + input.IsUnavailable = observationInput.IsUnavailable; + + // Convert Case (if Ignored) + if ((!ignoreCase.HasValue && _configuration.IgnoreObservationCase) || (ignoreCase.HasValue && ignoreCase.Value)) + { + input.Values = Observation.UppercaseValues(observationInput.Values); + } + else input.Values = observationInput.Values; + + // Set Timestamp + if ((!ignoreTimestamp.HasValue && _configuration.IgnoreTimestamps) || (ignoreTimestamp.HasValue && ignoreTimestamp.Value)) + { + input.Timestamp = UnixDateTime.Now; + } + else input.Timestamp = observationInput.Timestamp > 0 ? observationInput.Timestamp : UnixDateTime.Now; + + // Get Device UUID from deviceKey + var deviceUuid = GetDeviceUuid(deviceKey); + + // Get DataItem based on Observation's Key + var dataItem = GetDataItem(deviceUuid, input.DataItemKey); + if (dataItem != null) + { + // Add required properties + switch (dataItem.Representation) + { + case DataItemRepresentation.DATA_SET: if (input.IsUnavailable) input.AddValue(ValueKeys.Count, 0); break; + case DataItemRepresentation.TABLE: if (input.IsUnavailable) input.AddValue(ValueKeys.Count, 0); break; + case DataItemRepresentation.TIME_SERIES: if (input.IsUnavailable) input.AddValue(ValueKeys.SampleCount, 0); break; + } + + // Process Observation using Processers + if (ProcessObservationFunction != null) + { + input = ProcessObservationFunction(new ProcessObservation(this, dataItem, input)); + } + + var success = false; + var validationResult = new ValidationResult(true); + + if (_configuration.InputValidationLevel > InputValidationLevel.Ignore) + { + // Validate Observation Input with DataItem type + validationResult = dataItem.IsValid(MTConnectVersion, input); + if (!validationResult.IsValid) validationResult.Message = $"{dataItem.Type} : {dataItem.Id} : {validationResult.Message}"; + } + + if (validationResult.IsValid || _configuration.InputValidationLevel != InputValidationLevel.Strict) + { + // Convert Units (if needed) + if ((!convertUnits.HasValue && _configuration.ConvertUnits) || (convertUnits.HasValue && convertUnits.Value)) + { + input = ConvertObservationValue(dataItem, input); + if (input == null) return false; + } + + bool update; + + // Check if Observation Needs to be Updated + if (dataItem.Category == DataItemCategory.CONDITION) + { + update = UpdateCurrentCondition(deviceUuid, dataItem, input); + } + else + { + update = UpdateCurrentObservation(deviceUuid, dataItem, input); + } + + // Check if Observation Needs to be Updated + if (update) + { + // Call Update to Observation Buffer - HERE + success = OnAddObservation(deviceUuid, dataItem, input); + if (success) + { + if (_metrics != null) + { + if (dataItem.Type != ObservationUpdateRateDataItem.TypeId && dataItem.Type != AssetUpdateRateDataItem.TypeId) + { + // Update Agent Metrics + _metrics.UpdateObservation(deviceUuid, dataItem.Id); + } + } + + var observation = Observation.Create(dataItem); + observation.DeviceUuid = deviceUuid; + observation.DataItem = dataItem; + observation.InstanceId = _instanceId; + observation.Timestamp = input.Timestamp.ToDateTime(); + observation.AddValues(input.Values); + OnObservationAdded(observation); + } + } + else success = true; // Return true if no update needed + } + + if (!validationResult.IsValid && InvalidObservationAdded != null) + { + InvalidObservationAdded.Invoke(deviceUuid, input.DataItemKey, validationResult); + } + + return success; + } + else if (InvalidObservationAdded != null) + { + InvalidObservationAdded.Invoke(deviceUuid, input.DataItemKey, new ValidationResult(false, $"DataItemKey \"{input.DataItemKey}\" not Found in Device")); + } + } + + return false; + } + + + /// + /// Add new Observations for DataItems to the Agent + /// + public bool AddObservations(IEnumerable observationInputs) { if (!observationInputs.IsNullOrEmpty()) { @@ -1744,7 +1861,7 @@ public bool AddObservations(string deviceKey, IEnumerable obs foreach (var observationInput in observationInputs) { - success = AddObservation(deviceKey, observationInput); + success = AddObservation(observationInput); if (!success) break; } @@ -1754,7 +1871,28 @@ public bool AddObservations(string deviceKey, IEnumerable obs return false; } - protected virtual bool OnAddObservation(string deviceUuid, IDataItem dataItem, IObservationInput observationInput) + /// + /// Add new Observations for DataItems to the Agent using the "deviceKey" property to override the DeviceKey set in each ObservationInput + /// + public bool AddObservations(string deviceKey, IEnumerable observationInputs) + { + if (!observationInputs.IsNullOrEmpty()) + { + bool success = false; + + foreach (var observationInput in observationInputs) + { + success = AddObservation(deviceKey, observationInput); + if (!success) break; + } + + return success; + } + + return false; + } + + protected virtual bool OnAddObservation(string deviceUuid, IDataItem dataItem, IObservationInput observationInput) { return true; } diff --git a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs index faf5c00a..14bf6be0 100644 --- a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs +++ b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentBroker.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Assets; @@ -19,7 +19,7 @@ namespace MTConnect.Agents { /// - /// Publishes MTConnect information in the form of a Response Document to client software applications. + /// Retrieve MTConnect information in the form of MTConnect Response Documents. /// public class MTConnectAgentBroker : MTConnectAgent, IMTConnectAgentBroker, IDisposable { diff --git a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModule.cs b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModule.cs index 528bd792..cfb6518c 100644 --- a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModule.cs +++ b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModule.cs @@ -1,4 +1,4 @@ -// Copyright(c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright(c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Logging; @@ -26,14 +26,14 @@ public MTConnectAgentModule(IMTConnectAgentBroker agent) } - public void StartBeforeLoad() + public void StartBeforeLoad(bool initializeDataItems) { - OnStartBeforeLoad(); + OnStartBeforeLoad(initializeDataItems); } - public void StartAfterLoad() + public void StartAfterLoad(bool initializeDataItems) { - OnStartAfterLoad(); + OnStartAfterLoad(initializeDataItems); } public void Stop() @@ -42,9 +42,9 @@ public void Stop() } - protected virtual void OnStartBeforeLoad() { } + protected virtual void OnStartBeforeLoad(bool initializeDataItems) { } - protected virtual void OnStartAfterLoad() { } + protected virtual void OnStartAfterLoad(bool initializeDataItems) { } protected virtual void OnStop() { } diff --git a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModules.cs b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModules.cs index a02815aa..58e5be32 100644 --- a/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModules.cs +++ b/libraries/MTConnect.NET-Common/Agents/MTConnectAgentModules.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Configurations; @@ -62,12 +62,31 @@ public void Load() catch { } } } + else + { + if (_configuration.IsModuleConfigured(configurationTypeId)) + { + try + { + // Create new Instance of the Controller and add to cached dictionary + var module = (IMTConnectAgentModule)Activator.CreateInstance(moduleType, new object[] { _mtconnectAgent, null }); + module.LogReceived += HandleModuleLogReceived; + + var moduleId = Guid.NewGuid().ToString(); + + if (ModuleLoaded != null) ModuleLoaded.Invoke(this, module); + + lock (_lock) _modules.Add(moduleId, module); + } + catch { } + } + } } } } } - public void StartBeforeLoad() + public void StartBeforeLoad(bool initializeDataItems) { Dictionary modules; lock (_lock) modules = _modules; @@ -75,12 +94,12 @@ public void StartBeforeLoad() { foreach (var module in modules) { - module.Value.StartBeforeLoad(); + module.Value.StartBeforeLoad(initializeDataItems); } } } - public void StartAfterLoad() + public void StartAfterLoad(bool initializeDataItems) { Dictionary modules; lock (_lock) modules = _modules; @@ -88,7 +107,7 @@ public void StartAfterLoad() { foreach (var module in modules) { - module.Value.StartAfterLoad(); + module.Value.StartAfterLoad(initializeDataItems); } } } diff --git a/libraries/MTConnect.NET-Common/Agents/MTConnectInputAgentModule.cs b/libraries/MTConnect.NET-Common/Agents/MTConnectInputAgentModule.cs new file mode 100644 index 00000000..a96454c0 --- /dev/null +++ b/libraries/MTConnect.NET-Common/Agents/MTConnectInputAgentModule.cs @@ -0,0 +1,487 @@ +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. +// TrakHound Inc. licenses this file to you under the MIT license. + +using MTConnect.Assets; +using MTConnect.Configurations; +using MTConnect.Devices; +using MTConnect.Input; +using MTConnect.Logging; +using MTConnect.Observations; +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; + +namespace MTConnect.Agents +{ + public abstract class MTConnectInputAgentModule : IMTConnectAgentModule + { + private readonly IMTConnectAgentBroker _agent; + private IDevice _device; + private CancellationTokenSource _stop; + private bool _isStarted; + + + public string Id { get; set; } + + public string Description { get; set; } + + public IDataSourceConfiguration Configuration { get; set; } + + public IMTConnectAgentBroker Agent => _agent; + + public IDevice Device => _device; + + + public event MTConnectLogEventHandler LogReceived; + + + public MTConnectInputAgentModule(IMTConnectAgentBroker agent) + { + _agent = agent; + Configuration = new DataSourceConfiguration(); + } + + + public void StartBeforeLoad(bool initializeDataItems) + { + OnStartBeforeLoad(initializeDataItems); + + _device = _agent.AddDevice(OnAddDevice()); + } + + public void StartAfterLoad(bool initializeDataItems) + { + OnStartAfterLoad(initializeDataItems); + + Start(); + } + + + protected virtual void OnStartBeforeLoad(bool initializeDataItems) { } + + protected virtual void OnStartAfterLoad(bool initializeDataItems) { } + + protected virtual void OnStop() + { + Stop(); + } + + protected virtual void OnRead() { } + + protected virtual Task OnReadAsync() { return Task.CompletedTask; } + + protected virtual IDevice OnAddDevice() { return null; } + + + public void Start() + { + if (!_isStarted) + { + _isStarted = true; + + _stop = new CancellationTokenSource(); + + _ = Task.Run(Worker, _stop.Token); + } + } + + public void Stop() + { + if (_isStarted) + { + if (_stop != null) _stop.Cancel(); + _isStarted = false; + + OnStop(); + } + } + + private async Task Worker() + { + if (Configuration != null) + { + try + { + while (!_stop.Token.IsCancellationRequested) + { + try + { + OnRead(); + await OnReadAsync(); + + await Task.Delay(Configuration.ReadInterval, _stop.Token); + } + catch (TaskCanceledException) { } + catch { } + } + } + catch { } + } + } + + + #region "Unavailable" + + public void SetUnavailable() + { + var dataItems = _device.GetDataItems(); + if (!dataItems.IsNullOrEmpty()) + { + var timestamp = UnixDateTime.Now; + + foreach (var dataItem in dataItems) + { + SetUnavailable(dataItem, timestamp); + } + } + } + + public void SetUnavailable(IDataItem dataItem) + { + var timestamp = UnixDateTime.Now; + SetUnavailable(dataItem, timestamp); + } + + public void SetUnavailable(IDataItem dataItem, DateTime timestamp) + { + SetUnavailable(dataItem, timestamp.ToUnixTime()); + } + + public void SetUnavailable(IDataItem dataItem, long timestamp) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(); + observation.DeviceKey = _device.Uuid; + observation.DataItemKey = dataItem.Id; + observation.Timestamp = timestamp; + + if (dataItem.Category == DataItemCategory.CONDITION) + { + observation.AddValue(ValueKeys.Level, ConditionLevel.UNAVAILABLE); + } + else + { + observation.AddValue(ValueKeys.Result, Observation.Unavailable); + } + + AddObservation(observation); + } + } + + #endregion + + #region "Value Observations" + + public void AddValueObservation(IDataItem dataItem, object resultValue) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue); + AddObservation(observation); + } + } + + public void AddValueObservation(IDataItem dataItem, object resultValue, long? timestamp = null) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue, timestamp.Value); + AddObservation(observation); + } + } + + public void AddValueObservation(IDataItem dataItem, object resultValue, DateTime? timestamp = null) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue, timestamp.Value); + AddObservation(observation); + } + } + + public void AddValueObservation(string dataItemKey, object resultValue) + { + var observation = new ObservationInput(dataItemKey, resultValue); + AddObservation(observation); + } + + public void AddValueObservation(string dataItemKey, object resultValue, long? timestamp = null) + { + var observation = new ObservationInput(dataItemKey, resultValue, timestamp.Value); + AddObservation(observation); + } + + public void AddValueObservation(string dataItemKey, object resultValue, DateTime? timestamp = null) + { + var observation = new ObservationInput(dataItemKey, resultValue, timestamp.Value); + AddObservation(observation); + } + + public void AddValueObservation(object result, string subType = null) where TDataItem : IDataItem + { + if (Agent != null && Device != null) + { + Agent.AddObservation(Device.GetDataItem(subType), result); + } + } + + public void AddValueObservation(object result, string componentName = null, string subType = null) + where TComponent : IComponent + where TDataItem : IDataItem + { + if (Agent != null && Device != null) + { + Agent.AddObservation(Device.GetComponent(componentName)?.GetDataItem(subType), result); + } + } + + public void AddValueObservation(object result, string componentName = null, string subType = null) + where TComponent : IComponent + where TComposition : IComposition + where TDataItem : IDataItem + { + if (Agent != null && Device != null) + { + Agent.AddObservation(Device.GetComponent(componentName)?.GetComposition()?.GetDataItem(subType), result); + } + } + + #endregion + + #region "Condition Observations" + + public void AddConditionObservation( + ConditionLevel level, + string nativeCode = null, + string message = null, + string nativeSeverity = null, + ConditionQualifier qualifier = ConditionQualifier.NOT_SPECIFIED, + string subType = null + ) + where TDataItem : IDataItem + { + if (Agent != null && Device != null) + { + var dataItem = Device.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new ConditionFaultStateObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Level = level; + observationInput.NativeCode = nativeCode; + observationInput.Message = message; + observationInput.NativeSeverity = nativeSeverity; + observationInput.Qualifier = qualifier; + + Agent.AddObservation(observationInput); + } + } + } + + public void AddConditionObservation( + ConditionLevel level, + string nativeCode = null, + string message = null, + string nativeSeverity = null, + ConditionQualifier qualifier = ConditionQualifier.NOT_SPECIFIED, + string componentName = null, + string subType = null + ) + where TComponent : IComponent + where TDataItem : IDataItem + { + if (Agent != null && Device != null) + { + var dataItem = Device.GetComponent(componentName)?.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new ConditionFaultStateObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Level = level; + observationInput.NativeCode = nativeCode; + observationInput.Message = message; + observationInput.NativeSeverity = nativeSeverity; + observationInput.Qualifier = qualifier; + + Agent.AddObservation(observationInput); + } + } + } + + #endregion + + #region "DataSet Observations" + + public void AddDataSetObservation( + IEnumerable entries, + string subType = null + ) + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !entries.IsNullOrEmpty()) + { + var dataItem = Device.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new DataSetObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Entries = entries; + + Agent.AddObservation(observationInput); + } + } + } + + public void AddDataSetObservation( + IEnumerable entries, + string componentName = null, + string subType = null + ) + where TComponent : IComponent + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !entries.IsNullOrEmpty()) + { + var dataItem = Device.GetComponent(componentName)?.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new DataSetObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Entries = entries; + + Agent.AddObservation(observationInput); + } + } + } + + #endregion + + #region "Table Observations" + + public void AddTableObservation( + IEnumerable entries, + string subType = null + ) + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !entries.IsNullOrEmpty()) + { + var dataItem = Device.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new TableObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Entries = entries; + + Agent.AddObservation(observationInput); + } + } + } + + public void AddTableObservation( + IEnumerable entries, + string componentName = null, + string subType = null + ) + where TComponent : IComponent + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !entries.IsNullOrEmpty()) + { + var dataItem = Device.GetComponent(componentName)?.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new TableObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Entries = entries; + + Agent.AddObservation(observationInput); + } + } + } + + #endregion + + #region "TimeSeries Observations" + + public void AddTimeSeriesObservation( + IEnumerable samples, + string subType = null + ) + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !samples.IsNullOrEmpty()) + { + var dataItem = Device.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new TimeSeriesObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Samples = samples; + + Agent.AddObservation(observationInput); + } + } + } + + public void AddTimeSeriesObservation( + IEnumerable samples, + string componentName = null, + string subType = null + ) + where TComponent : IComponent + where TDataItem : IDataItem + { + if (Agent != null && Device != null && !samples.IsNullOrEmpty()) + { + var dataItem = Device.GetComponent(componentName)?.GetDataItem(subType); + if (dataItem != null) + { + var observationInput = new TimeSeriesObservationInput(); + observationInput.DeviceKey = Device.Uuid; + observationInput.DataItemKey = dataItem.Id; + observationInput.Samples = samples; + + Agent.AddObservation(observationInput); + } + } + } + + #endregion + + + public void AddObservation(IObservationInput observation) + { + Agent.AddObservation(observation); + } + + + public void AddAsset(IAsset asset) + { + if (asset != null) + { + AddAsset(new AssetInput(asset)); + } + } + + public void AddAsset(IAssetInput asset) + { + Agent.AddAsset(asset.DeviceKey, asset.Asset); + } + + + protected void Log(MTConnectLogLevel logLevel, string message) + { + if (LogReceived != null) LogReceived.Invoke(this, logLevel, message); + } + } +} diff --git a/libraries/MTConnect.NET-Common/Assets/Asset.g.cs b/libraries/MTConnect.NET-Common/Assets/Asset.g.cs index f7b690b3..27b53509 100644 --- a/libraries/MTConnect.NET-Common/Assets/Asset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Asset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_C7D39183_23CB_416b_A62D_F60815E08B1A diff --git a/libraries/MTConnect.NET-Common/Assets/AssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/AssetDescriptions.g.cs index a7f32972..f874ab56 100644 --- a/libraries/MTConnect.NET-Common/Assets/AssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/AssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAsset.g.cs index ecf42651..6ac5cbef 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1678197202508_829668_17803 diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAssetDescriptions.g.cs index 518c90ba..b7eaec7d 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ComponentConfigurationParametersAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IComponentConfigurationParametersAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IComponentConfigurationParametersAsset.g.cs index 248fc24a..dd48901c 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IComponentConfigurationParametersAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IComponentConfigurationParametersAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameter.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameter.g.cs index 6a09402d..c7e4b9e1 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameter.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameter.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameterSet.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameterSet.g.cs index cf9f752a..4091de79 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameterSet.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameterSet.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/Parameter.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/Parameter.g.cs index 1e95895a..fc29fbb2 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/Parameter.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/Parameter.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1678197371649_500788_17992 diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterDescriptions.g.cs index c11688d4..acabf01a 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSet.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSet.g.cs index 02088e9b..343027b3 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSet.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSet.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1678197254209_96040_17915 diff --git a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSetDescriptions.g.cs index e3d407eb..b905e16f 100644 --- a/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.ComponentConfigurationParameters diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionType.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionType.g.cs index 9772dda3..7792eb98 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionTypeDescriptions.g.cs index 56346748..46209664 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CountDirectionTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusType.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusType.g.cs index 8a52ef4e..73972bb4 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusTypeDescriptions.g.cs index 31145849..a79f1c23 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CutterStatusTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItem.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItem.g.cs index 4b1c941f..d944e0a1 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItem.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_99183806_F570_4387_BA6D_34929C20F954 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItemDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItemDescriptions.g.cs index ed6157a5..e4bacc24 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItemDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItemDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAsset.g.cs index 6d970dd6..05b86998 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_8D60D3F8_AB1A_490b_923B_B978248EF331 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAssetDescriptions.g.cs index f5e1733a..7712f320 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReference.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReference.g.cs index ac771077..d9c307d7 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReference.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_D4CAAB4A_DE00_489d_ACCA_F00FC7296F0C diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReferenceDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReferenceDescriptions.g.cs index f4cf55c6..7849ac94 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReferenceDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeReferenceDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAsset.g.cs index 13821f35..c5f3f048 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_614061EF_1D50_4989_A935_02492044833A diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAssetDescriptions.g.cs index 252001c8..c9ec2bbe 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinition.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinition.g.cs index 8521e85e..7f2b8026 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_37B8CFD0_D728_4841_9A07_B6CF819EC895 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinitionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinitionDescriptions.g.cs index ad5e8192..5b791cb9 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinitionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolDefinitionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycle.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycle.g.cs index e5f6818b..ab84d6db 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycle.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycle.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_D1C82EBD_D828_4e5f_9F46_3337710837FE diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycleDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycleDescriptions.g.cs index 7656e211..20b44749 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycleDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycleDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatType.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatType.g.cs index 1d1562a4..e061aa3e 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatTypeDescriptions.g.cs index 7b00f5f0..92bc4cea 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/FormatTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingItem.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingItem.g.cs index def6f5f7..f07036e9 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingItem.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeAsset.g.cs index b5ce4833..b1e2d480 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeReference.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeReference.g.cs index f59a5ae2..d47ef715 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeReference.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolArchetypeReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolAsset.g.cs index a0f9fed6..98788edd 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolDefinition.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolDefinition.g.cs index dbc1b66c..7941674c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolLifeCycle.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolLifeCycle.g.cs index 4c195e3b..2035a554 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolLifeCycle.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingToolLifeCycle.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IItemLife.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IItemLife.g.cs index dfff831d..76e5dc4c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IItemLife.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IItemLife.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ILocation.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ILocation.g.cs index 2c10046a..cf1b779f 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ILocation.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ILocation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IMeasurement.g.cs index 4368ef16..79b1150c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessFeedRate.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessFeedRate.g.cs index 0e9a621f..1da19b86 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessFeedRate.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessFeedRate.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessSpindleSpeed.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessSpindleSpeed.g.cs index e4898954..b64ac309 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessSpindleSpeed.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IProcessSpindleSpeed.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IReconditionCount.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IReconditionCount.g.cs index b538fe57..cd0b9188 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IReconditionCount.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IReconditionCount.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IToolLife.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IToolLife.g.cs index 56c93d81..438adcb6 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/IToolLife.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/IToolLife.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLife.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLife.g.cs index 880deb28..796d4110 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLife.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLife.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_CC4F8633_BAAC_47e8_9EFB_2BFC62215FC8 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLifeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLifeDescriptions.g.cs index 492a939c..71d53d6a 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLifeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ItemLifeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Location.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Location.g.cs index 05867792..db077f7f 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Location.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Location.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_A012A42B_DBEC_4334_891D_5B45D7A7E340 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationDescriptions.g.cs index 41d90c7d..29ae2cd5 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationType.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationType.g.cs index f4c47844..6e20b2ce 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationTypeDescriptions.g.cs index e37f7a72..5a083554 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/LocationTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.g.cs index e4734910..36afc463 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_C09F377D_8946_421b_B746_E23C01D97EAC diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/MeasurementDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/MeasurementDescriptions.g.cs index 6846a6f7..628dcd9a 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/MeasurementDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/MeasurementDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyDiameterMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyDiameterMaxMeasurement.g.cs index 1de73d28..2aea4a32 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyDiameterMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyDiameterMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyLengthMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyLengthMaxMeasurement.g.cs index 4cace424..03dc2875 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyLengthMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyLengthMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferFlatLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferFlatLengthMeasurement.g.cs index 7ec585f9..568ab0b8 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferFlatLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferFlatLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferWidthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferWidthMeasurement.g.cs index 6b9b0d99..e289e3da 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferWidthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ChamferWidthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CornerRadiusMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CornerRadiusMeasurement.g.cs index df5431e9..d9582998 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CornerRadiusMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CornerRadiusMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMaxMeasurement.g.cs index 42243d5c..bc7e34bc 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMeasurement.g.cs index 1a43e294..d61f9bd8 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingDiameterMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingEdgeLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingEdgeLengthMeasurement.g.cs index 7d0108a3..64b9d0f1 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingEdgeLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingEdgeLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingHeightMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingHeightMeasurement.g.cs index c3789a82..e434f23c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingHeightMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingHeightMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingReferencePointMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingReferencePointMeasurement.g.cs index 600fc0f7..20086ea0 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingReferencePointMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/CuttingReferencePointMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DepthOfCutMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DepthOfCutMaxMeasurement.g.cs index 7a38579b..9364f1ff 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DepthOfCutMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DepthOfCutMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DriveAngleMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DriveAngleMeasurement.g.cs index ff808cc5..3769165e 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DriveAngleMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/DriveAngleMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMaxMeasurement.g.cs index b8610116..9e9f8002 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMeasurement.g.cs index dd9e426e..979d5f9e 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FlangeDiameterMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalLengthMeasurement.g.cs index f6e019fd..7b99dcef 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalWidthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalWidthMeasurement.g.cs index 7c3b4f24..4ad870a2 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalWidthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/FunctionalWidthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/IncribedCircleDiameterMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/IncribedCircleDiameterMeasurement.g.cs index 9d491026..a1c7ebca 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/IncribedCircleDiameterMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/IncribedCircleDiameterMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/InsertWidthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/InsertWidthMeasurement.g.cs index 48d69b06..b933efeb 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/InsertWidthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/InsertWidthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCode.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCode.g.cs index 92594162..30bd9d76 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCode.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCodeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCodeDescriptions.g.cs index ee2687ff..c62ed660 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCodeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/MeasurementCodeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/OverallToolLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/OverallToolLengthMeasurement.g.cs index ee232bee..c84c3038 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/OverallToolLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/OverallToolLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/PointAngleMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/PointAngleMeasurement.g.cs index c6e743a7..ad7b8912 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/PointAngleMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/PointAngleMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ProtrudingLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ProtrudingLengthMeasurement.g.cs index 4c95cfc6..80731994 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ProtrudingLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ProtrudingLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankDiameterMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankDiameterMeasurement.g.cs index 4fabc71d..d29cd2b2 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankDiameterMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankDiameterMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankHeightMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankHeightMeasurement.g.cs index 1bdde17e..7284ce6f 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankHeightMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankHeightMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankLengthMeasurement.g.cs index 065be5b6..2e32b46c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ShankLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepDiameterLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepDiameterLengthMeasurement.g.cs index 653f3eb8..221f1213 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepDiameterLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepDiameterLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepIncludedAngleMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepIncludedAngleMeasurement.g.cs index 82106dd3..ad9e04b6 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepIncludedAngleMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/StepIncludedAngleMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolCuttingEdgeAngleMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolCuttingEdgeAngleMeasurement.g.cs index f961c243..c3fc3c0c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolCuttingEdgeAngleMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolCuttingEdgeAngleMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolLeadAngleMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolLeadAngleMeasurement.g.cs index 456f2879..b8da646c 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolLeadAngleMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolLeadAngleMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolOrientationMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolOrientationMeasurement.g.cs index d0552e20..65165c19 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolOrientationMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/ToolOrientationMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/UsableLengthMaxMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/UsableLengthMaxMeasurement.g.cs index 1107c43b..4e39ab96 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/UsableLengthMaxMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/UsableLengthMaxMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WeightMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WeightMeasurement.g.cs index f51fd4ad..7416059a 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WeightMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WeightMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WiperEdgeLengthMeasurement.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WiperEdgeLengthMeasurement.g.cs index be193907..796dc1c8 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WiperEdgeLengthMeasurement.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/WiperEdgeLengthMeasurement.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools.Measurements diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRate.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRate.g.cs index b3ce26b4..966b33b2 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRate.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRate.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_07E81F95_CE0D_4404_9384_30E428006C48 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRateDescriptions.g.cs index ae68ae20..588d81fb 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessFeedRateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeed.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeed.g.cs index 50024293..6ecc1706 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeed.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeed.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_3B2E47CE_BBF6_4b7a_A0C6_146B2BE8331A diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeedDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeedDescriptions.g.cs index ac84ce59..35734d27 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeedDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ProcessSpindleSpeedDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCount.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCount.g.cs index 73694a81..0ff7183b 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCount.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCount.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_AB33F1B2_493B_4f60_9394_4A69B30576F9 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCountDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCountDescriptions.g.cs index 2c3bf94b..0326e07b 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCountDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ReconditionCountDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLife.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLife.g.cs index 03ddc53c..ffcbd214 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLife.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLife.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_37DECE45_091E_4f0c_AD72_EB481C0C1919 diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeDescriptions.g.cs index bf0d0264..dd6ccdb9 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeType.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeType.g.cs index c26a7882..1ba5efce 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeTypeDescriptions.g.cs index 685ff75b..c7b4c644 100644 --- a/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/CuttingTools/ToolLifeTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.CuttingTools diff --git a/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAsset.g.cs index 6447cee6..6fb0327c 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1589825445428_505818_673 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAssetDescriptions.g.cs index c10af58d..50175a04 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/AbstractFileAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategory.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategory.g.cs index 28850a72..b211f7e5 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategory.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategory.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategoryDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategoryDescriptions.g.cs index 12c2639b..09ae18aa 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategoryDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationCategoryDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationType.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationType.g.cs index eafd0ba9..40f16a65 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationTypeDescriptions.g.cs index f2feb952..c64206b0 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/ApplicationTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/ApplicationTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/Destination.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/Destination.g.cs index 16befd7e..03059c80 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/Destination.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/Destination.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605277188545_673734_476 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/DestinationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/DestinationDescriptions.g.cs index 915298cf..219be16a 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/DestinationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/DestinationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAsset.g.cs index f3d31d1d..8a9098c5 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1589825369611_93186_622 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAssetDescriptions.g.cs index 2ff5a2d4..1236ca67 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileArchetypeAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileAsset.g.cs index 7ab9555b..338057a7 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1589825359572_789274_577 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileAssetDescriptions.g.cs index 86d4c029..fcb9857b 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileComment.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileComment.g.cs index 7399a20a..2905e826 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileComment.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileComment.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605276197212_1938_196 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileCommentDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileCommentDescriptions.g.cs index aa65a5df..436ddbc8 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileCommentDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileCommentDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileLocation.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileLocation.g.cs index b769ca8b..682bd8e7 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileLocation.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileLocation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605277122154_664309_406 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileLocationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileLocationDescriptions.g.cs index 53d13bb2..cf3f72e8 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileLocationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileLocationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileProperty.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileProperty.g.cs index 02f39ca4..6cdc8960 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileProperty.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileProperty.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1589825710107_976904_827 diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FilePropertyDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FilePropertyDescriptions.g.cs index 3ed64e86..e26c732e 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FilePropertyDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FilePropertyDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileState.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileState.g.cs index fe0b3fc3..295cf998 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileState.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/FileStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/FileStateDescriptions.g.cs index 51d95007..01cc0d0c 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/FileStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/FileStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IAbstractFileAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IAbstractFileAsset.g.cs index f31bdeee..b1b4c997 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IAbstractFileAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IAbstractFileAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IDestination.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IDestination.g.cs index 5e1f66ea..f760a170 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IDestination.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IDestination.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IFileArchetypeAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IFileArchetypeAsset.g.cs index 7785cc64..18f11497 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IFileArchetypeAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IFileArchetypeAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IFileAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IFileAsset.g.cs index 7d1f4738..df787498 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IFileAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IFileAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IFileComment.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IFileComment.g.cs index 20433287..8ffffef9 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IFileComment.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IFileComment.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IFileLocation.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IFileLocation.g.cs index 553167f5..90a0509a 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IFileLocation.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IFileLocation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/Files/IFileProperty.g.cs b/libraries/MTConnect.NET-Common/Assets/Files/IFileProperty.g.cs index 820161a1..5fee38a6 100644 --- a/libraries/MTConnect.NET-Common/Assets/Files/IFileProperty.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/Files/IFileProperty.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.Files diff --git a/libraries/MTConnect.NET-Common/Assets/IAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/IAsset.g.cs index e37a514a..e107a64d 100644 --- a/libraries/MTConnect.NET-Common/Assets/IAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/IAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocument.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocument.g.cs index a067bce7..1817b7dc 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocument.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocument.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocumentWrapperAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocumentWrapperAsset.g.cs index 19c4e9cb..bcbe1c76 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocumentWrapperAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/IQIFDocumentWrapperAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocument.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocument.g.cs index 6c83f177..f8648142 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocument.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocument.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1622119794339_346750_1858 diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentDescriptions.g.cs index e9aa491a..4d9f5daa 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentType.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentType.g.cs index c3864153..41e4bbad 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentType.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentTypeDescriptions.g.cs index 4db3a5b2..cfb3bcf5 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAsset.g.cs index 14d962e6..1681692b 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1622119541205_751450_1761 diff --git a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAssetDescriptions.g.cs index fab4ffec..2b35c922 100644 --- a/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/QIF/QIFDocumentWrapperAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.QIF diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/Form.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/Form.g.cs index 869c34ac..954049d6 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/Form.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/Form.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/FormDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/FormDescriptions.g.cs index 4cdcf581..b5f63adf 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/FormDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/FormDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/IMaterial.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/IMaterial.g.cs index 585a311d..2b2f304a 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/IMaterial.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/IMaterial.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/IRawMaterialAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/IRawMaterialAsset.g.cs index 9607b2f3..f10d9ec5 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/IRawMaterialAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/IRawMaterialAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/Material.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/Material.g.cs index 83b0d681..76bd4989 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/Material.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/Material.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1618831557881_852871_420 diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/MaterialDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/MaterialDescriptions.g.cs index effe8121..a1ffe2c4 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/MaterialDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/MaterialDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAsset.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAsset.g.cs index 4cab5684..7e1ca3a4 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAsset.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAsset.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1618829902716_470188_214 diff --git a/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAssetDescriptions.g.cs b/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAssetDescriptions.g.cs index 60484aaf..26d2458b 100644 --- a/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAssetDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Assets/RawMaterials/RawMaterialAssetDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Assets.RawMaterials diff --git a/libraries/MTConnect.NET-Common/Configurations/AgentApplicationConfiguration.cs b/libraries/MTConnect.NET-Common/Configurations/AgentApplicationConfiguration.cs index 26aadfd8..3f554039 100644 --- a/libraries/MTConnect.NET-Common/Configurations/AgentApplicationConfiguration.cs +++ b/libraries/MTConnect.NET-Common/Configurations/AgentApplicationConfiguration.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. +using MTConnect.Devices.Configurations; using System.Collections.Generic; using System.Text.Json.Serialization; using YamlDotNet.Serialization; @@ -178,9 +179,27 @@ public IEnumerable GetModules(string key) return null; } + public bool IsModuleConfigured(string key) + { + if (!string.IsNullOrEmpty(key) && !Modules.IsNullOrEmpty()) + { + foreach (var configurationObj in Modules) + { + try + { + var rootDictionary = (Dictionary)configurationObj; + if (rootDictionary.ContainsKey(key)) return true; + } + catch { } + } + } + return false; + } - public Dictionary GetProcessors() + + + public Dictionary GetProcessors() { if (!Processors.IsNullOrEmpty()) { diff --git a/libraries/MTConnect.NET-Common/Configurations/DataSourceConfiguration.cs b/libraries/MTConnect.NET-Common/Configurations/DataSourceConfiguration.cs index fed4e0b8..ec7ca00f 100644 --- a/libraries/MTConnect.NET-Common/Configurations/DataSourceConfiguration.cs +++ b/libraries/MTConnect.NET-Common/Configurations/DataSourceConfiguration.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using System.Text.Json.Serialization; diff --git a/libraries/MTConnect.NET-Common/Configurations/IAgentApplicationConfiguration.cs b/libraries/MTConnect.NET-Common/Configurations/IAgentApplicationConfiguration.cs index e602902e..bcfe2721 100644 --- a/libraries/MTConnect.NET-Common/Configurations/IAgentApplicationConfiguration.cs +++ b/libraries/MTConnect.NET-Common/Configurations/IAgentApplicationConfiguration.cs @@ -61,8 +61,10 @@ public interface IAgentApplicationConfiguration : IAgentConfiguration IEnumerable GetModules(string key); + bool IsModuleConfigured(string key); - Dictionary GetProcessors(); + + Dictionary GetProcessors(); IEnumerable GetProcessors(string key); diff --git a/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationship.g.cs index 0e215067..5d49054f 100644 --- a/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1658942187874_859516_1061 diff --git a/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationshipDescriptions.g.cs index 41d84225..e77f5b25 100644 --- a/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/AbstractDataItemRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Agent.cs b/libraries/MTConnect.NET-Common/Devices/Agent.cs index f1a607c2..aa21986b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Agent.cs +++ b/libraries/MTConnect.NET-Common/Devices/Agent.cs @@ -172,6 +172,8 @@ public void AddAdapterComponent(IComponent component) // Update MTConnectAgent cache _agent.UpdateAgentDevice(); + + _agent.InitializeDataItems(this); } } } diff --git a/libraries/MTConnect.NET-Common/Devices/CellDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/CellDefinition.g.cs index 9573cbf2..78ead839 100644 --- a/libraries/MTConnect.NET-Common/Devices/CellDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/CellDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1581433195808_917937_222 diff --git a/libraries/MTConnect.NET-Common/Devices/CellDefinitionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/CellDefinitionDescriptions.g.cs index c54e963c..d4e86c2a 100644 --- a/libraries/MTConnect.NET-Common/Devices/CellDefinitionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/CellDefinitionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Component.cs b/libraries/MTConnect.NET-Common/Devices/Component.cs index b6619448..38484b45 100644 --- a/libraries/MTConnect.NET-Common/Devices/Component.cs +++ b/libraries/MTConnect.NET-Common/Devices/Component.cs @@ -1,9 +1,6 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. -using MTConnect.Devices.Configurations; -using MTConnect.Devices.DataItems; -using MTConnect.Devices.References; using MTConnect.Extensions; using System; using System.Collections.Generic; @@ -14,6 +11,14 @@ namespace MTConnect.Devices { public partial class Component : IComponent { + internal const string _defaultComponentIdFormat = "{parent.id}_{component.name}"; + internal const string _defaultCompositionIdFormat = "{parent.id}_{composition.type}"; + internal const string _defaultDataItemIdFormat = "{component.id}_{dataitem.name}{?:_{dataitem.sub_type}}"; + + private const string _idFormatPattern = @"\{([^\{\.]+)\.([^\{\.]+)\}|\{\?\:(.*)\{([^\{\.]+)\.([^\{\.]+)\}(.*)\}"; + private static readonly Regex _idFormatRegex = new Regex(_idFormatPattern, RegexOptions.Compiled); + + private static readonly Version DefaultMaximumVersion = null; private static readonly Version DefaultMinimumVersion = MTConnectVersions.Version10; private static readonly Dictionary _typeIds = new Dictionary(); @@ -22,6 +27,16 @@ public partial class Component : IComponent private static Dictionary _types; private static Dictionary _typeDescriptions; + private struct IdFormatConfiguration + { + public string Pattern { get; set; } + public string Prefix { get; set; } + public string Suffix { get; set; } + public string Object { get; set; } + public string Property { get; set; } + public bool IsOptional { get; set; } + } + public MTConnectEntityType EntityType => MTConnectEntityType.Component; @@ -97,12 +112,22 @@ public string Hash public virtual Version MinimumVersion => DefaultMinimumVersion; + public string ComponentIdFormat { get; set; } + + public string CompositionIdFormat { get; set; } + + public string DataItemIdFormat { get; set; } + + public Component() { - Id = StringFunctions.RandomString(10); Components = new List(); Compositions = new List(); DataItems = new List(); + + ComponentIdFormat = _defaultComponentIdFormat; + CompositionIdFormat = _defaultCompositionIdFormat; + DataItemIdFormat = _defaultDataItemIdFormat; } @@ -233,7 +258,7 @@ public IEnumerable GetComponents() return !l.IsNullOrEmpty() ? l : null; } - private IEnumerable GetComponents(IComponent component) + private IEnumerable GetComponents(IComponent component) { var l = new List(); @@ -251,6 +276,102 @@ private IEnumerable GetComponents(IComponent component) return !l.IsNullOrEmpty() ? l : null; } + /// + /// Return the first Component matching the Type + /// + public IComponent GetComponent(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Components; break; + case SearchType.AnyLevel: components = GetComponents(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.FirstOrDefault(o => o.Type == type && o.Name == name); + } + else + { + return components.FirstOrDefault(o => o.Type == type); + } + } + } + + return null; + } + + /// + /// Return the first Component matching the Type + /// + public IComponent GetComponent(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent + { + var typeIdField = typeof(TComponent).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComponent(typeId, name, searchType); + } + } + + return null; + } + + /// + /// Return All Components matching the Type + /// + public IEnumerable GetComponents(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Components; break; + case SearchType.AnyLevel: components = GetComponents(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.Where(o => o.Type == type && o.Name == name); + } + else + { + return components.Where(o => o.Type == type); + } + } + } + + return null; + } + + /// + /// Return All Components matching the Type + /// + public IEnumerable GetComponents(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent + { + var typeIdField = typeof(TComponent).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComponents(typeId, name, searchType); + } + } + + return null; + } + /// /// Add a Component to the Component @@ -260,6 +381,14 @@ public void AddComponent(IComponent component) { if (component != null) { + component.Parent = this; + + // Set ID + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(component.Id)) + { + ResetIds(component); + } + var components = new List(); if (!Components.IsNullOrEmpty()) @@ -280,16 +409,11 @@ public void AddComponents(IEnumerable components) { if (!components.IsNullOrEmpty()) { - var newComponents = new List(); - - if (!Components.IsNullOrEmpty()) - { - newComponents.AddRange(Components); - } - - newComponents.AddRange(components); - Components = newComponents; - } + foreach (var component in components) + { + AddComponent(component); + } + } } @@ -343,83 +467,215 @@ public IEnumerable GetCompositions() { var l = new List(); - var components = GetComponents(); - if (!components.IsNullOrEmpty()) + if (!Compositions.IsNullOrEmpty()) { - foreach (var component in components) + foreach (var composition in Compositions) { - if (!component.Compositions.IsNullOrEmpty()) + l.Add(composition); + } + } + + if (!Components.IsNullOrEmpty()) + { + foreach (var subComponent in Components) + { + var components = GetCompositions(subComponent); + if (!components.IsNullOrEmpty()) l.AddRange(components); + } + } + return !l.IsNullOrEmpty() ? l : null; + } + + private IEnumerable GetCompositions(IComponent component) + { + var l = new List(); + + if (!component.Compositions.IsNullOrEmpty()) + { + foreach (var composition in component.Compositions) + { + l.Add(composition); + } + } + + if (!component.Components.IsNullOrEmpty()) + { + foreach (var subComponent in component.Components) + { + var compositions = GetCompositions(subComponent); + if (!compositions.IsNullOrEmpty()) l.AddRange(compositions); + } + } + + return !l.IsNullOrEmpty() ? l : null; + } + + /// + /// Return the first Composition matching the Type + /// + public IComposition GetComposition(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Compositions; break; + case SearchType.AnyLevel: components = GetCompositions(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.FirstOrDefault(o => o.Type == type && o.Name == name); + } + else { - l.AddRange(component.Compositions); + return components.FirstOrDefault(o => o.Type == type); } } } - return !l.IsNullOrEmpty() ? l : null; + return null; } + /// + /// Return the first Composition matching the Type + /// + public IComposition GetComposition(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition + { + var typeIdField = typeof(TComposition).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComposition(typeId, name, searchType); + } + } + + return null; + } + + /// + /// Return All Compositions matching the Type + /// + public IEnumerable GetCompositions(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Compositions; break; + case SearchType.AnyLevel: components = GetCompositions(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.Where(o => o.Type == type && o.Name == name); + } + else + { + return components.Where(o => o.Type == type); + } + } + } + + return null; + } /// - /// Add a Composition to the Component + /// Return All Compositions matching the Type + /// + public IEnumerable GetCompositions(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition + { + var typeIdField = typeof(TComposition).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetCompositions(typeId, name, searchType); + } + } + + return null; + } + + + /// + /// Add a Composition to the Composition /// /// The Composition to add public void AddComposition(IComposition composition) { if (composition != null) { - var compositions = new List(); + composition.Parent = this; + + // Set ID + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(composition.Id)) + { + ResetIds(composition); + } + + var components = new List(); if (!Compositions.IsNullOrEmpty()) { - compositions.AddRange(Compositions); + components.AddRange(Compositions); } - compositions.Add(composition); - Compositions = compositions; + components.Add(composition); + Compositions = components; } } /// - /// Add Compositions to the Component + /// Add Compositions to the Composition /// /// The Compositions to add public void AddCompositions(IEnumerable compositions) { if (!compositions.IsNullOrEmpty()) { - var newCompositions = new List(); - - if (!Compositions.IsNullOrEmpty()) + foreach (var component in compositions) { - newCompositions.AddRange(Compositions); + AddComposition(component); } - - newCompositions.AddRange(compositions); - Compositions = newCompositions; } } /// - /// Remove a Composition from the Component + /// Remove a Composition from the Composition /// /// The ID of the Composition to remove public void RemoveComposition(string compositionId) { - var components = GetComponents(); - if (!components.IsNullOrEmpty()) + if (!Compositions.IsNullOrEmpty()) { - foreach (var component in components) - { - if (!component.Compositions.IsNullOrEmpty()) - { - var compositions = new List(); - compositions.AddRange(component.Compositions); - compositions.RemoveAll(o => o.Id == compositionId); - ((Component)component).AddCompositions(compositions); - //component.Compositions = compositions; - } - } + var compositions = new List(); + compositions.AddRange(Compositions); + compositions.RemoveAll(o => o.Id == compositionId); + + Compositions = compositions; + } + } + + private void RemoveComposition(IComponent component, string compositionId) + { + if (component != null && !component.Compositions.IsNullOrEmpty()) + { + var compositions = new List(); + compositions.AddRange(component.Compositions); + compositions.RemoveAll(o => o.Id == compositionId); + + ((Component)component).AddCompositions(compositions); } } @@ -519,6 +775,134 @@ public IDataItem GetDataItemByKey(string dataItemKey) return null; } + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItemByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type and SubType + /// + public IDataItem GetDataItemByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItem(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemByType(typeId, subType, searchType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type + /// + public IEnumerable GetDataItemsByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItemsByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItems(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemsByType(typeId, subType, searchType); + } + } + + return null; + } + /// /// Add a DataItem to the Component @@ -528,6 +912,10 @@ public void AddDataItem(IDataItem dataItem) { if (dataItem != null) { + ((DataItem)dataItem).Container = this; + + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(dataItem.Id)) ResetId(this, dataItem); + var dataItems = new List(); if (!DataItems.IsNullOrEmpty()) @@ -540,6 +928,60 @@ public void AddDataItem(IDataItem dataItem) } } + /// + /// Add a DataItem to the Component + /// + public void AddDataItem() where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + AddDataItem(dataItem); + } + catch { } + } + } + + /// + /// Add a DataItem to the Component + /// + public void AddDataItem(string name, object subType = null) where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + dataItem.Name = name; + dataItem.SubType = subType?.ToString(); + AddDataItem(dataItem); + } + catch { } + } + } + + /// + /// Add a DataItem to the Component + /// + public void AddDataItem(object subType) where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + dataItem.SubType = subType?.ToString(); + AddDataItem(dataItem); + } + catch { } + } + } + public void AddDataItem(DataItemCategory category, string type, string subType = null, string dataItemId = null) { if (!string.IsNullOrEmpty(type)) @@ -556,15 +998,10 @@ public void AddDataItems(IEnumerable dataItems) { if (!dataItems.IsNullOrEmpty()) { - var newDataItems = new List(); - - if (!DataItems.IsNullOrEmpty()) + foreach (var dataItem in dataItems) { - newDataItems.AddRange(DataItems); + AddDataItem(dataItem); } - - newDataItems.AddRange(dataItems); - DataItems = newDataItems; } } @@ -575,6 +1012,14 @@ public void AddDataItems(IEnumerable dataItems) /// The ID of the DataItem to remove public void RemoveDataItem(string dataItemId) { + if (!DataItems.IsNullOrEmpty()) + { + var dataItems = new List(); + dataItems.AddRange(DataItems); + dataItems.RemoveAll(o => o.Id == dataItemId); + DataItems = dataItems; + } + var components = GetComponents(); if (!components.IsNullOrEmpty()) { @@ -591,11 +1036,73 @@ public void RemoveDataItem(string dataItemId) } } - #endregion + #endregion + + #region "ID" + + internal static void ResetIds(IComponent component) + { + if (component != null) + { + ((Component)component).Id = CreateContainerId(component, component.ComponentIdFormat); + + // Set Child Component IDs + if (!component.Components.IsNullOrEmpty()) + { + foreach (var subcomponent in component.Components) + { + ResetIds(subcomponent); + } + } + + // Set Child Composition IDs + if (!component.Compositions.IsNullOrEmpty()) + { + foreach (var composition in component.Compositions) + { + ResetIds(composition); + } + } - #region "ID" + // Set Child DataItem IDs + if (!component.DataItems.IsNullOrEmpty()) + { + foreach (var dataItem in component.DataItems) + { + ResetId(component, dataItem); + } + } + } + } - public static string CreateId(string parentId, string name) + internal static void ResetIds(IComposition composition) + { + if (composition != null) + { + ((Composition)composition).Id = CreateContainerId(composition, composition.CompositionIdFormat); + + // Set Child DataItem IDs + if (!composition.DataItems.IsNullOrEmpty()) + { + foreach (var dataItem in composition.DataItems) + { + ((DataItem)dataItem).CompositionId = composition.Id; + ResetId(composition, dataItem); + } + } + } + } + + internal static void ResetId(IContainer container, IDataItem dataItem) + { + if (container != null && dataItem != null) + { + ((DataItem)dataItem).Id = CreateDataItemId(container, dataItem, container.DataItemIdFormat); + } + } + + + public static string CreateId(string parentId, string name) { return $"{parentId}_{name}"; } @@ -612,6 +1119,162 @@ public static string CreateId(string parentId, string name, string suffix) } } + + public static string CreateContainerId(IContainer container, string pattern) + { + if (container != null) + { + var result = pattern; + + var configurations = GetIdFormatConfigurations(pattern); + if (configurations != null) + { + foreach (var configuration in configurations) + { + var obj = GetIdFormatObject(container, configuration); + var value = GetPropertyValue(obj, configuration.Property); + result = result.Replace(configuration.Pattern, value); + } + } + + return result; + } + + return null; + } + + public static string CreateDataItemId(IContainer container, IDataItem dataItem, string pattern) + { + if (container != null && dataItem != null) + { + var result = pattern; + + var configurations = GetIdFormatConfigurations(pattern); + if (configurations != null) + { + foreach (var configuration in configurations) + { + var obj = GetIdFormatObject(container, dataItem, configuration); + var value = GetPropertyValue(obj, configuration.Property); + if (value != null) + { + result = result.Replace(configuration.Pattern, $"{configuration.Prefix}{value}{configuration.Suffix}"); + } + else if (configuration.IsOptional) + { + result = result.Replace(configuration.Pattern, ""); + } + } + } + + return result; + } + + return null; + } + + private static object GetIdFormatObject(IContainer container, IdFormatConfiguration configuration) + { + if (container != null) + { + switch (configuration.Object.ToLower()) + { + case "parent": return container.Parent; + case "device": return container; + case "component": return container; + case "composition": return container; + } + } + + return null; + } + + private static object GetIdFormatObject(IContainer container, IDataItem dataItem, IdFormatConfiguration configuration) + { + if (container != null && dataItem != null) + { + switch (configuration.Object.ToLower()) + { + case "parent": return container.Parent; + case "device": return container; + case "component": return container; + case "composition": return container; + case "dataitem": return dataItem; + } + } + + return null; + } + + private static IEnumerable GetIdFormatConfigurations(string pattern) + { + if (!string.IsNullOrEmpty(pattern)) + { + try + { + var configurations = new List(); + + var matches = _idFormatRegex.Matches(pattern); + if (matches != null) + { + foreach (Match match in matches) + { + if (match.Groups != null && match.Groups.Count > 4) + { + var configuration = new IdFormatConfiguration(); + configuration.Pattern = match.Groups[0].Value; + + // Required + if (!string.IsNullOrEmpty(match.Groups[1].Value)) configuration.Object = match.Groups[1].Value; + if (!string.IsNullOrEmpty(match.Groups[2].Value)) configuration.Property = match.Groups[2].Value; + + // Optional + if (!string.IsNullOrEmpty(match.Groups[4].Value) && !string.IsNullOrEmpty(match.Groups[5].Value)) + { + configuration.Prefix = match.Groups[3].Value; + configuration.Object = match.Groups[4].Value; + configuration.Property = match.Groups[5].Value; + configuration.Suffix = match.Groups[6].Value; + configuration.IsOptional = true; + } + + configurations.Add(configuration); + } + } + } + + return configurations; + } + catch { } + } + + return null; + } + + private static string GetPropertyValue(object obj, string propertyName) + { + if (obj != null && !string.IsNullOrEmpty(propertyName)) + { + var objType = obj.GetType(); + + var property = objType.GetProperty(propertyName.ToTitleCase()); + if (property != null) + { + var val = property.GetValue(obj)?.ToString(); + + switch (property.Name) + { + case "Type": val = val.ToCamelCase(); break; + case "SubType": val = val.ToCamelCase(); break; + } + + return val; + } + } + + return null; + } + #endregion diff --git a/libraries/MTConnect.NET-Common/Devices/Component.g.cs b/libraries/MTConnect.NET-Common/Devices/Component.g.cs index 740c5ae5..d697d5d2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Component.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Component.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_8548C620_467A_4f50_9A22_58D84B7E8779 diff --git a/libraries/MTConnect.NET-Common/Devices/ComponentDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/ComponentDescriptions.g.cs index b42f7189..0d0fc9f2 100644 --- a/libraries/MTConnect.NET-Common/Devices/ComponentDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/ComponentDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ActuatorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ActuatorComponent.g.cs index b986303d..0d3f20f1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ActuatorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ActuatorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381968_750236_42201 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ActuatorComponent : Component { public const string TypeId = "Actuator"; - public const string NameId = "actuatorComponent"; + public const string NameId = "actuator"; public new const string DescriptionText = "Component composed of a physical apparatus that moves or controls a mechanism or system."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ActuatorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public ActuatorComponent() { Type = TypeId; } + public ActuatorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AdapterComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AdapterComponent.g.cs index 9747940e..5358a196 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AdapterComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AdapterComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605101651646_782838_139 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AdapterComponent : Component { public const string TypeId = "Adapter"; - public const string NameId = "adapterComponent"; + public const string NameId = "adapter"; public new const string DescriptionText = "Component that provides information about the data source for an MTConnect Agent."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AdapterComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public AdapterComponent() { Type = TypeId; } + public AdapterComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AdaptersComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AdaptersComponent.g.cs index e5f59292..ba4b430d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AdaptersComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AdaptersComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607345849016_787585_1914 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AdaptersComponent : Component, IOrganizerComponent { public const string TypeId = "Adapters"; - public const string NameId = "adaptersComponent"; + public const string NameId = "adapters"; public new const string DescriptionText = "Component that organize Adapter types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AdaptersComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version17; - public AdaptersComponent() { Type = TypeId; } + public AdaptersComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AmplifierComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AmplifierComponent.g.cs index 9609f5a8..96d5dfea 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AmplifierComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AmplifierComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106460_808314_44366 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AmplifierComponent : Component { public const string TypeId = "Amplifier"; - public const string NameId = "amplifierComponent"; + public const string NameId = "amplifier"; public new const string DescriptionText = "Leaf Component composed of an electronic component or circuit that amplifies power, electric current, or voltage."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AmplifierComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public AmplifierComponent() { Type = TypeId; } + public AmplifierComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AutomaticToolChangerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AutomaticToolChangerComponent.g.cs index d67f620b..4bff48a6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AutomaticToolChangerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AutomaticToolChangerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605551853978_27109_2354 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AutomaticToolChangerComponent : Component { public const string TypeId = "AutomaticToolChanger"; - public const string NameId = "automaticToolChangerComponent"; + public const string NameId = "automaticToolChanger"; public new const string DescriptionText = "ToolingDelivery composed of a tool delivery mechanism that moves tools between a ToolMagazine and a spindle a Turret."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AutomaticToolChangerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public AutomaticToolChangerComponent() { Type = TypeId; } + public AutomaticToolChangerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AuxiliariesComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AuxiliariesComponent.g.cs index 3a7be0b1..e4824bc5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AuxiliariesComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AuxiliariesComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607345082819_606856_1629 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AuxiliariesComponent : Component, IOrganizerComponent { public const string TypeId = "Auxiliaries"; - public const string NameId = "auxiliariesComponent"; + public const string NameId = "auxiliaries"; public new const string DescriptionText = "Component that organize Auxiliary types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AuxiliariesComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version14; - public AuxiliariesComponent() { Type = TypeId; } + public AuxiliariesComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AuxiliaryComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AuxiliaryComponent.g.cs index 91f00688..ee37861c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AuxiliaryComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AuxiliaryComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381970_785259_42204 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class AuxiliaryComponent : Component { public const string TypeId = "Auxiliary"; - public const string NameId = "auxiliaryComponent"; + public const string NameId = "auxiliary"; public new const string DescriptionText = "Abstract Component composed of removable part(s) of a piece of equipment that provides supplementary or extended functionality."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class AuxiliaryComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public AuxiliaryComponent() { Type = TypeId; } + public AuxiliaryComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AxesComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AxesComponent.g.cs index 48968b2a..d78f06fe 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AxesComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AxesComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607344218033_657673_1055 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class AxesComponent : Component, IOrganizerComponent { public const string TypeId = "Axes"; - public const string NameId = "axesComponent"; + public const string NameId = "axes"; public new const string DescriptionText = "Component that organize Component Axis types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class AxesComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version10; - public AxesComponent() { Type = TypeId; } + public AxesComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/AxisComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/AxisComponent.g.cs index f53c15d4..07a8fd2c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/AxisComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/AxisComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381972_553005_42207 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class AxisComponent : Component { public const string TypeId = "Axis"; - public const string NameId = "axisComponent"; + public const string NameId = "axis"; public new const string DescriptionText = "Abstract Component composed of a motion system that provides linear or rotational motion for a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class AxisComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public AxisComponent() { Type = TypeId; } + public AxisComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/BallscrewComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/BallscrewComponent.g.cs index 3c015cf1..ad7b45f7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/BallscrewComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/BallscrewComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106460_88955_44369 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class BallscrewComponent : Component { public const string TypeId = "Ballscrew"; - public const string NameId = "ballscrewComponent"; + public const string NameId = "ballscrew"; public new const string DescriptionText = "Leaf Component composed of a mechanical structure that transforms rotary motion into linear motion."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class BallscrewComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public BallscrewComponent() { Type = TypeId; } + public BallscrewComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/BarFeederComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/BarFeederComponent.g.cs index 51f43454..a0a93f93 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/BarFeederComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/BarFeederComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381973_701090_42210 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class BarFeederComponent : Component { public const string TypeId = "BarFeeder"; - public const string NameId = "barFeederComponent"; + public const string NameId = "barFeeder"; public new const string DescriptionText = "Loader that delivers bar stock to a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class BarFeederComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public BarFeederComponent() { Type = TypeId; } + public BarFeederComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/BeltComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/BeltComponent.g.cs index 09536af9..5ef9b9c6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/BeltComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/BeltComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106461_211983_44372 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class BeltComponent : Component { public const string TypeId = "Belt"; - public const string NameId = "beltComponent"; + public const string NameId = "belt"; public new const string DescriptionText = "Leaf Component composed of an endless flexible band that transmits motion for a piece of equipment or conveys materials and objects."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class BeltComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public BeltComponent() { Type = TypeId; } + public BeltComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/BrakeComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/BrakeComponent.g.cs index 4af2b5e0..76d61ecc 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/BrakeComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/BrakeComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106461_720908_44375 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class BrakeComponent : Component { public const string TypeId = "Brake"; - public const string NameId = "brakeComponent"; + public const string NameId = "brake"; public new const string DescriptionText = "Leaf Component that slows or stops a moving object by the absorption or transfer of the energy of momentum, usually by means of friction, electrical force, or magnetic force."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class BrakeComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public BrakeComponent() { Type = TypeId; } + public BrakeComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ChainComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ChainComponent.g.cs index 244ae781..790c751e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ChainComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ChainComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106462_246830_44378 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ChainComponent : Component { public const string TypeId = "Chain"; - public const string NameId = "chainComponent"; + public const string NameId = "chain"; public new const string DescriptionText = "Leaf Component composed of interconnected series of objects that band together and are used to transmit motion for a piece of equipment or to convey materials and objects."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ChainComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ChainComponent() { Type = TypeId; } + public ChainComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ChopperComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ChopperComponent.g.cs index 1e73809b..a1da0b8c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ChopperComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ChopperComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106462_657166_44381 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ChopperComponent : Component { public const string TypeId = "Chopper"; - public const string NameId = "chopperComponent"; + public const string NameId = "chopper"; public new const string DescriptionText = "Leaf Component that breaks material into smaller pieces."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ChopperComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ChopperComponent() { Type = TypeId; } + public ChopperComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ChuckComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ChuckComponent.g.cs index d8d8e919..7281cd57 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ChuckComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ChuckComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_4_45f01b9_1643679566213_508045_1804 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ChuckComponent : Component { public const string TypeId = "Chuck"; - public const string NameId = "chuckComponent"; + public const string NameId = "chuck"; public new const string DescriptionText = "Leaf Component composed of a mechanism that holds a part or stock material in place."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ChuckComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version13; - public ChuckComponent() { Type = TypeId; } + public ChuckComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ChuteComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ChuteComponent.g.cs index 0b0d6477..ecab8f1f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ChuteComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ChuteComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106463_904140_44387 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ChuteComponent : Component { public const string TypeId = "Chute"; - public const string NameId = "chuteComponent"; + public const string NameId = "chute"; public new const string DescriptionText = "Leaf Component composed of an inclined channel that conveys material."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ChuteComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ChuteComponent() { Type = TypeId; } + public ChuteComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/CircuitBreakerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/CircuitBreakerComponent.g.cs index 7f0d34c2..1d8862c3 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/CircuitBreakerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/CircuitBreakerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106464_188160_44390 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class CircuitBreakerComponent : Component { public const string TypeId = "CircuitBreaker"; - public const string NameId = "circuitBreakerComponent"; + public const string NameId = "circuitBreaker"; public new const string DescriptionText = "Leaf Component that interrupts an electric circuit."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class CircuitBreakerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public CircuitBreakerComponent() { Type = TypeId; } + public CircuitBreakerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ClampComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ClampComponent.g.cs index 5319b85d..665643d0 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ClampComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ClampComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106464_145351_44393 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ClampComponent : Component { public const string TypeId = "Clamp"; - public const string NameId = "clampComponent"; + public const string NameId = "clamp"; public new const string DescriptionText = "Leaf Component that strengthens, support, or fastens objects in place."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ClampComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ClampComponent() { Type = TypeId; } + public ClampComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/CompressorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/CompressorComponent.g.cs index bbf730a0..895698a7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/CompressorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/CompressorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106465_576708_44396 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class CompressorComponent : Component { public const string TypeId = "Compressor"; - public const string NameId = "compressorComponent"; + public const string NameId = "compressor"; public new const string DescriptionText = "Leaf Component composed of a pump or other mechanism that reduces volume and increases pressure of gases in order to condense the gases to drive pneumatically powered pieces of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class CompressorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public CompressorComponent() { Type = TypeId; } + public CompressorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ControllerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ControllerComponent.g.cs index 47f0cae4..19eb3018 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ControllerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ControllerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381977_283525_42216 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ControllerComponent : Component { public const string TypeId = "Controller"; - public const string NameId = "controllerComponent"; + public const string NameId = "cont"; public new const string DescriptionText = "System that provides regulation or management of a system or component. ISO 16484-5:2017"; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ControllerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public ControllerComponent() { Type = TypeId; } + public ControllerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ControllersComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ControllersComponent.g.cs index f519bbb5..52e8b95d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ControllersComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ControllersComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1648551529939_657918_1127 @@ -11,15 +11,18 @@ namespace MTConnect.Devices.Components public class ControllersComponent : Component, IOrganizerComponent { public const string TypeId = "Controllers"; - public const string NameId = "controllersComponent"; + public const string NameId = "controllers"; public new const string DescriptionText = "Component that organize Controller entities."; public override string TypeDescription => DescriptionText; public override System.Version MinimumVersion => MTConnectVersions.Version10; - //public override System.Version MinimumVersion => MTConnectVersions.Version20; - public ControllersComponent() { Type = TypeId; } + public ControllersComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/CoolantComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/CoolantComponent.g.cs index cd821461..589b1a06 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/CoolantComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/CoolantComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381979_456626_42219 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class CoolantComponent : Component { public const string TypeId = "Coolant"; - public const string NameId = "coolantComponent"; + public const string NameId = "coolant"; public new const string DescriptionText = "System that provides distribution and management of fluids that remove heat from a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class CoolantComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version12; - public CoolantComponent() { Type = TypeId; } + public CoolantComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/CoolingComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/CoolingComponent.g.cs index f206d6c8..85e173e6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/CoolingComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/CoolingComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605117088875_728711_1893 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class CoolingComponent : Component { public const string TypeId = "Cooling"; - public const string NameId = "coolingComponent"; + public const string NameId = "cooling"; public new const string DescriptionText = "System that extracts controlled amounts of heat to achieve a target temperature at a specified cooling rate."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class CoolingComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public CoolingComponent() { Type = TypeId; } + public CoolingComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/CoolingTowerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/CoolingTowerComponent.g.cs index de75130a..2d1be77c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/CoolingTowerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/CoolingTowerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605117477013_561048_2109 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class CoolingTowerComponent : Component { public const string TypeId = "CoolingTower"; - public const string NameId = "coolingTowerComponent"; + public const string NameId = "coolingTower"; public new const string DescriptionText = "Leaf Component composed of a heat exchange system that uses a fluid to transfer heat to the atmosphere."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class CoolingTowerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public CoolingTowerComponent() { Type = TypeId; } + public CoolingTowerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/DepositionComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/DepositionComponent.g.cs index f6ba7aa1..78915d63 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/DepositionComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/DepositionComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381981_362854_42222 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class DepositionComponent : Component { public const string TypeId = "Deposition"; - public const string NameId = "depositionComponent"; + public const string NameId = "deposition"; public new const string DescriptionText = "Auxiliary that manages the addition of material or state change of material being performed in an additive manufacturing process."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class DepositionComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public DepositionComponent() { Type = TypeId; } + public DepositionComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/DielectricComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/DielectricComponent.g.cs index c352c1d2..30dede66 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/DielectricComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/DielectricComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381982_394383_42225 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class DielectricComponent : Component { public const string TypeId = "Dielectric"; - public const string NameId = "dielectricComponent"; + public const string NameId = "dielectric"; public new const string DescriptionText = "System that manages a chemical mixture used in a manufacturing process being performed at that piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class DielectricComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public DielectricComponent() { Type = TypeId; } + public DielectricComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/DoorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/DoorComponent.g.cs index 7308837e..e50cd360 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/DoorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/DoorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381984_481596_42228 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class DoorComponent : Component { public const string TypeId = "Door"; - public const string NameId = "doorComponent"; + public const string NameId = "door"; public new const string DescriptionText = "Component composed of a mechanical mechanism or closure that can cover a physical access portal into a piece of equipment allowing or restricting access to other parts of the equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class DoorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public DoorComponent() { Type = TypeId; } + public DoorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/DrainComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/DrainComponent.g.cs index c98f07e3..9dad18cd 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/DrainComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/DrainComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106466_143410_44402 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class DrainComponent : Component { public const string TypeId = "Drain"; - public const string NameId = "drainComponent"; + public const string NameId = "drain"; public new const string DescriptionText = "Leaf Component that allows material to flow for the purpose of drainage from, for example, a vessel or tank."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class DrainComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public DrainComponent() { Type = TypeId; } + public DrainComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ElectricComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ElectricComponent.g.cs index d27ea806..537dd8e1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ElectricComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ElectricComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381986_185851_42231 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ElectricComponent : Component { public const string TypeId = "Electric"; - public const string NameId = "electricComponent"; + public const string NameId = "electric"; public new const string DescriptionText = "System composed of the main power supply for the piece of equipment that provides distribution of that power throughout the equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ElectricComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public ElectricComponent() { Type = TypeId; } + public ElectricComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/EnclosureComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/EnclosureComponent.g.cs index 1d64c071..bc297b57 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/EnclosureComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/EnclosureComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381987_89386_42234 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class EnclosureComponent : Component { public const string TypeId = "Enclosure"; - public const string NameId = "enclosureComponent"; + public const string NameId = "enclosure"; public new const string DescriptionText = "System composed of a structure that is used to contain or isolate a piece of equipment or area."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class EnclosureComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public EnclosureComponent() { Type = TypeId; } + public EnclosureComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/EncoderComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/EncoderComponent.g.cs index 32b89964..01e91f0e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/EncoderComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/EncoderComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106466_630446_44405 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class EncoderComponent : Component { public const string TypeId = "Encoder"; - public const string NameId = "encoderComponent"; + public const string NameId = "encoder"; public new const string DescriptionText = "Leaf Component that measures position."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class EncoderComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public EncoderComponent() { Type = TypeId; } + public EncoderComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/EndEffectorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/EndEffectorComponent.g.cs index ea82eb20..8ee94e1b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/EndEffectorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/EndEffectorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381988_757487_42237 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class EndEffectorComponent : Component { public const string TypeId = "EndEffector"; - public const string NameId = "endEffectorComponent"; + public const string NameId = "endEffector"; public new const string DescriptionText = "System composed of functions that form the last link segment of a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class EndEffectorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public EndEffectorComponent() { Type = TypeId; } + public EndEffectorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/EnvironmentalComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/EnvironmentalComponent.g.cs index 068d6d71..ef384b4f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/EnvironmentalComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/EnvironmentalComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381990_149427_42240 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class EnvironmentalComponent : Component { public const string TypeId = "Environmental"; - public const string NameId = "environmentalComponent"; + public const string NameId = "environmental"; public new const string DescriptionText = "Component that observes the surroundings of another Component.> Note: Environmental **SHOULD** be organized by Auxillaries, Systems or Parts depending on the relationship to the Component."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class EnvironmentalComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public EnvironmentalComponent() { Type = TypeId; } + public EnvironmentalComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ExpiredPotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ExpiredPotComponent.g.cs index 0e788677..f818485a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ExpiredPotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ExpiredPotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552258379_348093_2712 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ExpiredPotComponent : Component { public const string TypeId = "ExpiredPot"; - public const string NameId = "expiredPotComponent"; + public const string NameId = "expiredPot"; public new const string DescriptionText = "Leaf Component that is a Pot for a tool that is no longer usable for removal from a ToolMagazine or Turret."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ExpiredPotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ExpiredPotComponent() { Type = TypeId; } + public ExpiredPotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ExposureUnitComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ExposureUnitComponent.g.cs index 5da0860e..7615c06c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ExposureUnitComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ExposureUnitComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106466_875747_44408 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ExposureUnitComponent : Component { public const string TypeId = "ExposureUnit"; - public const string NameId = "exposureUnitComponent"; + public const string NameId = "exposureUnit"; public new const string DescriptionText = "Leaf Component that emits a type of radiation."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ExposureUnitComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public ExposureUnitComponent() { Type = TypeId; } + public ExposureUnitComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ExtrusionUnitComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ExtrusionUnitComponent.g.cs index 657f2b12..30da9062 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ExtrusionUnitComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ExtrusionUnitComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106467_401181_44411 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ExtrusionUnitComponent : Component { public const string TypeId = "ExtrusionUnit"; - public const string NameId = "extrusionUnitComponent"; + public const string NameId = "extrusionUnit"; public new const string DescriptionText = "Leaf Component that dispenses liquid or powered materials."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ExtrusionUnitComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public ExtrusionUnitComponent() { Type = TypeId; } + public ExtrusionUnitComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/FanComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/FanComponent.g.cs index 562c48fb..ca1ecceb 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/FanComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/FanComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106468_61130_44414 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class FanComponent : Component { public const string TypeId = "Fan"; - public const string NameId = "fanComponent"; + public const string NameId = "fan"; public new const string DescriptionText = "Leaf Component that produces a current of air."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class FanComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public FanComponent() { Type = TypeId; } + public FanComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/FeatureOccurrenceComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/FeatureOccurrenceComponent.g.cs index a1e3d6a6..a2a7ef29 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/FeatureOccurrenceComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/FeatureOccurrenceComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1678029650656_503771_494 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class FeatureOccurrenceComponent : Component { public const string TypeId = "FeatureOccurrence"; - public const string NameId = "featureOccurrenceComponent"; + public const string NameId = "featureOccurrence"; public new const string DescriptionText = "Component that provides information related to an individual feature."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class FeatureOccurrenceComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version22; - public FeatureOccurrenceComponent() { Type = TypeId; } + public FeatureOccurrenceComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/FeederComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/FeederComponent.g.cs index c81c110b..f8d7a7aa 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/FeederComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/FeederComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381991_562093_42243 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class FeederComponent : Component { public const string TypeId = "Feeder"; - public const string NameId = "feederComponent"; + public const string NameId = "feeder"; public new const string DescriptionText = "System that manages the delivery of materials within a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class FeederComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public FeederComponent() { Type = TypeId; } + public FeederComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/FilterComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/FilterComponent.g.cs index 0e6a7932..89ec4219 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/FilterComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/FilterComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106468_554120_44417 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class FilterComponent : Component { public const string TypeId = "Filter"; - public const string NameId = "filterComponent"; + public const string NameId = "filter"; public new const string DescriptionText = "Leaf Component through which liquids or gases are passed to remove suspended impurities or to recover solids."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class FilterComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public FilterComponent() { Type = TypeId; } + public FilterComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/GalvanomotorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/GalvanomotorComponent.g.cs index 9aade497..24bce55a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/GalvanomotorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/GalvanomotorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106469_237105_44420 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class GalvanomotorComponent : Component { public const string TypeId = "Galvanomotor"; - public const string NameId = "galvanomotorComponent"; + public const string NameId = "galvanomotor"; public new const string DescriptionText = "Leaf Component composed of an electromechanical actuator that produces deflection of a beam of light or energy in response to electric current through its coil in a magnetic field."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class GalvanomotorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public GalvanomotorComponent() { Type = TypeId; } + public GalvanomotorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/GangToolBarComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/GangToolBarComponent.g.cs index 851c5082..a521849c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/GangToolBarComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/GangToolBarComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605551885706_266977_2498 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class GangToolBarComponent : Component { public const string TypeId = "GangToolBar"; - public const string NameId = "gangToolBarComponent"; + public const string NameId = "gangToolBar"; public new const string DescriptionText = "ToolingDelivery composed of a tool mounting mechanism that holds any number of tools."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class GangToolBarComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public GangToolBarComponent() { Type = TypeId; } + public GangToolBarComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/GripperComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/GripperComponent.g.cs index 46ba433c..0e3cd965 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/GripperComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/GripperComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106469_530686_44423 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class GripperComponent : Component { public const string TypeId = "Gripper"; - public const string NameId = "gripperComponent"; + public const string NameId = "gripper"; public new const string DescriptionText = "Leaf Component that holds a part, stock material, or any other item in place."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class GripperComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public GripperComponent() { Type = TypeId; } + public GripperComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/HeatingComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/HeatingComponent.g.cs index 40349ccf..dc13b6d5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/HeatingComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/HeatingComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605117125123_371301_1943 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class HeatingComponent : Component { public const string TypeId = "Heating"; - public const string NameId = "heatingComponent"; + public const string NameId = "heating"; public new const string DescriptionText = "System that delivers controlled amounts of heat to achieve a target temperature at a specified heating rate."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class HeatingComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public HeatingComponent() { Type = TypeId; } + public HeatingComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/HopperComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/HopperComponent.g.cs index 6c6b3df9..dff07935 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/HopperComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/HopperComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106470_968785_44426 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class HopperComponent : Component { public const string TypeId = "Hopper"; - public const string NameId = "hopperComponent"; + public const string NameId = "hopper"; public new const string DescriptionText = "Leaf Component composed of a chamber or bin in which materials are stored temporarily, typically being filled through the top and dispensed through the bottom."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class HopperComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public HopperComponent() { Type = TypeId; } + public HopperComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/HydraulicComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/HydraulicComponent.g.cs index 6c7fc4e1..113d8095 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/HydraulicComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/HydraulicComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381993_131470_42246 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class HydraulicComponent : Component { public const string TypeId = "Hydraulic"; - public const string NameId = "hydraulicComponent"; + public const string NameId = "hydraulic"; public new const string DescriptionText = "System that provides movement and distribution of pressurized liquid throughout the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class HydraulicComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public HydraulicComponent() { Type = TypeId; } + public HydraulicComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/InterfacesComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/InterfacesComponent.g.cs index c7a54227..232d5ffa 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/InterfacesComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/InterfacesComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607345507474_877148_1773 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class InterfacesComponent : Component, IOrganizerComponent { public const string TypeId = "Interfaces"; - public const string NameId = "interfacesComponent"; + public const string NameId = "interfaces"; public new const string DescriptionText = "Component that organize Interface types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class InterfacesComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version13; - public InterfacesComponent() { Type = TypeId; } + public InterfacesComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LinearComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LinearComponent.g.cs index 65a011fc..17153c34 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LinearComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LinearComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381997_851399_42255 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LinearComponent : Component { public const string TypeId = "Linear"; - public const string NameId = "linearComponent"; + public const string NameId = "linear"; public new const string DescriptionText = "Component Axis that provides prismatic motion along a fixed axis."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LinearComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public LinearComponent() { Type = TypeId; } + public LinearComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LinearPositionFeedbackComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LinearPositionFeedbackComponent.g.cs index c8000558..aa603481 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LinearPositionFeedbackComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LinearPositionFeedbackComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106471_40319_44429 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LinearPositionFeedbackComponent : Component { public const string TypeId = "LinearPositionFeedback"; - public const string NameId = "linearPositionFeedbackComponent"; + public const string NameId = "linearPositionFeedback"; public new const string DescriptionText = "Leaf Component that measures linear motion or position.**DEPRECATION WARNING** : May be deprecated in the future. Recommend using Encoder."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LinearPositionFeedbackComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public LinearPositionFeedbackComponent() { Type = TypeId; } + public LinearPositionFeedbackComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LinkComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LinkComponent.g.cs index 7a2b4208..08750247 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LinkComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LinkComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1587597430378_591532_1084 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LinkComponent : Component { public const string TypeId = "Link"; - public const string NameId = "linkComponent"; + public const string NameId = "link"; public new const string DescriptionText = "Structure that provides a connection between Component entities."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LinkComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public LinkComponent() { Type = TypeId; } + public LinkComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LoaderComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LoaderComponent.g.cs index 9ecd4855..eb3dc73a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LoaderComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LoaderComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572381999_206845_42258 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LoaderComponent : Component { public const string TypeId = "Loader"; - public const string NameId = "loaderComponent"; + public const string NameId = "loader"; public new const string DescriptionText = "Auxiliary that provides movement and distribution of materials, parts, tooling, and other items to or from a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LoaderComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public LoaderComponent() { Type = TypeId; } + public LoaderComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LockComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LockComponent.g.cs index f9eaf894..e33aa203 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LockComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LockComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1622457426342_839834_623 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LockComponent : Component { public const string TypeId = "Lock"; - public const string NameId = "lockComponent"; + public const string NameId = "lock"; public new const string DescriptionText = "Component that physically prohibits a Device or Component from opening or operating."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LockComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version18; - public LockComponent() { Type = TypeId; } + public LockComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/LubricationComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/LubricationComponent.g.cs index 384df308..a73d05d3 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/LubricationComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/LubricationComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382000_589988_42261 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class LubricationComponent : Component { public const string TypeId = "Lubrication"; - public const string NameId = "lubricationComponent"; + public const string NameId = "lubrication"; public new const string DescriptionText = "System that provides distribution and management of fluids used to lubricate portions of the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class LubricationComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public LubricationComponent() { Type = TypeId; } + public LubricationComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/MaterialComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/MaterialComponent.g.cs index 902a7db0..9aa5ee24 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/MaterialComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/MaterialComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382002_513291_42264 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class MaterialComponent : Component { public const string TypeId = "Material"; - public const string NameId = "materialComponent"; + public const string NameId = "material"; public new const string DescriptionText = "Resource composed of material that is consumed or used by the piece of equipment for production of parts, materials, or other types of goods."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class MaterialComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version18; - public MaterialComponent() { Type = TypeId; } + public MaterialComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/MaterialsComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/MaterialsComponent.g.cs index c84e39da..a98aae79 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/MaterialsComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/MaterialsComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1630059859468_228796_88 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class MaterialsComponent : Component, IOrganizerComponent { public const string TypeId = "Materials"; - public const string NameId = "materialsComponent"; + public const string NameId = "materials"; public new const string DescriptionText = "Resources that organize Material types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class MaterialsComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version14; - public MaterialsComponent() { Type = TypeId; } + public MaterialsComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/MotorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/MotorComponent.g.cs index b03e1204..23dfe043 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/MotorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/MotorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106471_971269_44432 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class MotorComponent : Component { public const string TypeId = "Motor"; - public const string NameId = "motorComponent"; + public const string NameId = "motor"; public new const string DescriptionText = "Leaf Component that converts electrical, pneumatic, or hydraulic energy into mechanical energy."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class MotorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public MotorComponent() { Type = TypeId; } + public MotorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/OilComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/OilComponent.g.cs index 64b2f9f5..46e9286c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/OilComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/OilComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106472_287785_44435 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class OilComponent : Component { public const string TypeId = "Oil"; - public const string NameId = "oilComponent"; + public const string NameId = "oil"; public new const string DescriptionText = "Leaf Component composed of a viscous liquid."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class OilComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public OilComponent() { Type = TypeId; } + public OilComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PartComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PartComponent.g.cs index 72f7f658..c33a1a97 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PartComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PartComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1622456766067_72580_282 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class PartComponent : Component { public const string TypeId = "Part"; - public const string NameId = "partComponent"; + public const string NameId = "part"; public new const string DescriptionText = "Abstract Component composed of a part being processed by a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class PartComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public PartComponent() { Type = TypeId; } + public PartComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PartOccurrenceComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PartOccurrenceComponent.g.cs index 51be9817..bb1317a4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PartOccurrenceComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PartOccurrenceComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605547467172_656422_264 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PartOccurrenceComponent : Component { public const string TypeId = "PartOccurrence"; - public const string NameId = "partOccurrenceComponent"; + public const string NameId = "partOccurrence"; public new const string DescriptionText = "Part that exists at a specific place and time, such as a specific instance of a bracket at a specific timestamp."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PartOccurrenceComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public PartOccurrenceComponent() { Type = TypeId; } + public PartOccurrenceComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PartsComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PartsComponent.g.cs index aef30d35..3d2d47c7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PartsComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PartsComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1622457074108_581195_524 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PartsComponent : Component, IOrganizerComponent { public const string TypeId = "Parts"; - public const string NameId = "partsComponent"; + public const string NameId = "parts"; public new const string DescriptionText = "Component that organize Part types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PartsComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version18; - public PartsComponent() { Type = TypeId; } + public PartsComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PathComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PathComponent.g.cs index 9262fdb3..8202cf5c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PathComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PathComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382004_482583_42267 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PathComponent : Component { public const string TypeId = "Path"; - public const string NameId = "pathComponent"; + public const string NameId = "path"; public new const string DescriptionText = "Component that organizes an independent operation or function within a Controller."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PathComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public PathComponent() { Type = TypeId; } + public PathComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PersonnelComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PersonnelComponent.g.cs index 72b88303..ec558b6f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PersonnelComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PersonnelComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382005_168835_42270 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PersonnelComponent : Component { public const string TypeId = "Personnel"; - public const string NameId = "personnelComponent"; + public const string NameId = "personnel"; public new const string DescriptionText = "Resource composed of an individual or individuals who either control, support, or otherwise interface with a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PersonnelComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public PersonnelComponent() { Type = TypeId; } + public PersonnelComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PneumaticComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PneumaticComponent.g.cs index 7564cf39..1ceba332 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PneumaticComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PneumaticComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382008_658658_42273 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PneumaticComponent : Component { public const string TypeId = "Pneumatic"; - public const string NameId = "pneumaticComponent"; + public const string NameId = "pneumatic"; public new const string DescriptionText = "System that uses compressed gasses to actuate components or do work within the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PneumaticComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public PneumaticComponent() { Type = TypeId; } + public PneumaticComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PotComponent.g.cs index 22403425..d2a5a932 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552256946_709565_2656 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PotComponent : Component { public const string TypeId = "Pot"; - public const string NameId = "potComponent"; + public const string NameId = "pot"; public new const string DescriptionText = "Leaf Component composed of a tool storage location associated with a ToolMagazine or AutomaticToolChanger."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public PotComponent() { Type = TypeId; } + public PotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PowerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PowerComponent.g.cs index 801e2c2f..7e01b3bf 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PowerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PowerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382010_841174_42276 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PowerComponent : Component { public const string TypeId = "Power"; - public const string NameId = "powerComponent"; + public const string NameId = "power"; public new const string DescriptionText = "Power was **DEPRECATED** in *MTConnect Version 1.1* and was replaced by Availability data item type."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PowerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public PowerComponent() { Type = TypeId; } + public PowerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PowerSupplyComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PowerSupplyComponent.g.cs index 1a50717d..cbb22aa4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PowerSupplyComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PowerSupplyComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106472_81456_44438 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PowerSupplyComponent : Component { public const string TypeId = "PowerSupply"; - public const string NameId = "powerSupplyComponent"; + public const string NameId = "powerSupply"; public new const string DescriptionText = "Leaf Component that provides power to electric mechanisms."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PowerSupplyComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public PowerSupplyComponent() { Type = TypeId; } + public PowerSupplyComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PressureComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PressureComponent.g.cs index dd6370b5..78dfc474 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PressureComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PressureComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605117029255_781563_1842 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PressureComponent : Component { public const string TypeId = "Pressure"; - public const string NameId = "pressureComponent"; + public const string NameId = "pressure"; public new const string DescriptionText = "System that delivers compressed gas or fluid and controls the pressure and rate of pressure change to a desired target set-point."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PressureComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public PressureComponent() { Type = TypeId; } + public PressureComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ProcessComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ProcessComponent.g.cs index ca8da8eb..8803923e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ProcessComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ProcessComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605547261014_920934_161 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class ProcessComponent : Component { public const string TypeId = "Process"; - public const string NameId = "processComponent"; + public const string NameId = "process"; public new const string DescriptionText = "Abstract Component composed of a manufacturing process being executed on a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class ProcessComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ProcessComponent() { Type = TypeId; } + public ProcessComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ProcessOccurrenceComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ProcessOccurrenceComponent.g.cs index d2890bea..9f116971 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ProcessOccurrenceComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ProcessOccurrenceComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605547395898_219029_214 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ProcessOccurrenceComponent : Component { public const string TypeId = "ProcessOccurrence"; - public const string NameId = "processOccurrenceComponent"; + public const string NameId = "processOccurrence"; public new const string DescriptionText = "Process that takes place at a specific place and time, such as a specific instance of part-milling occurring at a specific timestamp."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ProcessOccurrenceComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ProcessOccurrenceComponent() { Type = TypeId; } + public ProcessOccurrenceComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ProcessPowerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ProcessPowerComponent.g.cs index 593cc49c..296cd002 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ProcessPowerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ProcessPowerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382012_290973_42279 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ProcessPowerComponent : Component { public const string TypeId = "ProcessPower"; - public const string NameId = "processPowerComponent"; + public const string NameId = "processPower"; public new const string DescriptionText = "System composed of a power source associated with a piece of equipment that supplies energy to the manufacturing process separate from the Electric system."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ProcessPowerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ProcessPowerComponent() { Type = TypeId; } + public ProcessPowerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ProcessesComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ProcessesComponent.g.cs index 1d3c16db..5f1ffdb2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ProcessesComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ProcessesComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607346168906_610073_2052 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ProcessesComponent : Component, IOrganizerComponent { public const string TypeId = "Processes"; - public const string NameId = "processesComponent"; + public const string NameId = "processes"; public new const string DescriptionText = "Component that organize Process types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ProcessesComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ProcessesComponent() { Type = TypeId; } + public ProcessesComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ProtectiveComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ProtectiveComponent.g.cs index 9e857768..14d4101c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ProtectiveComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ProtectiveComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382013_685011_42282 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ProtectiveComponent : Component { public const string TypeId = "Protective"; - public const string NameId = "protectiveComponent"; + public const string NameId = "protective"; public new const string DescriptionText = "System that provides functions used to detect or prevent harm or damage to equipment or personnel."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ProtectiveComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ProtectiveComponent() { Type = TypeId; } + public ProtectiveComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PulleyComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PulleyComponent.g.cs index b02241ab..6ac8f6c6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PulleyComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PulleyComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106473_162844_44441 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PulleyComponent : Component { public const string TypeId = "Pulley"; - public const string NameId = "pulleyComponent"; + public const string NameId = "pulley"; public new const string DescriptionText = "Leaf Component composed of a mechanism or wheel that turns in a frame or block and serves to change the direction of or to transmit force."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PulleyComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public PulleyComponent() { Type = TypeId; } + public PulleyComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/PumpComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/PumpComponent.g.cs index cbe8f25c..b84f1f5d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/PumpComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/PumpComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106473_448314_44444 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class PumpComponent : Component { public const string TypeId = "Pump"; - public const string NameId = "pumpComponent"; + public const string NameId = "pump"; public new const string DescriptionText = "Leaf Component that raises, drives, exhausts, or compresses fluids or gases by means of a piston, plunger, or set of rotating vanes."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class PumpComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public PumpComponent() { Type = TypeId; } + public PumpComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ReelComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ReelComponent.g.cs index fbadaf3c..df79a0ce 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ReelComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ReelComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106474_29298_44447 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ReelComponent : Component { public const string TypeId = "Reel"; - public const string NameId = "reelComponent"; + public const string NameId = "reel"; public new const string DescriptionText = "Leaf Component composed of a rotary storage unit for material."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ReelComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public ReelComponent() { Type = TypeId; } + public ReelComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/RemovalPotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/RemovalPotComponent.g.cs index fcb8ed32..034ab1dd 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/RemovalPotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/RemovalPotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552258019_616231_2696 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class RemovalPotComponent : Component { public const string TypeId = "RemovalPot"; - public const string NameId = "removalPotComponent"; + public const string NameId = "removalPot"; public new const string DescriptionText = "Leaf Component that is a Pot for a tool that has to be removed from a ToolMagazine or Turret to a location outside of the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class RemovalPotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public RemovalPotComponent() { Type = TypeId; } + public RemovalPotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ResourceComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ResourceComponent.g.cs index f613ed7a..aeb59aa1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ResourceComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ResourceComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382014_307743_42285 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class ResourceComponent : Component { public const string TypeId = "Resource"; - public const string NameId = "resourceComponent"; + public const string NameId = "resource"; public new const string DescriptionText = "Abstract Component composed of material or personnel involved in a manufacturing process."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class ResourceComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ResourceComponent() { Type = TypeId; } + public ResourceComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ResourcesComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ResourcesComponent.g.cs index 7f64f84e..f922ff25 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ResourcesComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ResourcesComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607344360113_831146_1196 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ResourcesComponent : Component, IOrganizerComponent { public const string TypeId = "Resources"; - public const string NameId = "resourcesComponent"; + public const string NameId = "resources"; public new const string DescriptionText = "Component that organize Resource types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ResourcesComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ResourcesComponent() { Type = TypeId; } + public ResourcesComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ReturnPotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ReturnPotComponent.g.cs index cc759e38..e4383452 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ReturnPotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ReturnPotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552257200_872757_2664 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ReturnPotComponent : Component { public const string TypeId = "ReturnPot"; - public const string NameId = "returnPotComponent"; + public const string NameId = "returnPot"; public new const string DescriptionText = "Leaf Component that is a Pot for a tool that has been removed from spindle or Turret and awaiting for return to a ToolMagazine."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ReturnPotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ReturnPotComponent() { Type = TypeId; } + public ReturnPotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/RotaryComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/RotaryComponent.g.cs index cee98222..cf37802f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/RotaryComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/RotaryComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382015_53595_42288 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class RotaryComponent : Component { public const string TypeId = "Rotary"; - public const string NameId = "rotaryComponent"; + public const string NameId = "rotary"; public new const string DescriptionText = "Component Axis that provides rotation about a fixed axis."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class RotaryComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public RotaryComponent() { Type = TypeId; } + public RotaryComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SensingElementComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SensingElementComponent.g.cs index 17cab9fc..a13e7ba5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SensingElementComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SensingElementComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106474_940737_44450 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SensingElementComponent : Component { public const string TypeId = "SensingElement"; - public const string NameId = "sensingElementComponent"; + public const string NameId = "sensingElement"; public new const string DescriptionText = "Leaf Component that provides a signal or measured value."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SensingElementComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public SensingElementComponent() { Type = TypeId; } + public SensingElementComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SensorComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SensorComponent.g.cs index 44a2e1ff..a6c10854 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SensorComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SensorComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382017_874684_42291 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SensorComponent : Component { public const string TypeId = "Sensor"; - public const string NameId = "sensorComponent"; + public const string NameId = "sensor"; public new const string DescriptionText = "Component that responds to a physical stimulus and transmits a resulting impulse or value from a sensing unit."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SensorComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version12; - public SensorComponent() { Type = TypeId; } + public SensorComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SpindleComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SpindleComponent.g.cs index 1a5be012..57589cbe 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SpindleComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SpindleComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_4_45f01b9_1643678227814_87818_1410 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SpindleComponent : Component { public const string TypeId = "Spindle"; - public const string NameId = "spindleComponent"; + public const string NameId = "spindle"; public new const string DescriptionText = "Component that provides an axis of rotation for the purpose of rapidly rotating a part or a tool to provide sufficient surface speed for cutting operations.Spindle was **DEPRECATED** in *MTConnect Version 1.1* and was replaced by RotaryMode."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SpindleComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public SpindleComponent() { Type = TypeId; } + public SpindleComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SpreaderComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SpreaderComponent.g.cs index 27c178a8..20f6edae 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SpreaderComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SpreaderComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106475_909781_44453 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SpreaderComponent : Component { public const string TypeId = "Spreader"; - public const string NameId = "spreaderComponent"; + public const string NameId = "spreader"; public new const string DescriptionText = "Leaf Component that flattens or spreading materials."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SpreaderComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public SpreaderComponent() { Type = TypeId; } + public SpreaderComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StagingPotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StagingPotComponent.g.cs index 989e894e..7136609b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StagingPotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StagingPotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552257626_405215_2680 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StagingPotComponent : Component { public const string TypeId = "StagingPot"; - public const string NameId = "stagingPotComponent"; + public const string NameId = "stagingPot"; public new const string DescriptionText = "Leaf Component that is a Pot for a tool that is awaiting transfer to a ToolMagazine or Turret from outside of the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StagingPotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public StagingPotComponent() { Type = TypeId; } + public StagingPotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StationComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StationComponent.g.cs index 056bb006..f33f129c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StationComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StationComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552257415_810787_2672 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StationComponent : Component { public const string TypeId = "Station"; - public const string NameId = "stationComponent"; + public const string NameId = "station"; public new const string DescriptionText = "Leaf Component composed of a storage or mounting location for a tool associated with a Turret, GangToolBar, or ToolRack."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StationComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public StationComponent() { Type = TypeId; } + public StationComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StockComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StockComponent.g.cs index 032f3f48..9256c266 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StockComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StockComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382018_505205_42294 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StockComponent : Component { public const string TypeId = "Stock"; - public const string NameId = "stockComponent"; + public const string NameId = "stock"; public new const string DescriptionText = "Material that is used in a manufacturing process and to which work is applied in a machine or piece of equipment to produce parts."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StockComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version13; - public StockComponent() { Type = TypeId; } + public StockComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StorageBatteryComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StorageBatteryComponent.g.cs index c7c7d5c4..3671200c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StorageBatteryComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StorageBatteryComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106475_664974_44456 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StorageBatteryComponent : Component { public const string TypeId = "StorageBattery"; - public const string NameId = "storageBatteryComponent"; + public const string NameId = "storageBattery"; public new const string DescriptionText = "Leaf Component composed of one or more cells in which chemical energy is converted into electricity and used as a source of power."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StorageBatteryComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public StorageBatteryComponent() { Type = TypeId; } + public StorageBatteryComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StructureComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StructureComponent.g.cs index d639e9a8..f2c8392b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StructureComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StructureComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1587597358521_716746_1028 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StructureComponent : Component { public const string TypeId = "Structure"; - public const string NameId = "structureComponent"; + public const string NameId = "structure"; public new const string DescriptionText = "Component composed of part(s) comprising the rigid bodies of the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StructureComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public StructureComponent() { Type = TypeId; } + public StructureComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/StructuresComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/StructuresComponent.g.cs index a916f5d1..aa9b63a7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/StructuresComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/StructuresComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607371600474_90853_450 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class StructuresComponent : Component, IOrganizerComponent { public const string TypeId = "Structures"; - public const string NameId = "structuresComponent"; + public const string NameId = "structures"; public new const string DescriptionText = "Component that organize Structure types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class StructuresComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version17; - public StructuresComponent() { Type = TypeId; } + public StructuresComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SwitchComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SwitchComponent.g.cs index 8ef65fe6..b7b33f01 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SwitchComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SwitchComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106476_558459_44459 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SwitchComponent : Component { public const string TypeId = "Switch"; - public const string NameId = "switchComponent"; + public const string NameId = "switch"; public new const string DescriptionText = "Leaf Component that turns on or off an electric current or makes or breaks a circuit."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SwitchComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public SwitchComponent() { Type = TypeId; } + public SwitchComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SystemComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SystemComponent.g.cs index 20067806..26b54a10 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SystemComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SystemComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382020_336298_42297 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public abstract class SystemComponent : Component { public const string TypeId = "System"; - public const string NameId = "systemComponent"; + public const string NameId = "system"; public new const string DescriptionText = "Abstract Component that is permanently integrated into the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public abstract class SystemComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version11; - public SystemComponent() { Type = TypeId; } + public SystemComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/SystemsComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/SystemsComponent.g.cs index 228a8873..c980ee39 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/SystemsComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/SystemsComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1607344852741_562899_1488 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class SystemsComponent : Component, IOrganizerComponent { public const string TypeId = "Systems"; - public const string NameId = "systemsComponent"; + public const string NameId = "systems"; public new const string DescriptionText = "Component that organize System types."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class SystemsComponent : Component, IOrganizerComponent public override System.Version MinimumVersion => MTConnectVersions.Version11; - public SystemsComponent() { Type = TypeId; } + public SystemsComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TableComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TableComponent.g.cs index d77a6048..b4e40481 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TableComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TableComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106476_995417_44462 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TableComponent : Component { public const string TypeId = "Table"; - public const string NameId = "tableComponent"; + public const string NameId = "table"; public new const string DescriptionText = "Leaf Component composed of a surface for holding an object or material."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TableComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public TableComponent() { Type = TypeId; } + public TableComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TankComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TankComponent.g.cs index 29c64612..e552edad 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TankComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TankComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106477_651135_44465 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TankComponent : Component { public const string TypeId = "Tank"; - public const string NameId = "tankComponent"; + public const string NameId = "tank"; public new const string DescriptionText = "Leaf Component composed of a receptacle or container that holds material."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TankComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public TankComponent() { Type = TypeId; } + public TankComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TensionerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TensionerComponent.g.cs index 7634fedf..c322187d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TensionerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TensionerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106477_119326_44468 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TensionerComponent : Component { public const string TypeId = "Tensioner"; - public const string NameId = "tensionerComponent"; + public const string NameId = "tensioner"; public new const string DescriptionText = "Leaf Component that provides or applies a stretch or strain to another mechanism."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TensionerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public TensionerComponent() { Type = TypeId; } + public TensionerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ThermostatComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ThermostatComponent.g.cs index 7fff9a17..c26a1d16 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ThermostatComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ThermostatComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_4_45f01b9_1643678703742_369144_1539 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ThermostatComponent : Component { public const string TypeId = "Thermostat"; - public const string NameId = "thermostatComponent"; + public const string NameId = "thermostat"; public new const string DescriptionText = "Component composed of a sensor or an instrument that measures temperature.Thermostat was **DEPRECATED** in *MTConnect Version 1.2* and was replaced by Temperature."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ThermostatComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public ThermostatComponent() { Type = TypeId; } + public ThermostatComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ToolMagazineComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ToolMagazineComponent.g.cs index 5d238bab..5384aee8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ToolMagazineComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ToolMagazineComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605551866030_769452_2402 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ToolMagazineComponent : Component { public const string TypeId = "ToolMagazine"; - public const string NameId = "toolMagazineComponent"; + public const string NameId = "toolMagazine"; public new const string DescriptionText = "ToolingDelivery composed of a tool storage mechanism that holds any number of tools."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ToolMagazineComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ToolMagazineComponent() { Type = TypeId; } + public ToolMagazineComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ToolRackComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ToolRackComponent.g.cs index 22115ccf..0199dee8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ToolRackComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ToolRackComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605551899241_174607_2546 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ToolRackComponent : Component { public const string TypeId = "ToolRack"; - public const string NameId = "toolRackComponent"; + public const string NameId = "toolRack"; public new const string DescriptionText = "ToolingDelivery composed of a linear or matrixed tool storage mechanism that holds any number of tools."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ToolRackComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public ToolRackComponent() { Type = TypeId; } + public ToolRackComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ToolingDeliveryComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ToolingDeliveryComponent.g.cs index f25cf6c2..34be3aae 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ToolingDeliveryComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ToolingDeliveryComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382021_741508_42300 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ToolingDeliveryComponent : Component { public const string TypeId = "ToolingDelivery"; - public const string NameId = "toolingDeliveryComponent"; + public const string NameId = "toolingDelivery"; public new const string DescriptionText = "Auxiliary that manages, positions, stores, and delivers tooling within a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ToolingDeliveryComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ToolingDeliveryComponent() { Type = TypeId; } + public ToolingDeliveryComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TransferArmComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TransferArmComponent.g.cs index d47f1328..cdb4dc9d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TransferArmComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TransferArmComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552257830_675148_2688 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TransferArmComponent : Component { public const string TypeId = "TransferArm"; - public const string NameId = "transferArmComponent"; + public const string NameId = "transferArm"; public new const string DescriptionText = "Leaf Component that physically moves a tool from one location to another."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TransferArmComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public TransferArmComponent() { Type = TypeId; } + public TransferArmComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TransferPotComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TransferPotComponent.g.cs index 66fe9cd2..9279c856 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TransferPotComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TransferPotComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605552258190_552410_2704 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TransferPotComponent : Component { public const string TypeId = "TransferPot"; - public const string NameId = "transferPotComponent"; + public const string NameId = "transferPot"; public new const string DescriptionText = "Leaf Component that is a Pot for a tool that is awaiting transfer from a ToolMagazine to spindle or Turret."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TransferPotComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public TransferPotComponent() { Type = TypeId; } + public TransferPotComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TransformerComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TransformerComponent.g.cs index 2a80316e..7a3a3807 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TransformerComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TransformerComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106478_840214_44471 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TransformerComponent : Component { public const string TypeId = "Transformer"; - public const string NameId = "transformerComponent"; + public const string NameId = "transformer"; public new const string DescriptionText = "Leaf Component that transforms electric energy from a source to a secondary circuit."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TransformerComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public TransformerComponent() { Type = TypeId; } + public TransformerComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/TurretComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/TurretComponent.g.cs index b58dec7e..194c736b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/TurretComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/TurretComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605551876111_523604_2450 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class TurretComponent : Component { public const string TypeId = "Turret"; - public const string NameId = "turretComponent"; + public const string NameId = "turret"; public new const string DescriptionText = "ToolingDelivery composed of a tool mounting mechanism that holds any number of tools."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class TurretComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public TurretComponent() { Type = TypeId; } + public TurretComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/VacuumComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/VacuumComponent.g.cs index cdef9737..b5283bbc 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/VacuumComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/VacuumComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605116368942_480454_1665 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class VacuumComponent : Component { public const string TypeId = "Vacuum"; - public const string NameId = "vacuumComponent"; + public const string NameId = "vacuum"; public new const string DescriptionText = "System that evacuates gases and liquids from an enclosed and sealed space to a controlled negative pressure or a molecular density below the prevailing atmospheric level."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class VacuumComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version17; - public VacuumComponent() { Type = TypeId; } + public VacuumComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/ValveComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/ValveComponent.g.cs index 6c0d809e..9f20e4eb 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/ValveComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/ValveComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106478_602921_44474 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class ValveComponent : Component { public const string TypeId = "Valve"; - public const string NameId = "valveComponent"; + public const string NameId = "valve"; public new const string DescriptionText = "Leaf Component that halts or controls the flow of a liquid, gas, or other material through a passage, pipe, inlet, or outlet."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class ValveComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public ValveComponent() { Type = TypeId; } + public ValveComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/VatComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/VatComponent.g.cs index 0ef77cb8..820555dc 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/VatComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/VatComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106479_944360_44477 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class VatComponent : Component { public const string TypeId = "Vat"; - public const string NameId = "vatComponent"; + public const string NameId = "vat"; public new const string DescriptionText = "Leaf Component composed of a container that holds liquid or powdered materials."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class VatComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version15; - public VatComponent() { Type = TypeId; } + public VatComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/VibrationComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/VibrationComponent.g.cs index 9ace9760..0c264dbc 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/VibrationComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/VibrationComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_4_45f01b9_1643678730400_947692_1640 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class VibrationComponent : Component { public const string TypeId = "Vibration"; - public const string NameId = "vibrationComponent"; + public const string NameId = "vibration"; public new const string DescriptionText = "Component composed of a sensor or an instrument that measures the amount and/or frequency of vibration within a system.Vibration was **DEPRECATED** in *MTConnect Version 1.2* and was replaced by Displacement, Frequency etc."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class VibrationComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version10; - public VibrationComponent() { Type = TypeId; } + public VibrationComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/WasteDisposalComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/WasteDisposalComponent.g.cs index 290790ad..8e5fd992 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/WasteDisposalComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/WasteDisposalComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579572382023_920799_42303 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class WasteDisposalComponent : Component { public const string TypeId = "WasteDisposal"; - public const string NameId = "wasteDisposalComponent"; + public const string NameId = "wasteDisposal"; public new const string DescriptionText = "Auxiliary that removes manufacturing byproducts from a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class WasteDisposalComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public WasteDisposalComponent() { Type = TypeId; } + public WasteDisposalComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/WaterComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/WaterComponent.g.cs index 8be468f5..545e5c72 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/WaterComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/WaterComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106480_337779_44480 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class WaterComponent : Component { public const string TypeId = "Water"; - public const string NameId = "waterComponent"; + public const string NameId = "water"; public new const string DescriptionText = "Leaf Component composed of $$H_2 O$$."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class WaterComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public WaterComponent() { Type = TypeId; } + public WaterComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/WireComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/WireComponent.g.cs index ee4e19d4..4d310b86 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/WireComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/WireComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580312106480_27284_44483 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class WireComponent : Component { public const string TypeId = "Wire"; - public const string NameId = "wireComponent"; + public const string NameId = "wire"; public new const string DescriptionText = "Leaf Component composed of a string like piece or filament of relatively rigid or flexible material provided in a variety of diameters."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class WireComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version14; - public WireComponent() { Type = TypeId; } + public WireComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/WorkEnvelopeComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/WorkEnvelopeComponent.g.cs index 98e35ab1..6df1ea1e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/WorkEnvelopeComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/WorkEnvelopeComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_91b028d_1587649840347_727529_300 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class WorkEnvelopeComponent : Component { public const string TypeId = "WorkEnvelope"; - public const string NameId = "workEnvelopeComponent"; + public const string NameId = "workEnvelope"; public new const string DescriptionText = "System composed of the physical process execution space within a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class WorkEnvelopeComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version16; - public WorkEnvelopeComponent() { Type = TypeId; } + public WorkEnvelopeComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Components/WorkpieceComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/Components/WorkpieceComponent.g.cs index e471c4ee..454402c8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Components/WorkpieceComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Components/WorkpieceComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_91b028d_1587650651134_415529_403 @@ -11,7 +11,7 @@ namespace MTConnect.Devices.Components public class WorkpieceComponent : Component { public const string TypeId = "Workpiece"; - public const string NameId = "workpieceComponent"; + public const string NameId = "workpiece"; public new const string DescriptionText = "Leaf Component composed of an object or material on which a form of work is performed."; public override string TypeDescription => DescriptionText; @@ -19,6 +19,10 @@ public class WorkpieceComponent : Component public override System.Version MinimumVersion => MTConnectVersions.Version16; - public WorkpieceComponent() { Type = TypeId; } + public WorkpieceComponent() + { + Type = TypeId; + Name = NameId; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Composition.cs b/libraries/MTConnect.NET-Common/Devices/Composition.cs index 5b872802..edb38e66 100644 --- a/libraries/MTConnect.NET-Common/Devices/Composition.cs +++ b/libraries/MTConnect.NET-Common/Devices/Composition.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Extensions; @@ -83,11 +83,22 @@ public string Hash public virtual Version MinimumVersion => DefaultMinimumVersion; - public Composition() + public string DataItemIdFormat { get; set; } + + public string CompositionIdFormat { get; set; } + + public string ComponentIdFormat { get; set; } + + + public Composition() { - Id = StringFunctions.RandomString(10); + //Id = StringFunctions.RandomString(10); DataItems = new List(); - } + + DataItemIdFormat = Component._defaultDataItemIdFormat; + CompositionIdFormat = Component._defaultCompositionIdFormat; + ComponentIdFormat = Component._defaultComponentIdFormat; + } public string GenerateHash() @@ -394,15 +405,54 @@ public IEnumerable GetDataItems() // Add Root DataItems if (!DataItems.IsNullOrEmpty()) l.AddRange(DataItems); + // Add Composition DataItems + if (!Compositions.IsNullOrEmpty()) + { + foreach (var composition in Compositions) + { + if (!composition.DataItems.IsNullOrEmpty()) l.AddRange(composition.DataItems); + } + } + + // Add Component DataItems + if (!Components.IsNullOrEmpty()) + { + foreach (var component in Components) + { + var componentDataItems = GetDataItems(component); + if (!componentDataItems.IsNullOrEmpty()) l.AddRange(componentDataItems); + } + } + return !l.IsNullOrEmpty() ? l : null; } - private IEnumerable GetDataItems(IComposition composition) + private IEnumerable GetDataItems(IComponent component) { var l = new List(); // Add Root DataItems - if (!composition.DataItems.IsNullOrEmpty()) l.AddRange(composition.DataItems); + if (!component.DataItems.IsNullOrEmpty()) l.AddRange(component.DataItems); + + // Add Composition DataItems + if (!component.Compositions.IsNullOrEmpty()) + { + foreach (var composition in component.Compositions) + { + if (!composition.DataItems.IsNullOrEmpty()) l.AddRange(composition.DataItems); + } + } + + // Add SubComponent DataItems + if (!component.Components.IsNullOrEmpty()) + { + // Get SubComponent DataItems + foreach (var subComponent in component.Components) + { + var componentDataItems = GetDataItems(subComponent); + if (!componentDataItems.IsNullOrEmpty()) l.AddRange(componentDataItems); + } + } return !l.IsNullOrEmpty() ? l : null; } @@ -426,7 +476,7 @@ public IDataItem GetDataItemByKey(string dataItemKey) // Check DataItem Source DataItemId if (dataItem == null) dataItem = dataItems.FirstOrDefault(o => o.Source != null && o.Source.DataItemId == dataItemKey); - // Check DataItem Source Value + // Check DataItem Source Result if (dataItem == null) dataItem = dataItems.FirstOrDefault(o => o.Source != null && o.Source.Value == dataItemKey); // Return DataItem @@ -437,6 +487,134 @@ public IDataItem GetDataItemByKey(string dataItemKey) return null; } + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItemByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type and SubType + /// + public IDataItem GetDataItemByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItem(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemByType(typeId, subType, searchType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type + /// + public IEnumerable GetDataItemsByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItemsByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItems(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemsByType(typeId, subType, searchType); + } + } + + return null; + } + /// /// Add a DataItem to the Component @@ -446,6 +624,11 @@ public void AddDataItem(IDataItem dataItem) { if (dataItem != null) { + ((DataItem)dataItem).Container = this; + ((DataItem)dataItem).CompositionId = Id; + + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(dataItem.Id)) Component.ResetId(this, dataItem); + var dataItems = new List(); if (!DataItems.IsNullOrEmpty()) @@ -458,6 +641,60 @@ public void AddDataItem(IDataItem dataItem) } } + /// + /// Add a DataItem to the Component + /// + public void AddDataItem() where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + AddDataItem(dataItem); + } + catch { } + } + } + + /// + /// Add a DataItem to the Component + /// + public void AddDataItem(string name, object subType = null) where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + dataItem.Name = name; + dataItem.SubType = subType?.ToString(); + AddDataItem(dataItem); + } + catch { } + } + } + + /// + /// Add a DataItem to the Component + /// + public void AddDataItem(object subType) where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + dataItem.SubType = subType?.ToString(); + AddDataItem(dataItem); + } + catch { } + } + } + public void AddDataItem(DataItemCategory category, string type, string subType = null, string dataItemId = null) { if (!string.IsNullOrEmpty(type)) @@ -474,15 +711,10 @@ public void AddDataItems(IEnumerable dataItems) { if (!dataItems.IsNullOrEmpty()) { - var newDataItems = new List(); - - if (!DataItems.IsNullOrEmpty()) + foreach (var dataItem in dataItems) { - newDataItems.AddRange(DataItems); + AddDataItem(dataItem); } - - newDataItems.AddRange(dataItems); - DataItems = newDataItems; } } @@ -503,5 +735,6 @@ public void RemoveDataItem(string dataItemId) } #endregion + } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Composition.g.cs b/libraries/MTConnect.NET-Common/Devices/Composition.g.cs index 48ef21f3..fd4b1430 100644 --- a/libraries/MTConnect.NET-Common/Devices/Composition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Composition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1658936424016_561586_139 diff --git a/libraries/MTConnect.NET-Common/Devices/CompositionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/CompositionDescriptions.g.cs index c6ad7b80..e23f0cc0 100644 --- a/libraries/MTConnect.NET-Common/Devices/CompositionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/CompositionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ActuatorComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ActuatorComposition.g.cs index 8a8c150f..67eb9d99 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ActuatorComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ActuatorComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/AmplifierComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/AmplifierComposition.g.cs index ae865ed1..2529e392 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/AmplifierComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/AmplifierComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/BallscrewComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/BallscrewComposition.g.cs index 0e3b46f9..a6218e6c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/BallscrewComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/BallscrewComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/BeltComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/BeltComposition.g.cs index 66ce6773..7325eb99 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/BeltComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/BeltComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/BrakeComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/BrakeComposition.g.cs index 1c12c29c..30afcb7b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/BrakeComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/BrakeComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ChainComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ChainComposition.g.cs index 92c3a018..427d8c1f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ChainComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ChainComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ChopperComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ChopperComposition.g.cs index 50b0096d..1fbac6f4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ChopperComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ChopperComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ChuckComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ChuckComposition.g.cs index 5070de17..9862eeda 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ChuckComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ChuckComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ChuteComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ChuteComposition.g.cs index f679c451..086e7865 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ChuteComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ChuteComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/CircuitBreakerComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/CircuitBreakerComposition.g.cs index bd9f3956..acdda73b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/CircuitBreakerComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/CircuitBreakerComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ClampComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ClampComposition.g.cs index 56453869..b19bfdd5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ClampComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ClampComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/CompressorComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/CompressorComposition.g.cs index c07cb34c..492a8d91 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/CompressorComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/CompressorComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/CoolingTowerComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/CoolingTowerComposition.g.cs index 9c677416..7a074607 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/CoolingTowerComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/CoolingTowerComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/DoorComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/DoorComposition.g.cs index c65f657d..3ae4a7a5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/DoorComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/DoorComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/DrainComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/DrainComposition.g.cs index 04c48893..85c11705 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/DrainComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/DrainComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/EncoderComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/EncoderComposition.g.cs index de6b8a58..26a48aa6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/EncoderComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/EncoderComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ExpiredPotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ExpiredPotComposition.g.cs index 34730c70..a8eeab88 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ExpiredPotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ExpiredPotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ExposureUnitComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ExposureUnitComposition.g.cs index f30dad90..8317f880 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ExposureUnitComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ExposureUnitComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ExtrusionUnitComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ExtrusionUnitComposition.g.cs index 8389837b..532f2b9c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ExtrusionUnitComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ExtrusionUnitComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/FanComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/FanComposition.g.cs index dd6e141f..f4f067ad 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/FanComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/FanComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/FilterComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/FilterComposition.g.cs index 37bbc0ec..54553b20 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/FilterComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/FilterComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/GalvanomotorComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/GalvanomotorComposition.g.cs index 3605d90e..ce45af13 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/GalvanomotorComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/GalvanomotorComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/GripperComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/GripperComposition.g.cs index 6567b81c..25e3f0c6 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/GripperComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/GripperComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/HopperComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/HopperComposition.g.cs index 6ca7156f..f7b975b8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/HopperComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/HopperComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/LinearPositionFeedbackComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/LinearPositionFeedbackComposition.g.cs index 0d657506..25fddfcf 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/LinearPositionFeedbackComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/LinearPositionFeedbackComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/MotorComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/MotorComposition.g.cs index b6882bce..5819d5c3 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/MotorComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/MotorComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/OilComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/OilComposition.g.cs index 9b6f4036..c182521a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/OilComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/OilComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/PotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/PotComposition.g.cs index cff55d02..0d803cc1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/PotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/PotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/PowerSupplyComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/PowerSupplyComposition.g.cs index bf98de29..96d52338 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/PowerSupplyComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/PowerSupplyComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/PulleyComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/PulleyComposition.g.cs index 3f72e752..c2f5d7b1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/PulleyComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/PulleyComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/PumpComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/PumpComposition.g.cs index e482ed19..2dbe0e3f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/PumpComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/PumpComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ReelComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ReelComposition.g.cs index dd202d14..6c3c6b53 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ReelComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ReelComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/RemovalPotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/RemovalPotComposition.g.cs index 0ea08226..a8fcaecb 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/RemovalPotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/RemovalPotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ReturnPotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ReturnPotComposition.g.cs index d30787a8..8bd32eea 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ReturnPotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ReturnPotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/SensingElementComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/SensingElementComposition.g.cs index 8ced2bd8..17ce6a3a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/SensingElementComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/SensingElementComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/SpreaderComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/SpreaderComposition.g.cs index ea730118..a3a7870e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/SpreaderComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/SpreaderComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/StagingPotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/StagingPotComposition.g.cs index da6fb3c4..e5e48327 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/StagingPotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/StagingPotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/StationComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/StationComposition.g.cs index e4a8b5c4..5107592a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/StationComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/StationComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/StorageBatteryComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/StorageBatteryComposition.g.cs index da5c8b47..2a32b3f3 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/StorageBatteryComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/StorageBatteryComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/SwitchComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/SwitchComposition.g.cs index d519050a..5ff5f9c2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/SwitchComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/SwitchComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TableComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TableComposition.g.cs index 10ec1a0f..68f195c0 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TableComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TableComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TankComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TankComposition.g.cs index c1cb458d..9366232c 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TankComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TankComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TensionerComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TensionerComposition.g.cs index 6741849d..e52fc76d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TensionerComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TensionerComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TransferArmComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TransferArmComposition.g.cs index 878e4ea1..aa4f7ad8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TransferArmComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TransferArmComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TransferPotComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TransferPotComposition.g.cs index ce1f551a..ae225469 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TransferPotComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TransferPotComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/TransformerComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/TransformerComposition.g.cs index 6ae16be2..9b6ec9a5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/TransformerComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/TransformerComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/ValveComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/ValveComposition.g.cs index d93cf7f9..b2d2dbed 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/ValveComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/ValveComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/VatComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/VatComposition.g.cs index bd2ed947..f87fc12b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/VatComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/VatComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/WaterComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/WaterComposition.g.cs index 8d740f53..17443205 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/WaterComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/WaterComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/WireComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/WireComposition.g.cs index 7c2e85a6..dbfb43ab 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/WireComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/WireComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Compositions/WorkpieceComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/Compositions/WorkpieceComposition.g.cs index f14d5875..0f119423 100644 --- a/libraries/MTConnect.NET-Common/Devices/Compositions/WorkpieceComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Compositions/WorkpieceComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Compositions diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimits.g.cs index 6e72bd2e..4baebc10 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605643893577_939623_1049 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimitsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimitsDescriptions.g.cs index 027bf0ce..c116bf7f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimitsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/AlarmLimitsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationship.g.cs index 56df8d53..c9eb7c53 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1658942745281_216676_1135 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationshipDescriptions.g.cs index 595a8c57..7448e78f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/AssetRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Channel.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Channel.g.cs index b39d451e..b4e2fd11 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Channel.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Channel.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_82C852E8_47AD_4b8c_804D_F38FCA663918 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ChannelDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ChannelDescriptions.g.cs index 819d9f00..3c961a5d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ChannelDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ChannelDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationship.g.cs index 15a0d511..5a9fb86d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_2D0A9D8F_2538_4f46_8B83_6B1988818511 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationshipDescriptions.g.cs index ee5ce603..0ed6b1f3 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ComponentRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Configuration.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Configuration.g.cs index a67adb2f..7267090a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Configuration.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Configuration.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_C04DCC77_16E8_4cef_92D4_B777AFC52570 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationDescriptions.g.cs index 6dfc830d..fa0cc198 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationship.g.cs index ffa6a6d7..3c0be2ed 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_28132294_DF39_4e8e_8AE5_B79565F991A2 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationshipDescriptions.g.cs index 72a6195b..4c79f119 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ConfigurationRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimits.g.cs index 1e2e9e7a..3be0c334 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605643876416_54094_959 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimitsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimitsDescriptions.g.cs index 7fb53c57..5483bcd7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimitsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ControlLimitsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystem.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystem.g.cs index 94c298b8..d661159b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579100679936_1279_16310 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemDescriptions.g.cs index 076d4fe0..2dd77cf7 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemType.g.cs index 4fb510d3..46783528 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemTypeDescriptions.g.cs index 5ac570a0..64aa4886 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CoordinateSystemTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityType.g.cs index 3ba8e879..3632d0dd 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityTypeDescriptions.g.cs index a3fe1cc4..0624769d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/CriticalityTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationship.g.cs index feeb22aa..a9d5f62b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_E20AAF35_BE17_40e8_8701_D2D7676EDC69 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationshipDescriptions.g.cs index 71163c1f..50e5aed0 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/DeviceRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IAlarmLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IAlarmLimits.g.cs index 91d7ddfc..706d72fa 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IAlarmLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IAlarmLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IAssetRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IAssetRelationship.g.cs index 736331fc..7fcaf54e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IAssetRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IAssetRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IChannel.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IChannel.g.cs index a0a90ddd..0e9e06c0 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IChannel.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IChannel.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IComponentRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IComponentRelationship.g.cs index 290bc316..6d948ef0 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IComponentRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IComponentRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IConfiguration.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IConfiguration.g.cs index 5ba5dc58..c9f213a9 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IConfiguration.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IConfiguration.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IConfigurationRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IConfigurationRelationship.g.cs index 9fbae9ae..dc9a0bf1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IConfigurationRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IConfigurationRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IControlLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IControlLimits.g.cs index 2cbfc061..7e946381 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IControlLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IControlLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ICoordinateSystem.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ICoordinateSystem.g.cs index dd001f32..22f10e3a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ICoordinateSystem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ICoordinateSystem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IDeviceRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IDeviceRelationship.g.cs index 8b3310a9..c5b4140a 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IDeviceRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IDeviceRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IImageFile.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IImageFile.g.cs index 36838e64..ca968ef2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IImageFile.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IImageFile.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IMotion.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IMotion.g.cs index 5347b17d..735fbcff 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IMotion.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IMotion.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/IProcessSpecification.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/IProcessSpecification.g.cs index 2e4a9bf6..f3e88828 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/IProcessSpecification.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/IProcessSpecification.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ISensorConfiguration.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ISensorConfiguration.g.cs index 2d0521c5..6167a24d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ISensorConfiguration.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ISensorConfiguration.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ISolidModel.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ISolidModel.g.cs index 7e868926..e3fb26fa 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ISolidModel.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ISolidModel.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs index 1c0c007a..b1aa99a2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecificationLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecificationLimits.g.cs index e4582969..7f188f3f 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecificationLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ISpecificationLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ITransformation.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ITransformation.g.cs index 21d10c43..999000f9 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ITransformation.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ITransformation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFile.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFile.g.cs index a2fdf345..49d4b71b 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFile.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFile.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1677585025728_765757_660 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFileDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFileDescriptions.g.cs index b20961f7..efb0ef99 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFileDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ImageFileDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MediaType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MediaType.g.cs index d76a0942..a8537797 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MediaType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MediaType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MediaTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MediaTypeDescriptions.g.cs index 01b9da93..b3b338ee 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MediaTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MediaTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Motion.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Motion.g.cs index 6f0fb30a..78965441 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Motion.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Motion.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_1F084FBF_2AC7_41f6_8485_C356E6D7A9C1 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationType.g.cs index 161294cb..600151ab 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationTypeDescriptions.g.cs index 573a5c9a..6bd7c1e2 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionActuationTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionDescriptions.g.cs index 8ee3c10d..7d680ee4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionType.g.cs index 7ce7c52c..9828c8a8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionTypeDescriptions.g.cs index 75711f89..1aa83dd8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/MotionTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/MotionTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Originator.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Originator.g.cs index d22b4392..453abdf4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Originator.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Originator.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/OriginatorDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/OriginatorDescriptions.g.cs index 1a44a327..cf2791b4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/OriginatorDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/OriginatorDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecification.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecification.g.cs index 00c00e13..1d1da505 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecification.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecification.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605643801279_773776_859 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecificationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecificationDescriptions.g.cs index 22fac903..02a99f77 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecificationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/ProcessSpecificationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipType.g.cs index e970207c..dc32041e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipTypeDescriptions.g.cs index 34ddb5b0..5538af00 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/RelationshipTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/RoleType.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/RoleType.g.cs index d4abc1ca..0b945e35 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/RoleType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/RoleType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/RoleTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/RoleTypeDescriptions.g.cs index a4e09da9..e14d9111 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/RoleTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/RoleTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfiguration.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfiguration.g.cs index 9731db2e..a5760b26 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfiguration.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfiguration.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_1DD02014_D949_43cc_A79F_FF2C0AF0DFBE diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfigurationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfigurationDescriptions.g.cs index 59ee7577..1900f212 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfigurationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SensorConfigurationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModel.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModel.g.cs index f1a92b78..9ab05ed8 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModel.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModel.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1587596157073_106480_480 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModelDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModelDescriptions.g.cs index 7933d3c8..57f34029 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModelDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SolidModelDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs index 18f24228..7d0e473e 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1580315898400_607214_47155 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationDescriptions.g.cs index c47f8094..985db2f5 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimits.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimits.g.cs index f7e6d0d6..4226f329 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605643883082_895051_1004 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimitsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimitsDescriptions.g.cs index 237449b8..d2a17a8d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimitsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/SpecificationLimitsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/Transformation.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/Transformation.g.cs index 2d875e01..49b4e005 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/Transformation.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/Transformation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1579103900791_417826_16362 diff --git a/libraries/MTConnect.NET-Common/Devices/Configurations/TransformationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/Configurations/TransformationDescriptions.g.cs index 475bc07f..caf7b8c1 100644 --- a/libraries/MTConnect.NET-Common/Devices/Configurations/TransformationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Configurations/TransformationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.Configurations diff --git a/libraries/MTConnect.NET-Common/Devices/Constraints.g.cs b/libraries/MTConnect.NET-Common/Devices/Constraints.g.cs index 8ae6a4a0..d5a0d721 100644 --- a/libraries/MTConnect.NET-Common/Devices/Constraints.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Constraints.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_E6F955EB_46CA_4c72_B547_8F4465A9620A diff --git a/libraries/MTConnect.NET-Common/Devices/ConstraintsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/ConstraintsDescriptions.g.cs index 20ab4d97..1ae6daae 100644 --- a/libraries/MTConnect.NET-Common/Devices/ConstraintsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/ConstraintsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItem.g.cs index 76108fd9..7d3c90a0 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_002C94B7_1257_49be_8EAA_CE7FCD7AFF8A diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemCategory.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemCategory.g.cs index 2f9a3b37..66197bc8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemCategory.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemCategory.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemCategoryDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemCategoryDescriptions.g.cs index cb26b110..94c81851 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemCategoryDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemCategoryDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystem.g.cs index 22b46cce..85a2f82d 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystemDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystemDescriptions.g.cs index 5feb8d47..a0c7a35f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystemDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemCoordinateSystemDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemDefinition.g.cs index d119e4cf..3de57b38 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1581433165009_756087_158 diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemDefinitionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemDefinitionDescriptions.g.cs index 2ecd41c9..a610524f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemDefinitionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemDefinitionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemDescriptions.g.cs index 2346ddc9..6bdee900 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemFilterType.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemFilterType.g.cs index 573b6c3e..786051e6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemFilterType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemFilterType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemFilterTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemFilterTypeDescriptions.g.cs index e34f385c..0e562f48 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemFilterTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemFilterTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRelationship.g.cs index 3895d55d..a0d82652 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605645474430_802116_2875 diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipDescriptions.g.cs index 65b1d6b4..76fd462c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipType.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipType.g.cs index 4f4cc1b5..8a5bf5ce 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipTypeDescriptions.g.cs index e2708dfa..a769c20b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRelationshipTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRepresentation.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRepresentation.g.cs index 499a074b..9bb4e732 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRepresentation.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRepresentation.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemRepresentationDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemRepresentationDescriptions.g.cs index efae86aa..0a35b543 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemRepresentationDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemRepresentationDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemResetTrigger.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemResetTrigger.g.cs index 16a99c8a..b9a36163 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemResetTrigger.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemResetTrigger.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemResetTriggerDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemResetTriggerDescriptions.g.cs index 6db5d2c6..0cbf0fd5 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemResetTriggerDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemResetTriggerDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemStatistic.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemStatistic.g.cs index a83fadd1..5e08671f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemStatistic.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemStatistic.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItemStatisticDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItemStatisticDescriptions.g.cs index fda0c12d..169e052f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItemStatisticDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItemStatisticDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs index ed1aabbd..bf2126ff 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AccelerationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AccelerationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ACCELERATION"; 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."; @@ -42,6 +43,8 @@ public AccelerationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs index c2906d05..8e4f8e50 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AccumulatedTimeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AccumulatedTimeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ACCUMULATED_TIME"; public const string NameId = "accumulatedTime"; + public const string DefaultUnits = Devices.Units.SECOND; public new const string DescriptionText = "Accumulated time for an activity or event."; @@ -23,6 +24,8 @@ public AccumulatedTimeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public AccumulatedTimeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs index 5336e5b5..2dc1dcb7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ActivationCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ActivationCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ACTIVATION_COUNT"; public const string NameId = "activationCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; 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."; @@ -67,6 +68,8 @@ public ActivationCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs index 716c6208..90a20ee4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ActiveAxesDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ActiveAxesDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ACTIVE_AXES"; public const string NameId = "activeAxes"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Set of axes currently associated with a Path or Controller."; @@ -23,6 +24,8 @@ public ActiveAxesDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ActiveAxesDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs index c0505b52..270ecb95 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ActuatorDataItem : DataItem public const string TypeId = "ACTUATOR"; public const string NameId = "actuator"; + public new const string DescriptionText = "Indication of a fault associated with an actuator."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ActuatorDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ActuatorDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs index 9b976ea9..d9c10c59 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ActuatorStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ActuatorStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ACTUATOR_STATE"; public const string NameId = "actuatorState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Operational state of an apparatus for moving or controlling a mechanism or system."; @@ -23,6 +24,8 @@ public ActuatorStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ActuatorStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs index d125061d..3917fec7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterSoftwareVersionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AdapterSoftwareVersionDataItem : DataItem public const string TypeId = "ADAPTER_SOFTWARE_VERSION"; public const string NameId = "adapterSoftwareVersion"; + public new const string DescriptionText = "Originator’s software version of the adapter."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public AdapterSoftwareVersionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public AdapterSoftwareVersionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs index fe60ae75..99ac5e51 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AdapterUriDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AdapterUriDataItem : DataItem public const string TypeId = "ADAPTER_URI"; public const string NameId = "adapterUri"; + public new const string DescriptionText = "URI of the adapter."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public AdapterUriDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public AdapterUriDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs index 54f3e560..3ddc332a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AlarmDataItem : DataItem public const string TypeId = "ALARM"; public const string NameId = "alarm"; + public new const string DescriptionText = "**DEPRECATED:** Replaced with `CONDITION` category data items in Version 1.1.0."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public AlarmDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public AlarmDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs index 93fd7be9..54c9a35e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AlarmLimitDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AlarmLimitDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ALARM_LIMIT"; public const string NameId = "alarmLimit"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Set of limits used to trigger warning or alarm indicators."; @@ -23,6 +24,8 @@ public AlarmLimitDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AlarmLimitDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs index 83d779e3..10a404d9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageACDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AmperageACDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "AMPERAGE_AC"; 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."; @@ -42,6 +43,8 @@ public AmperageACDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs index 829cf281..f17fc224 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDCDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AmperageDCDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "AMPERAGE_DC"; public const string NameId = "amperageDc"; + public const string DefaultUnits = Devices.Units.AMPERE; public new const string DescriptionText = "Electric current flowing in one direction only."; @@ -42,6 +43,8 @@ public AmperageDCDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs index b681193c..6c973644 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AmperageDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AmperageDataItem : DataItem public const string TypeId = "AMPERAGE"; 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`."; public override string TypeDescription => DescriptionText; @@ -47,6 +48,8 @@ public AmperageDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs index 80bcc1bb..0adbda33 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AngleDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AngleDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ANGLE"; public const string NameId = "angle"; + public const string DefaultUnits = Devices.Units.DEGREE; public new const string DescriptionText = "Angular position."; @@ -37,6 +38,8 @@ public AngleDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs index bfe156e0..889cc588 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularAccelerationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AngularAccelerationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ANGULAR_ACCELERATION"; 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."; @@ -42,6 +43,8 @@ public AngularAccelerationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs index 1fedb3b4..310797a6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularDecelerationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AngularDecelerationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ANGULAR_DECELERATION"; 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."; @@ -42,6 +43,8 @@ public AngularDecelerationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs index dcbea51e..70935969 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AngularVelocityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AngularVelocityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ANGULAR_VELOCITY"; 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."; @@ -23,6 +24,8 @@ public AngularVelocityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public AngularVelocityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs index 21cf6acf..9718e385 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ApplicationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ApplicationDataItem : DataItem public const string TypeId = "APPLICATION"; public const string NameId = "application"; + public new const string DescriptionText = "Application on a Component."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public ApplicationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs index a4531070..25cbe3fe 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetChangedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AssetChangedDataItem : DataItem public const string TypeId = "ASSET_CHANGED"; public const string NameId = "assetChanged"; + public new const string DescriptionText = "AssetId of the Asset that has been added or changed."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public AssetChangedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public AssetChangedDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs index 38914dbd..f9c0d265 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AssetCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ASSET_COUNT"; public const string NameId = "assetCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Data set of the number of Asset of a given type for a Device."; @@ -23,6 +24,8 @@ public AssetCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AssetCountDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs index 5e231fe7..db6c6076 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetRemovedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class AssetRemovedDataItem : DataItem public const string TypeId = "ASSET_REMOVED"; public const string NameId = "assetRemoved"; + public new const string DescriptionText = "AssetId of the Asset that has been removed."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public AssetRemovedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public AssetRemovedDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs index 359a6e8b..d4f0afed 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AssetUpdateRateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AssetUpdateRateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ASSET_UPDATE_RATE"; 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."; @@ -23,6 +24,8 @@ public AssetUpdateRateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public AssetUpdateRateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs index f20fd6cf..1d227a63 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AvailabilityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AvailabilityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "AVAILABILITY"; public const string NameId = "availability"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Agent's ability to communicate with the data source."; @@ -23,6 +24,8 @@ public AvailabilityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AvailabilityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs index c0cd4103..9a7f993f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisCouplingDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AxisCouplingDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "AXIS_COUPLING"; public const string NameId = "axisCoupling"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; 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."; @@ -23,6 +24,8 @@ public AxisCouplingDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AxisCouplingDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs index dc49fdc7..21bc5600 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AxisFeedrateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "AXIS_FEEDRATE"; public const string NameId = "axisFeedrate"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND; public new const string DescriptionText = "Feedrate of a linear axis."; @@ -57,6 +58,8 @@ public AxisFeedrateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -70,6 +73,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs index 68c1340c..aee56801 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisFeedrateOverrideDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AxisFeedrateOverrideDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "AXIS_FEEDRATE_OVERRIDE"; public const string NameId = "axisFeedrateOverride"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Value of a signal or calculation issued to adjust the feedrate of an individual linear type axis."; @@ -42,6 +43,8 @@ public AxisFeedrateOverrideDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs index 018731a3..3944d70b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisInterlockDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AxisInterlockDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "AXIS_INTERLOCK"; public const string NameId = "axisInterlock"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of the axis lockout function when power has been removed and the axis is allowed to move freely."; @@ -23,6 +24,8 @@ public AxisInterlockDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AxisInterlockDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs index 5be5c2e2..ec607536 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/AxisStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class AxisStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "AXIS_STATE"; public const string NameId = "axisState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of a Linear or Rotary component representing an axis."; @@ -23,6 +24,8 @@ public AxisStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public AxisStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs index c34fc183..a2e919f4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryCapacityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class BatteryCapacityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "BATTERY_CAPACITY"; 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."; @@ -37,6 +38,8 @@ public BatteryCapacityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs index b7d670bf..fe8b7ca3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryChargeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class BatteryChargeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "BATTERY_CHARGE"; 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."; @@ -37,6 +38,8 @@ public BatteryChargeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs index 1cdec5e0..f6daa197 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/BatteryStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class BatteryStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "BATTERY_STATE"; public const string NameId = "batteryState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Present status of the battery."; @@ -23,6 +24,8 @@ public BatteryStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public BatteryStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs index 0cf4f2fe..33c469d6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/BlockCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class BlockCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "BLOCK_COUNT"; public const string NameId = "blockCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Total count of the number of blocks of program code that have been executed since execution started."; @@ -23,6 +24,8 @@ public BlockCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public BlockCountDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs index c46f337e..bbeeeca3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/BlockDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class BlockDataItem : DataItem public const string TypeId = "BLOCK"; public const string NameId = "block"; + public new const string DescriptionText = "Line of code or command being executed by a Controller entity."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public BlockDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public BlockDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs index 5ddb0b3e..1331e67e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CapacityFluidDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CapacityFluidDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CAPACITY_FLUID"; public const string NameId = "capacityFluid"; + public const string DefaultUnits = Devices.Units.MILLILITER; public new const string DescriptionText = "Fluid capacity of an object or container."; @@ -23,6 +24,8 @@ public CapacityFluidDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public CapacityFluidDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CapacitySpatialDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CapacitySpatialDataItem.g.cs index 59106fb9..06320982 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CapacitySpatialDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CapacitySpatialDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CapacitySpatialDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CAPACITY_SPATIAL"; public const string NameId = "capacitySpatial"; + public const string DefaultUnits = Devices.Units.CUBIC_MILLIMETER; public new const string DescriptionText = "Geometric capacity of an object or container."; @@ -23,6 +24,8 @@ public CapacitySpatialDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public CapacitySpatialDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicPersistentIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicPersistentIdDataItem.g.cs index f8fd151e..9d6c2632 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicPersistentIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicPersistentIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CharacteristicPersistentIdDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CHARACTERISTIC_PERSISTENT_ID"; public const string NameId = "characteristicPersistentId"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "UUID of the characteristic."; @@ -23,6 +24,8 @@ public CharacteristicPersistentIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public CharacteristicPersistentIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicStatusDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicStatusDataItem.g.cs index 53c4a747..ab05f294 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicStatusDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CharacteristicStatusDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CharacteristicStatusDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CHARACTERISTIC_STATUS"; public const string NameId = "characteristicStatus"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Pass/fail result of the measurement."; @@ -23,6 +24,8 @@ public CharacteristicStatusDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public CharacteristicStatusDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ChargeRateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ChargeRateDataItem.g.cs index 9a57fbf2..0b6dd69e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ChargeRateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ChargeRateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ChargeRateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CHARGE_RATE"; public const string NameId = "chargeRate"; + public const string DefaultUnits = Devices.Units.AMPERE; public new const string DescriptionText = "Value of the current being supplied to the Component for the purpose of charging."; @@ -37,6 +38,8 @@ public ChargeRateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckInterlockDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckInterlockDataItem.g.cs index 16093397..a38c2d85 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckInterlockDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckInterlockDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ChuckInterlockDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CHUCK_INTERLOCK"; public const string NameId = "chuckInterlock"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of an interlock function or control logic state intended to prevent the associated Chuck component from being operated."; @@ -32,6 +33,8 @@ public ChuckInterlockDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckStateDataItem.g.cs index 5cb68804..fd9bc928 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ChuckStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ChuckStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CHUCK_STATE"; public const string NameId = "chuckState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Operating state of a mechanism that holds a part or stock material during a manufacturing process. It may also represent a mechanism that holds any other mechanism in place within a piece of equipment."; @@ -23,6 +24,8 @@ public ChuckStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ChuckStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ClockTimeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ClockTimeDataItem.g.cs index 1abaf595..981d8915 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ClockTimeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ClockTimeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ClockTimeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CLOCK_TIME"; public const string NameId = "clockTime"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Time provided by a timing device at a specific point in time."; @@ -23,6 +24,8 @@ public ClockTimeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ClockTimeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CodeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CodeDataItem.g.cs index 36001547..af6ee2fc 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CodeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CodeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class CodeDataItem : DataItem public const string TypeId = "CODE"; public const string NameId = "code"; + public new const string DescriptionText = "Programmatic code being executed.**DEPRECATED** in *Version 1.1*."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public CodeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public CodeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CommunicationsDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CommunicationsDataItem.g.cs index 88099084..a262d306 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CommunicationsDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CommunicationsDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class CommunicationsDataItem : DataItem public const string TypeId = "COMMUNICATIONS"; public const string NameId = "communications"; + public new const string DescriptionText = "Indication that the piece of equipment has experienced a communications failure."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public CommunicationsDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public CommunicationsDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ComponentDataDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ComponentDataDataItem.g.cs index 8ff2ff26..a4a447e5 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ComponentDataDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ComponentDataDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ComponentDataDataItem : DataItem public const string TypeId = "COMPONENT_DATA"; public const string NameId = "componentData"; + public new const string DescriptionText = "Event that represents a Component where the EntryDefinition identifies the Component and the CellDefinitions define the Component's observed DataItems."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ComponentDataDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ComponentDataDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CompositionStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CompositionStateDataItem.g.cs index 5d9746b6..a8e0b7f1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CompositionStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CompositionStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class CompositionStateDataItem : DataItem public const string TypeId = "COMPOSITION_STATE"; public const string NameId = "compositionState"; + public new const string DescriptionText = "Operating state of a mechanism represented by a Composition entity."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public CompositionStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ConcentrationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ConcentrationDataItem.g.cs index de17cce1..c891865a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ConcentrationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ConcentrationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ConcentrationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CONCENTRATION"; public const string NameId = "concentration"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Percentage of one component within a mixture of components."; @@ -23,6 +24,8 @@ public ConcentrationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ConcentrationDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ConductivityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ConductivityDataItem.g.cs index 5c2703ed..c1e4fc6b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ConductivityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ConductivityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ConductivityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CONDUCTIVITY"; public const string NameId = "conductivity"; + public const string DefaultUnits = Devices.Units.SIEMENS_PER_METER; public new const string DescriptionText = "Ability of a material to conduct electricity."; @@ -23,6 +24,8 @@ public ConductivityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ConductivityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ConnectionStatusDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ConnectionStatusDataItem.g.cs index 7b29aed8..66b99935 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ConnectionStatusDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ConnectionStatusDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ConnectionStatusDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CONNECTION_STATUS"; public const string NameId = "connectionStatus"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Status of the connection between an adapter and an agent."; @@ -23,6 +24,8 @@ public ConnectionStatusDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ConnectionStatusDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ControlLimitDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ControlLimitDataItem.g.cs index e3cf2ae9..4c5d0231 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ControlLimitDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ControlLimitDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ControlLimitDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CONTROL_LIMIT"; public const string NameId = "controlLimit"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Set of limits used to indicate whether a process variable is stable and in control."; @@ -23,6 +24,8 @@ public ControlLimitDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ControlLimitDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeDataItem.g.cs index e3d903d4..54270c24 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -10,7 +10,8 @@ public class ControllerModeDataItem : DataItem { public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CONTROLLER_MODE"; - public const string NameId = "controllerMode"; + public const string NameId = "mode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Current mode of the Controller component."; @@ -23,6 +24,8 @@ public ControllerModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ControllerModeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeOverrideDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeOverrideDataItem.g.cs index e5b332a7..08b4b769 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeOverrideDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ControllerModeOverrideDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ControllerModeOverrideDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CONTROLLER_MODE_OVERRIDE"; public const string NameId = "controllerModeOverride"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Setting or operator selection that changes the behavior of a piece of equipment."; @@ -52,6 +53,8 @@ public ControllerModeOverrideDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CoupledAxesDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CoupledAxesDataItem.g.cs index 9c8762b3..a9b8775f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CoupledAxesDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CoupledAxesDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CoupledAxesDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "COUPLED_AXES"; public const string NameId = "coupledAxes"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Set of associated axes."; @@ -23,6 +24,8 @@ public CoupledAxesDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public CoupledAxesDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CuttingSpeedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CuttingSpeedDataItem.g.cs index 6bf315ad..4d0af38e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CuttingSpeedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CuttingSpeedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CuttingSpeedDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "CUTTING_SPEED"; public const string NameId = "cuttingSpeed"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND; public new const string DescriptionText = "Speed difference (relative velocity) between the cutting mechanism and the surface of the workpiece it is operating on."; @@ -42,6 +43,8 @@ public CuttingSpeedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/CycleCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/CycleCountDataItem.g.cs index c91cb3bd..9f9ce6e6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/CycleCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/CycleCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class CycleCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "CYCLE_COUNT"; public const string NameId = "cycleCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Accumulation of the number of times a cyclic function has attempted to, or is planned to attempt to execute."; @@ -67,6 +68,8 @@ public CycleCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DataRangeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DataRangeDataItem.g.cs index d25fc8d0..251e39a9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DataRangeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DataRangeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class DataRangeDataItem : DataItem public const string TypeId = "DATA_RANGE"; public const string NameId = "dataRange"; + public new const string DescriptionText = "Indication that the value of the data associated with a measured value or a calculation is outside of an expected range."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public DataRangeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public DataRangeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DateCodeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DateCodeDataItem.g.cs index 33f170ba..b5364a17 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DateCodeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DateCodeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DateCodeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "DATE_CODE"; public const string NameId = "dateCode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Time and date code associated with a material or other physical item."; @@ -42,6 +43,8 @@ public DateCodeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DeactivationCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DeactivationCountDataItem.g.cs index c1868a6d..0d0dce19 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DeactivationCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DeactivationCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DeactivationCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "DEACTIVATION_COUNT"; public const string NameId = "deactivationCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Accumulation of the number of times a function has attempted to, or is planned to attempt to, deactivate or cease."; @@ -67,6 +68,8 @@ public DeactivationCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DecelerationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DecelerationDataItem.g.cs index e7706b64..732d7bfb 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DecelerationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DecelerationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DecelerationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DECELERATION"; public const string NameId = "deceleration"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND_SQUARED; public new const string DescriptionText = "Negative rate of change of velocity."; @@ -42,6 +43,8 @@ public DecelerationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DensityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DensityDataItem.g.cs index d697f3fb..942fbe18 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DensityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DensityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DensityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DENSITY"; public const string NameId = "density"; + public const string DefaultUnits = Devices.Units.MILLIGRAM_PER_CUBIC_MILLIMETER; public new const string DescriptionText = "Volumetric mass of a material per unit volume of that material."; @@ -23,6 +24,8 @@ public DensityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DensityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionAccelerationVolumetricDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionAccelerationVolumetricDataItem.g.cs index b438bde0..c73d2ff8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionAccelerationVolumetricDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionAccelerationVolumetricDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DepositionAccelerationVolumetricDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEPOSITION_ACCELERATION_VOLUMETRIC"; public const string NameId = "depositionAccelerationVolumetric"; + public const string DefaultUnits = Devices.Units.CUBIC_MILLIMETER_PER_SECOND_SQUARED; public new const string DescriptionText = "Rate of change in spatial volume of material deposited in an additive manufacturing process."; @@ -37,6 +38,8 @@ public DepositionAccelerationVolumetricDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionDensityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionDensityDataItem.g.cs index 9993956b..490b39dd 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionDensityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionDensityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DepositionDensityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEPOSITION_DENSITY"; public const string NameId = "depositionDensity"; + public const string DefaultUnits = Devices.Units.MILLIGRAM_PER_CUBIC_MILLIMETER; public new const string DescriptionText = "Density of the material deposited in an additive manufacturing process per unit of volume."; @@ -37,6 +38,8 @@ public DepositionDensityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionMassDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionMassDataItem.g.cs index 7a2cac1d..264805b7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionMassDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionMassDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DepositionMassDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEPOSITION_MASS"; public const string NameId = "depositionMass"; + public const string DefaultUnits = Devices.Units.MILLIGRAM; public new const string DescriptionText = "Mass of the material deposited in an additive manufacturing process."; @@ -37,6 +38,8 @@ public DepositionMassDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionRateVolumetricDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionRateVolumetricDataItem.g.cs index 65ef815b..79f9c6ea 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionRateVolumetricDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionRateVolumetricDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DepositionRateVolumetricDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEPOSITION_RATE_VOLUMETRIC"; public const string NameId = "depositionRateVolumetric"; + public const string DefaultUnits = Devices.Units.CUBIC_MILLIMETER_PER_SECOND; public new const string DescriptionText = "Rate at which a spatial volume of material is deposited in an additive manufacturing process."; @@ -37,6 +38,8 @@ public DepositionRateVolumetricDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionVolumeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionVolumeDataItem.g.cs index 1516db30..9b957bd1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionVolumeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DepositionVolumeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DepositionVolumeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEPOSITION_VOLUME"; public const string NameId = "depositionVolume"; + public const string DefaultUnits = Devices.Units.CUBIC_MILLIMETER; public new const string DescriptionText = "Spatial volume of material to be deposited in an additive manufacturing process."; @@ -37,6 +38,8 @@ public DepositionVolumeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceAddedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceAddedDataItem.g.cs index c7e873fc..2e524090 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceAddedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceAddedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class DeviceAddedDataItem : DataItem public const string TypeId = "DEVICE_ADDED"; public const string NameId = "deviceAdded"; + public new const string DescriptionText = "UUID of new device added to an MTConnect Agent."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public DeviceAddedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public DeviceAddedDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceChangedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceChangedDataItem.g.cs index 3edb9a53..bd5cc75a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceChangedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceChangedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class DeviceChangedDataItem : DataItem public const string TypeId = "DEVICE_CHANGED"; public const string NameId = "deviceChanged"; + public new const string DescriptionText = "UUID of the device whose metadata has changed."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public DeviceChangedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public DeviceChangedDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceRemovedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceRemovedDataItem.g.cs index cd2683b4..6dc49ae1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceRemovedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceRemovedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class DeviceRemovedDataItem : DataItem public const string TypeId = "DEVICE_REMOVED"; public const string NameId = "deviceRemoved"; + public new const string DescriptionText = "UUID of a device removed from an MTConnect Agent."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public DeviceRemovedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public DeviceRemovedDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceUuidDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceUuidDataItem.g.cs index 634f9fa5..4dd0b840 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceUuidDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DeviceUuidDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class DeviceUuidDataItem : DataItem public const string TypeId = "DEVICE_UUID"; public const string NameId = "deviceUuid"; + public new const string DescriptionText = "Identifier of another piece of equipment that is temporarily associated with a component of this piece of equipment to perform a particular function."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public DeviceUuidDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public DeviceUuidDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DewPointDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DewPointDataItem.g.cs index 201cfd32..be453c43 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DewPointDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DewPointDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DewPointDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DEW_POINT"; public const string NameId = "dewPoint"; + public const string DefaultUnits = Devices.Units.CELSIUS; public new const string DescriptionText = "Temperature at which moisture begins to condense, corresponding to saturation for a given absolute humidity."; @@ -23,6 +24,8 @@ public DewPointDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DewPointDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DiameterDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DiameterDataItem.g.cs index bc9e3816..49dd0df1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DiameterDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DiameterDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DiameterDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DIAMETER"; public const string NameId = "diameter"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Dimension of a diameter."; @@ -23,6 +24,8 @@ public DiameterDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DiameterDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DirectionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DirectionDataItem.g.cs index ac17059d..496dd178 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DirectionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DirectionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DirectionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "DIRECTION"; public const string NameId = "direction"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Direction of motion."; @@ -37,6 +38,8 @@ public DirectionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DischargeRateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DischargeRateDataItem.g.cs index b93f2e66..37354ba3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DischargeRateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DischargeRateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DischargeRateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DISCHARGE_RATE"; public const string NameId = "dischargeRate"; + public const string DefaultUnits = Devices.Units.AMPERE; public new const string DescriptionText = "Value of current being drawn from the Component."; @@ -37,6 +38,8 @@ public DischargeRateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementAngularDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementAngularDataItem.g.cs index 079c5497..21b5a946 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementAngularDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementAngularDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DisplacementAngularDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DISPLACEMENT_ANGULAR"; public const string NameId = "displacementAngular"; + public const string DefaultUnits = Devices.Units.DEGREE; public new const string DescriptionText = "Absolute value of the change in angular position around a vector"; @@ -23,6 +24,8 @@ public DisplacementAngularDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DisplacementAngularDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementDataItem.g.cs index 5025b305..c6f42c6b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DisplacementDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DISPLACEMENT"; public const string NameId = "displacement"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Change in position of an object."; @@ -23,6 +24,8 @@ public DisplacementDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DisplacementDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementLinearDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementLinearDataItem.g.cs index eabd55a9..b0ada3b5 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementLinearDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DisplacementLinearDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DisplacementLinearDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "DISPLACEMENT_LINEAR"; public const string NameId = "displacementLinear"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Absolute value of the change in position along a vector."; @@ -23,6 +24,8 @@ public DisplacementLinearDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public DisplacementLinearDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/DoorStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/DoorStateDataItem.g.cs index 760d583a..790dc50f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/DoorStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/DoorStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class DoorStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "DOOR_STATE"; public const string NameId = "doorState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Operational state of a Door component or composition element."; @@ -23,6 +24,8 @@ public DoorStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public DoorStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ElectricalEnergyDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ElectricalEnergyDataItem.g.cs index d8e76020..751e9e36 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ElectricalEnergyDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ElectricalEnergyDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ElectricalEnergyDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ELECTRICAL_ENERGY"; public const string NameId = "electricalEnergy"; + public const string DefaultUnits = Devices.Units.WATT_SECOND; public new const string DescriptionText = "Wattage used or generated by a component over an interval of time."; @@ -23,6 +24,8 @@ public ElectricalEnergyDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ElectricalEnergyDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/EmergencyStopDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/EmergencyStopDataItem.g.cs index f6a70b84..15986796 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/EmergencyStopDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/EmergencyStopDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -10,7 +10,8 @@ public class EmergencyStopDataItem : DataItem { public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "EMERGENCY_STOP"; - public const string NameId = "emergencyStop"; + public const string NameId = "estop"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of the emergency stop signal for a piece of equipment, controller path, or any other component or subsystem of a piece of equipment."; @@ -23,6 +24,8 @@ public EmergencyStopDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public EmergencyStopDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/EndOfBarDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/EndOfBarDataItem.g.cs index d5a4f485..ce127dcf 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/EndOfBarDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/EndOfBarDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class EndOfBarDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "END_OF_BAR"; public const string NameId = "endOfBar"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of whether the end of a piece of bar stock being feed by a bar feeder has been reached."; @@ -37,6 +38,8 @@ public EndOfBarDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentModeDataItem.g.cs index a249e50a..7e60fd77 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class EquipmentModeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "EQUIPMENT_MODE"; public const string NameId = "equipmentMode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication that a piece of equipment, or a sub-part of a piece of equipment, is performing specific types of activities."; @@ -52,6 +53,8 @@ public EquipmentModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentTimerDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentTimerDataItem.g.cs index 3b8df773..307769e2 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentTimerDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/EquipmentTimerDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class EquipmentTimerDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "EQUIPMENT_TIMER"; public const string NameId = "equipmentTimer"; + public const string DefaultUnits = Devices.Units.SECOND; public new const string DescriptionText = "Amount of time a piece of equipment or a sub-part of a piece of equipment has performed specific activities."; @@ -52,6 +53,8 @@ public EquipmentTimerDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ExecutionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ExecutionDataItem.g.cs index 454210a7..5d3024d7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ExecutionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ExecutionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -10,7 +10,8 @@ public class ExecutionDataItem : DataItem { public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "EXECUTION"; - public const string NameId = "execution"; + public const string NameId = "exec"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Execution status of the Component."; @@ -23,6 +24,8 @@ public ExecutionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ExecutionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FeatureMeasurementDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FeatureMeasurementDataItem.g.cs index 55bd2c73..e5239b3f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FeatureMeasurementDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FeatureMeasurementDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FeatureMeasurementDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "FEATURE_MEASUREMENT"; public const string NameId = "featureMeasurement"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Assessing elements of a feature."; @@ -23,6 +24,8 @@ public FeatureMeasurementDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public FeatureMeasurementDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FillLevelDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FillLevelDataItem.g.cs index aa8bdf24..a79891b3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FillLevelDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FillLevelDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FillLevelDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FILL_LEVEL"; public const string NameId = "fillLevel"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Amount of a substance remaining compared to the planned maximum amount of that substance."; @@ -23,6 +24,8 @@ public FillLevelDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public FillLevelDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FirmwareDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FirmwareDataItem.g.cs index 5f29f169..d56a7cb3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FirmwareDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FirmwareDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class FirmwareDataItem : DataItem public const string TypeId = "FIRMWARE"; public const string NameId = "firmware"; + public new const string DescriptionText = "Embedded software of a Component."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public FirmwareDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FixtureIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FixtureIdDataItem.g.cs index 3111be78..f97a91a3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FixtureIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FixtureIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class FixtureIdDataItem : DataItem public const string TypeId = "FIXTURE_ID"; public const string NameId = "fixtureId"; + public new const string DescriptionText = "Identifier for a fixture."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public FixtureIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public FixtureIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FlowDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FlowDataItem.g.cs index 6f6febdd..f0ac8f50 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FlowDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FlowDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FlowDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FLOW"; public const string NameId = "flow"; + public const string DefaultUnits = Devices.Units.LITER_PER_SECOND; public new const string DescriptionText = "Rate of flow of a fluid."; @@ -23,6 +24,8 @@ public FlowDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public FlowDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorAngularDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorAngularDataItem.g.cs index 61c387b3..2a5191ac 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorAngularDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorAngularDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FollowingErrorAngularDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FOLLOWING_ERROR_ANGULAR"; public const string NameId = "followingErrorAngular"; + public const string DefaultUnits = Devices.Units.DEGREE; public new const string DescriptionText = "Angular difference between the commanded encoder/resolver position and the actual encoder/resolver position at any specified point in time during a motion."; @@ -32,6 +33,8 @@ public FollowingErrorAngularDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorDataItem.g.cs index c2aceacd..6dff349f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FollowingErrorDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FOLLOWING_ERROR"; public const string NameId = "followingError"; + public const string DefaultUnits = Devices.Units.COUNT; public new const string DescriptionText = "Difference between actual and commanded position at any specific point in time during a motion."; @@ -32,6 +33,8 @@ public FollowingErrorDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorLinearDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorLinearDataItem.g.cs index 85c3a1ee..d9a914e9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorLinearDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FollowingErrorLinearDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FollowingErrorLinearDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FOLLOWING_ERROR_LINEAR"; public const string NameId = "followingErrorLinear"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Difference between the commanded encoder/resolver position and the actual encoder/resolver position at any specified point in time during a motion."; @@ -32,6 +33,8 @@ public FollowingErrorLinearDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FrequencyDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FrequencyDataItem.g.cs index 6f2b4c90..077203d2 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FrequencyDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FrequencyDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FrequencyDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "FREQUENCY"; public const string NameId = "frequency"; + public const string DefaultUnits = Devices.Units.HERTZ; public new const string DescriptionText = "Number of occurrences of a repeating event per unit time."; @@ -23,6 +24,8 @@ public FrequencyDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public FrequencyDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/FunctionalModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/FunctionalModeDataItem.g.cs index 9868a7da..e4b10b0b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/FunctionalModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/FunctionalModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class FunctionalModeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "FUNCTIONAL_MODE"; public const string NameId = "functionalMode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Current intended production status of the Component."; @@ -23,6 +24,8 @@ public FunctionalModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public FunctionalModeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/GlobalPositionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/GlobalPositionDataItem.g.cs index 57eb8363..fc1698fb 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/GlobalPositionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/GlobalPositionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class GlobalPositionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "GLOBAL_POSITION"; public const string NameId = "globalPosition"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Position in three-dimensional space.**DEPRECATED** in Version 1.1."; @@ -37,6 +38,8 @@ public GlobalPositionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalAccelerationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalAccelerationDataItem.g.cs index c5119604..917496c3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalAccelerationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalAccelerationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class GravitationalAccelerationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "GRAVITATIONAL_ACCELERATION"; public const string NameId = "gravitationalAcceleration"; + public const string DefaultUnits = Devices.NativeUnits.GRAVITATIONAL_ACCELERATION; public new const string DescriptionText = "Acceleration relative to Earth's gravity of 9.80665 `METER/SECOND^2`."; @@ -23,6 +24,8 @@ public GravitationalAccelerationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public GravitationalAccelerationDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalForceDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalForceDataItem.g.cs index fb77549a..07d02cee 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalForceDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/GravitationalForceDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class GravitationalForceDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "GRAVITATIONAL_FORCE"; public const string NameId = "gravitationalForce"; + public const string DefaultUnits = Devices.NativeUnits.GRAVITATIONAL_FORCE; public new const string DescriptionText = "Force relative to earth's gravity."; @@ -23,6 +24,8 @@ public GravitationalForceDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public GravitationalForceDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HardnessDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HardnessDataItem.g.cs index d647a001..a11bebb9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HardnessDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HardnessDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class HardnessDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "HARDNESS"; public const string NameId = "hardness"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Hardness of a material."; @@ -57,6 +58,8 @@ public HardnessDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -70,6 +73,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HardwareDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HardwareDataItem.g.cs index c29b6045..6daa1ff9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HardwareDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HardwareDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class HardwareDataItem : DataItem public const string TypeId = "HARDWARE"; public const string NameId = "hardware"; + public new const string DescriptionText = "Hardware of a Component."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public HardwareDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HostNameDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HostNameDataItem.g.cs index 4ff24c9e..c358743c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HostNameDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HostNameDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class HostNameDataItem : DataItem public const string TypeId = "HOST_NAME"; public const string NameId = "hostName"; + public new const string DescriptionText = "Name of the host computer supplying data."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public HostNameDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public HostNameDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityAbsoluteDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityAbsoluteDataItem.g.cs index 1e182644..4a06a54a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityAbsoluteDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityAbsoluteDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class HumidityAbsoluteDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "HUMIDITY_ABSOLUTE"; public const string NameId = "humidityAbsolute"; + public const string DefaultUnits = Devices.Units.GRAM_PER_CUBIC_METER; public new const string DescriptionText = "Amount of water vapor expressed in grams per cubic meter."; @@ -37,6 +38,8 @@ public HumidityAbsoluteDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityRelativeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityRelativeDataItem.g.cs index 086ea3df..401262e0 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityRelativeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HumidityRelativeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class HumidityRelativeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "HUMIDITY_RELATIVE"; public const string NameId = "humidityRelative"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Amount of water vapor present expressed as a percent to reach saturation at the same temperature."; @@ -37,6 +38,8 @@ public HumidityRelativeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/HumiditySpecificDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/HumiditySpecificDataItem.g.cs index 87c1f168..49eaec94 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/HumiditySpecificDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/HumiditySpecificDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class HumiditySpecificDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "HUMIDITY_SPECIFIC"; public const string NameId = "humiditySpecific"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Ratio of the water vapor present over the total weight of the water vapor and air present expressed as a percent."; @@ -37,6 +38,8 @@ public HumiditySpecificDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LeakDetectDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LeakDetectDataItem.g.cs index aa6493fe..0bf98fff 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LeakDetectDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LeakDetectDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LeakDetectDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "LEAK_DETECT"; public const string NameId = "leakDetect"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication designating whether a leak has been detected."; @@ -23,6 +24,8 @@ public LeakDetectDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public LeakDetectDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LengthDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LengthDataItem.g.cs index cae4ad9a..4dde3de5 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LengthDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LengthDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LengthDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "LENGTH"; public const string NameId = "length"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Length of an object."; @@ -42,6 +43,8 @@ public LengthDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LevelDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LevelDataItem.g.cs index 2bf8c0dd..85c399f4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LevelDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LevelDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class LevelDataItem : DataItem public const string TypeId = "LEVEL"; public const string NameId = "level"; + public new const string DescriptionText = "Level of a resource.**DEPRECATED** in *Version 1.2*. See `FILL_LEVEL`."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public LevelDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public LevelDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LibraryDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LibraryDataItem.g.cs index 954b2a50..baa86d79 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LibraryDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LibraryDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class LibraryDataItem : DataItem public const string TypeId = "LIBRARY"; public const string NameId = "library"; + public new const string DescriptionText = "Software library on a Component"; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public LibraryDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LineDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LineDataItem.g.cs index 8c831cab..da501b7f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LineDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LineDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class LineDataItem : DataItem public const string TypeId = "LINE"; public const string NameId = "line"; + public new const string DescriptionText = "Current line of code being executed.**DEPRECATED** in *Version 1.4.0*."; public override string TypeDescription => DescriptionText; @@ -37,6 +38,8 @@ public LineDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LineLabelDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LineLabelDataItem.g.cs index 8ce3e43f..fb700be9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LineLabelDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LineLabelDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class LineLabelDataItem : DataItem public const string TypeId = "LINE_LABEL"; public const string NameId = "lineLabel"; + public new const string DescriptionText = "Identifier for a Block of code in a Program."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public LineLabelDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public LineLabelDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LineNumberDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LineNumberDataItem.g.cs index 9ce84484..fbbd4d01 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LineNumberDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LineNumberDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LineNumberDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "LINE_NUMBER"; public const string NameId = "lineNumber"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Position of a block of program code within a control program."; @@ -37,6 +38,8 @@ public LineNumberDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LinearForceDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LinearForceDataItem.g.cs index e68172a8..4aceebfe 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LinearForceDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LinearForceDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LinearForceDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "LINEAR_FORCE"; public const string NameId = "linearForce"; + public const string DefaultUnits = Devices.Units.NEWTON; public new const string DescriptionText = "Force applied to a mass in one direction only."; @@ -23,6 +24,8 @@ public LinearForceDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public LinearForceDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LoadCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LoadCountDataItem.g.cs index 5bf8eaac..0ece58f6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LoadCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LoadCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LoadCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "LOAD_COUNT"; public const string NameId = "loadCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Accumulation of the number of times an operation has attempted to, or is planned to attempt to, load materials, parts, or other items."; @@ -67,6 +68,8 @@ public LoadCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LoadDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LoadDataItem.g.cs index 960fc793..466274fd 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LoadDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LoadDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LoadDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "LOAD"; public const string NameId = "load"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Actual versus the standard rating of a piece of equipment."; @@ -23,6 +24,8 @@ public LoadDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public LoadDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LockStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LockStateDataItem.g.cs index beea5ff4..2afcc12b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LockStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LockStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class LockStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "LOCK_STATE"; public const string NameId = "lockState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State or operating mode of a Lock."; @@ -23,6 +24,8 @@ public LockStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public LockStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/LogicProgramDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/LogicProgramDataItem.g.cs index 6f03e94e..88028462 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/LogicProgramDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/LogicProgramDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class LogicProgramDataItem : DataItem public const string TypeId = "LOGIC_PROGRAM"; public const string NameId = "logicProgram"; + public new const string DescriptionText = "Indication that an error occurred in the logic program or programmable logic controller (PLC) associated with a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public LogicProgramDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public LogicProgramDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MTConnectVersionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MTConnectVersionDataItem.g.cs index f3674c59..9df27418 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MTConnectVersionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MTConnectVersionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MTConnectVersionDataItem : DataItem public const string TypeId = "MTCONNECT_VERSION"; public const string NameId = "mtconnectVersion"; + public new const string DescriptionText = "Reference version of the MTConnect Standard supported by the adapter."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MTConnectVersionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MTConnectVersionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MaintenanceListDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MaintenanceListDataItem.g.cs index 017e8b97..0eafb32b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MaintenanceListDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MaintenanceListDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class MaintenanceListDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "MAINTENANCE_LIST"; public const string NameId = "maintenanceList"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Actions or activities to be performed in support of a piece of equipment."; @@ -23,6 +24,8 @@ public MaintenanceListDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public MaintenanceListDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MassDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MassDataItem.g.cs index c0033765..2dfd58c4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MassDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MassDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class MassDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "MASS"; public const string NameId = "mass"; + public const string DefaultUnits = Devices.Units.KILOGRAM; public new const string DescriptionText = "Mass of an object(s) or an amount of material."; @@ -23,6 +24,8 @@ public MassDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public MassDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialDataItem.g.cs index 35ffed33..465764ed 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MaterialDataItem : DataItem public const string TypeId = "MATERIAL"; public const string NameId = "material"; + public new const string DescriptionText = "Identifier of a material used or consumed in the manufacturing process."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MaterialDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MaterialDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialLayerDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialLayerDataItem.g.cs index 83a90ece..cb00a915 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialLayerDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MaterialLayerDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class MaterialLayerDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "MATERIAL_LAYER"; public const string NameId = "materialLayer"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Identifies the layers of material applied to a part or product as part of an additive manufacturing process."; @@ -37,6 +38,8 @@ public MaterialLayerDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementTypeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementTypeDataItem.g.cs index 76e18436..5d8b93d9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementTypeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementTypeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MeasurementTypeDataItem : DataItem public const string TypeId = "MEASUREMENT_TYPE"; public const string NameId = "measurementType"; + public new const string DescriptionText = "Class of measurement being performed. QIF 3:2018 Section 6.3"; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MeasurementTypeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MeasurementTypeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementUnitsDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementUnitsDataItem.g.cs index 356da6e5..a2ef0fac 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementUnitsDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementUnitsDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MeasurementUnitsDataItem : DataItem public const string TypeId = "MEASUREMENT_UNITS"; public const string NameId = "measurementUnits"; + public new const string DescriptionText = "Engineering units of the measurement."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MeasurementUnitsDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MeasurementUnitsDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementValueDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementValueDataItem.g.cs index 9a5ac875..b95c9c50 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementValueDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MeasurementValueDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class MeasurementValueDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "MEASUREMENT_VALUE"; public const string NameId = "measurementValue"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Measurement based on the measurement type."; @@ -23,6 +24,8 @@ public MeasurementValueDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public MeasurementValueDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MessageDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MessageDataItem.g.cs index ec930931..7e70639d 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MessageDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MessageDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MessageDataItem : DataItem public const string TypeId = "MESSAGE"; public const string NameId = "message"; + public new const string DescriptionText = "Information to be transferred from a piece of equipment to a client software application."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MessageDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MessageDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/MotionProgramDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/MotionProgramDataItem.g.cs index c14e0e67..3c01376b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/MotionProgramDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/MotionProgramDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class MotionProgramDataItem : DataItem public const string TypeId = "MOTION_PROGRAM"; public const string NameId = "motionProgram"; + public new const string DescriptionText = "Indication that an error occurred in the motion program associated with a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public MotionProgramDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public MotionProgramDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkDataItem.g.cs index 8e18cd56..36dcf176 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class NetworkDataItem : DataItem public const string TypeId = "NETWORK"; public const string NameId = "network"; + public new const string DescriptionText = "Network details of a Component."; public override string TypeDescription => DescriptionText; @@ -62,6 +63,8 @@ public NetworkDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -75,6 +78,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkPortDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkPortDataItem.g.cs index b168554d..1bc422a3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkPortDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/NetworkPortDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class NetworkPortDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "NETWORK_PORT"; public const string NameId = "networkPort"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Number of the TCP/IP or UDP/IP port for the connection endpoint."; @@ -23,6 +24,8 @@ public NetworkPortDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public NetworkPortDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ObservationUpdateRateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ObservationUpdateRateDataItem.g.cs index 587a0e97..c8e9a325 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ObservationUpdateRateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ObservationUpdateRateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ObservationUpdateRateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "OBSERVATION_UPDATE_RATE"; public const string NameId = "observationUpdateRate"; + public const string DefaultUnits = Devices.Units.COUNT_PER_SECOND; public new const string DescriptionText = "Average rate of change of values for data items in the MTConnect streams. The average is computed over a rolling window defined by the implementation."; @@ -23,6 +24,8 @@ public ObservationUpdateRateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ObservationUpdateRateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/OpennessDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/OpennessDataItem.g.cs index e0235be1..f72244f9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/OpennessDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/OpennessDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class OpennessDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "OPENNESS"; public const string NameId = "openness"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Percentage open where 100% is fully open and 0% is fully closed."; @@ -23,6 +24,8 @@ public OpennessDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public OpennessDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingModeDataItem.g.cs index 243a5c15..8163353a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class OperatingModeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "OPERATING_MODE"; public const string NameId = "operatingMode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of Component or Composition that describes the automatic or manual operation of the entity."; @@ -23,6 +24,8 @@ public OperatingModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public OperatingModeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingSystemDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingSystemDataItem.g.cs index 3034a8f5..18f79235 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingSystemDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatingSystemDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class OperatingSystemDataItem : DataItem public const string TypeId = "OPERATING_SYSTEM"; public const string NameId = "operatingSystem"; + public new const string DescriptionText = "Operating System (OS) of a Component."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public OperatingSystemDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatorIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatorIdDataItem.g.cs index 992691ab..ae34ea10 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/OperatorIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/OperatorIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class OperatorIdDataItem : DataItem public const string TypeId = "OPERATOR_ID"; public const string NameId = "operatorId"; + public new const string DescriptionText = "Identifier of the person currently responsible for operating the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public OperatorIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public OperatorIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/OrientationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/OrientationDataItem.g.cs index c557d840..031076ff 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/OrientationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/OrientationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class OrientationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ORIENTATION"; public const string NameId = "orientation"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public const string DefaultUnits = Devices.Units.DEGREE_3D; public new const string DescriptionText = "Angular position of a plane or vector relative to a cartesian coordinate system"; @@ -37,6 +38,8 @@ public OrientationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PHDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PHDataItem.g.cs index 6e4e7e6e..9bf69cb1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PHDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PHDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PHDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PH"; public const string NameId = "ph"; + public const string DefaultUnits = Devices.Units.PH; public new const string DescriptionText = "Acidity or alkalinity of a solution."; @@ -23,6 +24,8 @@ public PHDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public PHDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PalletIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PalletIdDataItem.g.cs index ce95cdeb..a0aa5dd7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PalletIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PalletIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PalletIdDataItem : DataItem public const string TypeId = "PALLET_ID"; public const string NameId = "palletId"; + public new const string DescriptionText = "Identifier for a pallet."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public PalletIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public PalletIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountDataItem.g.cs index 1f9cb8a8..410b9b26 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PartCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PART_COUNT"; public const string NameId = "partCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Aggregate count of parts."; @@ -67,6 +68,8 @@ public PartCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountTypeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountTypeDataItem.g.cs index 67f64518..11b9eaad 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountTypeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartCountTypeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PartCountTypeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PART_COUNT_TYPE"; public const string NameId = "partCountType"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Interpretation of `PART_COUNT`."; @@ -23,6 +24,8 @@ public PartCountTypeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PartCountTypeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartDetectDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartDetectDataItem.g.cs index a9eddc50..52f630e1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartDetectDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartDetectDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PartDetectDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PART_DETECT"; public const string NameId = "partDetect"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication designating whether a part or work piece has been detected or is present."; @@ -23,6 +24,8 @@ public PartDetectDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PartDetectDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartGroupIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartGroupIdDataItem.g.cs index efee5e7b..586ea07a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartGroupIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartGroupIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PartGroupIdDataItem : DataItem public const string TypeId = "PART_GROUP_ID"; public const string NameId = "partGroupId"; + public new const string DescriptionText = "Identifier given to a collection of individual parts."; public override string TypeDescription => DescriptionText; @@ -52,6 +53,8 @@ public PartGroupIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartIdDataItem.g.cs index 0b1eb970..757faa2f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PartIdDataItem : DataItem public const string TypeId = "PART_ID"; public const string NameId = "partId"; + public new const string DescriptionText = "Identifier of a part in a manufacturing operation."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public PartIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public PartIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartKindIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartKindIdDataItem.g.cs index 4f2f63c1..62df7c97 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartKindIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartKindIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PartKindIdDataItem : DataItem public const string TypeId = "PART_KIND_ID"; public const string NameId = "partKindId"; + public new const string DescriptionText = "Identifier given to link the individual occurrence to a class of parts, typically distinguished by a particular part design."; public override string TypeDescription => DescriptionText; @@ -47,6 +48,8 @@ public PartKindIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartNumberDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartNumberDataItem.g.cs index 907d0ffa..0f68f42d 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartNumberDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartNumberDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PartNumberDataItem : DataItem public const string TypeId = "PART_NUMBER"; public const string NameId = "partNumber"; + public new const string DescriptionText = "Identifier of a part or product moving through the manufacturing process.**DEPRECATED** in *Version 1.7*. `PART_NUMBER` is now a `subType` of `PART_KIND_ID`."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public PartNumberDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public PartNumberDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartProcessingStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartProcessingStateDataItem.g.cs index 016673bc..1fb30e16 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartProcessingStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartProcessingStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PartProcessingStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PART_PROCESSING_STATE"; public const string NameId = "partProcessingState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Particular condition of the part occurrence at a specific time."; @@ -23,6 +24,8 @@ public PartProcessingStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PartProcessingStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartStatusDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartStatusDataItem.g.cs index cdc3f183..62f514fe 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartStatusDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartStatusDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PartStatusDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PART_STATUS"; public const string NameId = "partStatus"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State or condition of a part."; @@ -23,6 +24,8 @@ public PartStatusDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PartStatusDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PartUniqueIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PartUniqueIdDataItem.g.cs index 2df1c5ef..d14c5651 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PartUniqueIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PartUniqueIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class PartUniqueIdDataItem : DataItem public const string TypeId = "PART_UNIQUE_ID"; public const string NameId = "partUniqueId"; + public new const string DescriptionText = "Identifier given to a distinguishable, individual part."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public PartUniqueIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateDataItem.g.cs index c0b8a605..335eacfd 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PathFeedrateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PATH_FEEDRATE"; public const string NameId = "pathFeedrate"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND; public new const string DescriptionText = "Feedrate for the axes, or a single axis, associated with a Path component."; @@ -57,6 +58,8 @@ public PathFeedrateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -70,6 +73,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateOverrideDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateOverrideDataItem.g.cs index 7d8d1f82..eb5ac6b8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateOverrideDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedrateOverrideDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PathFeedrateOverrideDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PATH_FEEDRATE_OVERRIDE"; public const string NameId = "pathFeedrateOverride"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Value of a signal or calculation issued to adjust the feedrate for the axes associated with a Path component that may represent a single axis or the coordinated movement of multiple axes."; @@ -42,6 +43,8 @@ public PathFeedrateOverrideDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedratePerRevolutionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedratePerRevolutionDataItem.g.cs index 3e9ccd3f..7d81b2d6 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedratePerRevolutionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PathFeedratePerRevolutionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PathFeedratePerRevolutionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PATH_FEEDRATE_PER_REVOLUTION"; public const string NameId = "pathFeedratePerRevolution"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_REVOLUTION; public new const string DescriptionText = "Feedrate for the axes, or a single axis."; @@ -42,6 +43,8 @@ public PathFeedratePerRevolutionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PathModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PathModeDataItem.g.cs index f9ac49c6..ff7747eb 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PathModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PathModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PathModeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PATH_MODE"; public const string NameId = "pathMode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Describes the operational relationship between a Path entity and another Path entity for pieces of equipment comprised of multiple logical groupings of controlled axes or other logical operations."; @@ -23,6 +24,8 @@ public PathModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PathModeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PathPositionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PathPositionDataItem.g.cs index b367bbaa..4973ad0c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PathPositionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PathPositionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PathPositionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PATH_POSITION"; public const string NameId = "pathPosition"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public const string DefaultUnits = Devices.Units.MILLIMETER_3D; public new const string DescriptionText = "Position of a control point associated with a Controller or a Path."; @@ -47,6 +48,8 @@ public PathPositionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PositionCartesianDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PositionCartesianDataItem.g.cs index 77b086d8..ab1c702c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PositionCartesianDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PositionCartesianDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PositionCartesianDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "POSITION_CARTESIAN"; public const string NameId = "positionCartesian"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public const string DefaultUnits = Devices.Units.MILLIMETER_3D; public new const string DescriptionText = "Point in a cartesian coordinate system."; @@ -23,6 +24,8 @@ public PositionCartesianDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } @@ -32,6 +35,8 @@ public PositionCartesianDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PositionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PositionDataItem.g.cs index 9875f30c..3deac27e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PositionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PositionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -10,7 +10,8 @@ public class PositionDataItem : DataItem { public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "POSITION"; - public const string NameId = "position"; + public const string NameId = "pos"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Point along an axis in a cartesian coordinate system."; @@ -47,6 +48,8 @@ public PositionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerFactorDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerFactorDataItem.g.cs index c27318ba..ddc3fe40 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerFactorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerFactorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PowerFactorDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "POWER_FACTOR"; public const string NameId = "powerFactor"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Ratio of real power flowing to a load to the apparent power in that AC circuit."; @@ -23,6 +24,8 @@ public PowerFactorDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public PowerFactorDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStateDataItem.g.cs index bd9ac0a7..4cc475d7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PowerStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "POWER_STATE"; public const string NameId = "powerState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of the status of the source of energy for an entity to allow it to perform its intended function or the state of an enabling signal providing permission for the entity to perform its functions."; @@ -37,6 +38,8 @@ public PowerStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStatusDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStatusDataItem.g.cs index 56235a21..96c86633 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStatusDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PowerStatusDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PowerStatusDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "POWER_STATUS"; public const string NameId = "powerStatus"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Status of the Component.**DEPRECATED** in *Version 1.1.0*."; @@ -23,6 +24,8 @@ public PowerStatusDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public PowerStatusDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PressureAbsoluteDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PressureAbsoluteDataItem.g.cs index 6cdf81fc..a735625b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PressureAbsoluteDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PressureAbsoluteDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PressureAbsoluteDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PRESSURE_ABSOLUTE"; public const string NameId = "pressureAbsolute"; + public const string DefaultUnits = Devices.Units.PASCAL; public new const string DescriptionText = "Force per unit area measured relative to a vacuum."; @@ -23,6 +24,8 @@ public PressureAbsoluteDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public PressureAbsoluteDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PressureDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PressureDataItem.g.cs index 69b8297c..a513cec4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PressureDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PressureDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PressureDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PRESSURE"; public const string NameId = "pressure"; + public const string DefaultUnits = Devices.Units.PASCAL; public new const string DescriptionText = "Force per unit area measured relative to atmospheric pressure. Commonly referred to as gauge pressure."; @@ -23,6 +24,8 @@ public PressureDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public PressureDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/PressurizationRateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/PressurizationRateDataItem.g.cs index e7fc5222..385560af 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/PressurizationRateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/PressurizationRateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class PressurizationRateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PRESSURIZATION_RATE"; public const string NameId = "pressurizationRate"; + public const string DefaultUnits = Devices.Units.PASCAL_PER_SECOND; public new const string DescriptionText = "Change of pressure per unit time."; @@ -42,6 +43,8 @@ public PressurizationRateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessAggregateIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessAggregateIdDataItem.g.cs index aae769f5..094aaae0 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessAggregateIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessAggregateIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProcessAggregateIdDataItem : DataItem public const string TypeId = "PROCESS_AGGREGATE_ID"; public const string NameId = "processAggregateId"; + public new const string DescriptionText = "Identifier given to link the individual occurrence to a group of related occurrences, such as a process step in a process plan."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProcessAggregateIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessKindIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessKindIdDataItem.g.cs index 34921ee0..fd28ef07 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessKindIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessKindIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProcessKindIdDataItem : DataItem public const string TypeId = "PROCESS_KIND_ID"; public const string NameId = "processKindId"; + public new const string DescriptionText = "Identifier given to link the individual occurrence to a class of processes or process definition."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProcessKindIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessOccurrenceIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessOccurrenceIdDataItem.g.cs index 4dec4db9..f3cb0e10 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessOccurrenceIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessOccurrenceIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProcessOccurrenceIdDataItem : DataItem public const string TypeId = "PROCESS_OCCURRENCE_ID"; public const string NameId = "processOccurrenceId"; + public new const string DescriptionText = "Identifier of a process being executed by the device."; public override string TypeDescription => DescriptionText; @@ -47,6 +48,8 @@ public ProcessOccurrenceIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessStateDataItem.g.cs index ef9dccd9..de17c73b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ProcessStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PROCESS_STATE"; public const string NameId = "processState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Particular condition of the process occurrence at a specific time."; @@ -23,6 +24,8 @@ public ProcessStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ProcessStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimeDataItem.g.cs index d661cec4..cb683bf5 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProcessTimeDataItem : DataItem public const string TypeId = "PROCESS_TIME"; public const string NameId = "processTime"; + public new const string DescriptionText = "Time and date associated with an activity or event."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProcessTimeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimerDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimerDataItem.g.cs index 7c3ac57d..d6f80c61 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimerDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProcessTimerDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ProcessTimerDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "PROCESS_TIMER"; public const string NameId = "processTimer"; + public const string DefaultUnits = Devices.Units.SECOND; public new const string DescriptionText = "Amount of time a piece of equipment has performed different types of activities associated with the process being performed at that piece of equipment."; @@ -37,6 +38,8 @@ public ProcessTimerDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramCommentDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramCommentDataItem.g.cs index 68da6a18..f59c0358 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramCommentDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramCommentDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProgramCommentDataItem : DataItem public const string TypeId = "PROGRAM_COMMENT"; public const string NameId = "programComment"; + public new const string DescriptionText = "Comment or non-executable statement in the control program."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProgramCommentDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramDataItem.g.cs index 9cff979a..a33187a9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProgramDataItem : DataItem public const string TypeId = "PROGRAM"; public const string NameId = "program"; + public new const string DescriptionText = "Name of the logic or motion program being executed by the Controller component."; public override string TypeDescription => DescriptionText; @@ -62,6 +63,8 @@ public ProgramDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -75,6 +78,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditDataItem.g.cs index 49f1f494..7fd92bb1 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ProgramEditDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PROGRAM_EDIT"; public const string NameId = "programEdit"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of the status of the Controller components program editing mode.A program may be edited while another is executed."; @@ -23,6 +24,8 @@ public ProgramEditDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ProgramEditDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditNameDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditNameDataItem.g.cs index dc1df196..aa5c4a72 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditNameDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramEditNameDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProgramEditNameDataItem : DataItem public const string TypeId = "PROGRAM_EDIT_NAME"; public const string NameId = "programEditName"; + public new const string DescriptionText = "Name of the program being edited. This is used in conjunction with ProgramEdit when in `ACTIVE` state."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ProgramEditNameDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ProgramEditNameDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramHeaderDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramHeaderDataItem.g.cs index 4c694d86..9fa9d3cc 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramHeaderDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramHeaderDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProgramHeaderDataItem : DataItem public const string TypeId = "PROGRAM_HEADER"; public const string NameId = "programHeader"; + public new const string DescriptionText = "Non-executable header section of the control program."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProgramHeaderDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationDataItem.g.cs index c1b80389..af7dc52e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ProgramLocationDataItem : DataItem public const string TypeId = "PROGRAM_LOCATION"; public const string NameId = "programLocation"; + public new const string DescriptionText = "URI for the source file associated with Program."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public ProgramLocationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationTypeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationTypeDataItem.g.cs index 1311b3c5..f84685cd 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationTypeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramLocationTypeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ProgramLocationTypeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PROGRAM_LOCATION_TYPE"; public const string NameId = "programLocationType"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Defines whether the logic or motion program defined by Program is being executed from the local memory of the controller or from an outside source."; @@ -42,6 +43,8 @@ public ProgramLocationTypeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramNestLevelDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramNestLevelDataItem.g.cs index 067debb7..206f445c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramNestLevelDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ProgramNestLevelDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ProgramNestLevelDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "PROGRAM_NEST_LEVEL"; public const string NameId = "programNestLevel"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of the nesting level within a control program that is associated with the code or instructions that is currently being executed."; @@ -23,6 +24,8 @@ public ProgramNestLevelDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ProgramNestLevelDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ResistanceDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ResistanceDataItem.g.cs index 6da5443a..4abd5d4e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ResistanceDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ResistanceDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ResistanceDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "RESISTANCE"; public const string NameId = "resistance"; + public const string DefaultUnits = Devices.Units.OHM; public new const string DescriptionText = "Degree to which a substance opposes the passage of an electric current."; @@ -23,6 +24,8 @@ public ResistanceDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ResistanceDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryModeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryModeDataItem.g.cs index 1c2e775b..e6ef0d20 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryModeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryModeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class RotaryModeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ROTARY_MODE"; public const string NameId = "rotaryMode"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Current operating mode for a Rotary type axis."; @@ -23,6 +24,8 @@ public RotaryModeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public RotaryModeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityDataItem.g.cs index 1d24b8eb..a972a642 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class RotaryVelocityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "ROTARY_VELOCITY"; public const string NameId = "rotaryVelocity"; + public const string DefaultUnits = Devices.Units.REVOLUTION_PER_MINUTE; public new const string DescriptionText = "Rotational speed of a rotary axis."; @@ -47,6 +48,8 @@ public RotaryVelocityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityOverrideDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityOverrideDataItem.g.cs index 81e9e46f..da49f0c0 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityOverrideDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/RotaryVelocityOverrideDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class RotaryVelocityOverrideDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ROTARY_VELOCITY_OVERRIDE"; public const string NameId = "rotaryVelocityOverride"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Percentage change to the velocity of the programmed velocity for a Rotary axis."; @@ -23,6 +24,8 @@ public RotaryVelocityOverrideDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public RotaryVelocityOverrideDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/RotationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/RotationDataItem.g.cs index ec7743d9..6923e3cc 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/RotationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/RotationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class RotationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "ROTATION"; public const string NameId = "rotation"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public const string DefaultUnits = Devices.Units.DEGREE_3D; public new const string DescriptionText = "Three space angular displacement of an object or coordinate system relative to a cartesian coordinate system."; @@ -23,6 +24,8 @@ public RotationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } @@ -32,6 +35,8 @@ public RotationDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SensorAttachmentDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SensorAttachmentDataItem.g.cs index 8b252549..cce73f32 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SensorAttachmentDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SensorAttachmentDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SensorAttachmentDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "SENSOR_ATTACHMENT"; public const string NameId = "sensorAttachment"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Attachment between a sensor and an entity."; @@ -23,6 +24,8 @@ public SensorAttachmentDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public SensorAttachmentDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SensorStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SensorStateDataItem.g.cs index 906e04e1..177a320e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SensorStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SensorStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class SensorStateDataItem : DataItem public const string TypeId = "SENSOR_STATE"; public const string NameId = "sensorState"; + public new const string DescriptionText = "Detection result of a sensor."; public override string TypeDescription => DescriptionText; @@ -47,6 +48,8 @@ public SensorStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SerialNumberDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SerialNumberDataItem.g.cs index 5f76d860..511339ed 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SerialNumberDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SerialNumberDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class SerialNumberDataItem : DataItem public const string TypeId = "SERIAL_NUMBER"; public const string NameId = "serialNumber"; + public new const string DescriptionText = "Serial number associated with a Component, Asset, or Device."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public SerialNumberDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public SerialNumberDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorAngularDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorAngularDataItem.g.cs index 71a111a2..50466d45 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorAngularDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorAngularDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SettlingErrorAngularDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "SETTLING_ERROR_ANGULAR"; public const string NameId = "settlingErrorAngular"; + public const string DefaultUnits = Devices.Units.DEGREE; public new const string DescriptionText = "Angular difference between the commanded encoder/resolver position, and the actual encoder/resolver position when motion is complete."; @@ -32,6 +33,8 @@ public SettlingErrorAngularDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorDataItem.g.cs index a18c3167..f1c17139 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SettlingErrorDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "SETTLING_ERROR"; public const string NameId = "settlingError"; + public const string DefaultUnits = Devices.Units.COUNT; public new const string DescriptionText = "Difference between actual and commanded position at the end of a motion."; @@ -32,6 +33,8 @@ public SettlingErrorDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorLinearDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorLinearDataItem.g.cs index c71affdb..a4b36f0c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorLinearDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SettlingErrorLinearDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SettlingErrorLinearDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "SETTLING_ERROR_LINEAR"; public const string NameId = "settlingErrorLinear"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Difference between the commanded encoder/resolver position, and the actual encoder/resolver position when motion is complete."; @@ -32,6 +33,8 @@ public SettlingErrorLinearDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -45,6 +48,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SoundLevelDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SoundLevelDataItem.g.cs index c4f7bba0..7d378b31 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SoundLevelDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SoundLevelDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SoundLevelDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "SOUND_LEVEL"; public const string NameId = "soundLevel"; + public const string DefaultUnits = Devices.Units.DECIBEL; public new const string DescriptionText = "Sound level or sound pressure level relative to atmospheric pressure."; @@ -52,6 +53,8 @@ public SoundLevelDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -65,6 +68,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SpecificationLimitDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SpecificationLimitDataItem.g.cs index bcbb1c83..cd25f738 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SpecificationLimitDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SpecificationLimitDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SpecificationLimitDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "SPECIFICATION_LIMIT"; public const string NameId = "specificationLimit"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Set of limits defining a range of values designating acceptable performance for a variable."; @@ -23,6 +24,8 @@ public SpecificationLimitDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public SpecificationLimitDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleInterlockDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleInterlockDataItem.g.cs index 8473fe9b..f202c184 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleInterlockDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleInterlockDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SpindleInterlockDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "SPINDLE_INTERLOCK"; public const string NameId = "spindleInterlock"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of the status of the spindle for a piece of equipment when power has been removed and it is free to rotate."; @@ -23,6 +24,8 @@ public SpindleInterlockDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public SpindleInterlockDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleSpeedDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleSpeedDataItem.g.cs index f2edf9c8..dcf34a83 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleSpeedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SpindleSpeedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class SpindleSpeedDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "SPINDLE_SPEED"; public const string NameId = "spindleSpeed"; + public const string DefaultUnits = Devices.Units.REVOLUTION_PER_MINUTE; public new const string DescriptionText = "Rotational speed of the rotary axis.**DEPRECATED** in *Version 1.2*. Replaced by `ROTARY_VELOCITY`."; @@ -42,6 +43,8 @@ public SpindleSpeedDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/StrainDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/StrainDataItem.g.cs index 0d956bb8..aee1d0d4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/StrainDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/StrainDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class StrainDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "STRAIN"; public const string NameId = "strain"; + public const string DefaultUnits = Devices.Units.PERCENT; public new const string DescriptionText = "Amount of deformation per unit length of an object when a load is applied."; @@ -23,6 +24,8 @@ public StrainDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public StrainDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/SystemDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/SystemDataItem.g.cs index 14a3fc2d..a77530f4 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/SystemDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/SystemDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class SystemDataItem : DataItem public const string TypeId = "SYSTEM"; public const string NameId = "system"; + public new const string DescriptionText = "General purpose indication associated with an electronic component of a piece of equipment or a controller that represents a fault that is not associated with the operator, program, or hardware."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public SystemDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public SystemDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TemperatureDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TemperatureDataItem.g.cs index a6cb99f5..cb25fe3b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TemperatureDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TemperatureDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -10,7 +10,8 @@ public class TemperatureDataItem : DataItem { public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "TEMPERATURE"; - public const string NameId = "temperature"; + public const string NameId = "temp"; + public const string DefaultUnits = Devices.Units.CELSIUS; public new const string DescriptionText = "Degree of hotness or coldness measured on a definite scale."; @@ -23,6 +24,8 @@ public TemperatureDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public TemperatureDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TensionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TensionDataItem.g.cs index 84b8798f..6f5f952c 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TensionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TensionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class TensionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "TENSION"; public const string NameId = "tension"; + public const string DefaultUnits = Devices.Units.NEWTON; public new const string DescriptionText = "Force that stretches or elongates an object."; @@ -23,6 +24,8 @@ public TensionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public TensionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TiltDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TiltDataItem.g.cs index 88f43d2d..5daeb8dc 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TiltDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TiltDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class TiltDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "TILT"; public const string NameId = "tilt"; + public const string DefaultUnits = Devices.Units.MICRO_RADIAN; public new const string DescriptionText = "Angular displacement."; @@ -23,6 +24,8 @@ public TiltDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public TiltDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolAssetIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolAssetIdDataItem.g.cs index 270aca90..c15236be 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolAssetIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolAssetIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ToolAssetIdDataItem : DataItem public const string TypeId = "TOOL_ASSET_ID"; public const string NameId = "toolAssetId"; + public new const string DescriptionText = "Identifier of an individual tool asset."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ToolAssetIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ToolAssetIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolGroupDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolGroupDataItem.g.cs index bb604d0b..622614ad 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolGroupDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolGroupDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ToolGroupDataItem : DataItem public const string TypeId = "TOOL_GROUP"; public const string NameId = "toolGroup"; + public new const string DescriptionText = "Identifier for the tool group associated with a specific tool. Commonly used to designate spare tools."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ToolGroupDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ToolGroupDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolIdDataItem.g.cs index 5a4af1af..b15b2d2e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ToolIdDataItem : DataItem public const string TypeId = "TOOL_ID"; public const string NameId = "toolId"; + public new const string DescriptionText = "Identifier of the tool currently in use for a given `Path`.**DEPRECATED** in *Version 1.2.0*. See `TOOL_ASSET_ID`."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ToolIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ToolIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolNumberDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolNumberDataItem.g.cs index 4a7db702..30a4428a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolNumberDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolNumberDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class ToolNumberDataItem : DataItem public const string TypeId = "TOOL_NUMBER"; public const string NameId = "toolNumber"; + public new const string DescriptionText = "Identifier assigned by the Controller component to a cutting tool when in use by a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public ToolNumberDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public ToolNumberDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetDataItem.g.cs index 4abafd64..46f5e0d9 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ToolOffsetDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "TOOL_OFFSET"; public const string NameId = "toolOffset"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Reference to the tool offset variables applied to the active cutting tool."; @@ -37,6 +38,8 @@ public ToolOffsetDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetsDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetsDataItem.g.cs index d95280e1..5be4749a 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetsDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ToolOffsetsDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ToolOffsetsDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "TOOL_OFFSETS"; public const string NameId = "toolOffsets"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Properties of each addressable tool offset."; @@ -23,6 +24,8 @@ public ToolOffsetsDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public ToolOffsetsDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TorqueDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TorqueDataItem.g.cs index 28259d70..d0759de8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TorqueDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TorqueDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class TorqueDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "TORQUE"; public const string NameId = "torque"; + public const string DefaultUnits = Devices.Units.NEWTON_METER; public new const string DescriptionText = "Turning force exerted on an object or by an object."; @@ -23,6 +24,8 @@ public TorqueDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public TorqueDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TransferCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TransferCountDataItem.g.cs index 1ca76617..b2bf984f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TransferCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TransferCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class TransferCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "TRANSFER_COUNT"; public const string NameId = "transferCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Accumulation of the number of times an operation has attempted to, or is planned to attempt to, transfer materials, parts, or other items from one location to another."; @@ -67,6 +68,8 @@ public TransferCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/TranslationDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/TranslationDataItem.g.cs index f95aa16b..c199eb84 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/TranslationDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/TranslationDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class TranslationDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "TRANSLATION"; public const string NameId = "translation"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public const string DefaultUnits = Devices.Units.MILLIMETER_3D; public new const string DescriptionText = "Three space linear displacement of an object or coordinate system relative to a cartesian coordinate system."; @@ -23,6 +24,8 @@ public TranslationDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; Units = DefaultUnits; } @@ -32,6 +35,8 @@ public TranslationDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyDataItem.g.cs index 5548414e..55805bd7 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class UncertaintyDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "UNCERTAINTY"; public const string NameId = "uncertainty"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Uncertainty specified by UncertaintyType."; @@ -23,6 +24,8 @@ public UncertaintyDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public UncertaintyDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyTypeDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyTypeDataItem.g.cs index f8b4a777..909aea36 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyTypeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/UncertaintyTypeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class UncertaintyTypeDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "UNCERTAINTY_TYPE"; public const string NameId = "uncertaintyType"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Method used to compute standard uncertainty."; @@ -23,6 +24,8 @@ public UncertaintyTypeDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public UncertaintyTypeDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/UnloadCountDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/UnloadCountDataItem.g.cs index 0a327ac0..cfe12b18 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/UnloadCountDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/UnloadCountDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class UnloadCountDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "UNLOAD_COUNT"; public const string NameId = "unloadCount"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Accumulation of the number of times an operation has attempted to, or is planned to attempt to, unload materials, parts, or other items."; @@ -67,6 +68,8 @@ public UnloadCountDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -80,6 +83,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/UserDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/UserDataItem.g.cs index 490b25e7..a64f46f8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/UserDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/UserDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class UserDataItem : DataItem public const string TypeId = "USER"; public const string NameId = "user"; + public new const string DescriptionText = "Identifier of the person currently responsible for operating the piece of equipment."; public override string TypeDescription => DescriptionText; @@ -42,6 +43,8 @@ public UserDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ValveStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ValveStateDataItem.g.cs index eef57804..2415e69f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ValveStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ValveStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ValveStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "VALVE_STATE"; public const string NameId = "valveState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "State of a valve is one of open, closed, or transitioning between the states."; @@ -37,6 +38,8 @@ public ValveStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Representation = DefaultRepresentation; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VariableDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VariableDataItem.g.cs index 9cec7aac..187dc098 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VariableDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VariableDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class VariableDataItem : DataItem public const string TypeId = "VARIABLE"; public const string NameId = "variable"; + public new const string DescriptionText = "Data whose meaning may change over time due to changes in the operation of a piece of equipment or the process being executed on that piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public VariableDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public VariableDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VelocityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VelocityDataItem.g.cs index 84f4370d..0bafa036 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VelocityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VelocityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VelocityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VELOCITY"; public const string NameId = "velocity"; + public const string DefaultUnits = Devices.Units.MILLIMETER_PER_SECOND; public new const string DescriptionText = "Rate of change of position of a Component."; @@ -23,6 +24,8 @@ public VelocityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public VelocityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ViscosityDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ViscosityDataItem.g.cs index e48993a1..dae4ae5b 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ViscosityDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ViscosityDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ViscosityDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VISCOSITY"; public const string NameId = "viscosity"; + public const string DefaultUnits = Devices.Units.PASCAL_SECOND; public new const string DescriptionText = "Fluid's resistance to flow."; @@ -23,6 +24,8 @@ public ViscosityDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ViscosityDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereDataItem.g.cs index b34c654e..efe24a13 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VoltAmpereDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLT_AMPERE"; public const string NameId = "voltAmpere"; + public const string DefaultUnits = Devices.Units.VOLT_AMPERE; public new const string DescriptionText = "Apparent power in an electrical circuit, equal to the product of root-mean-square (RMS) voltage and RMS current (commonly referred to as VA)."; @@ -23,6 +24,8 @@ public VoltAmpereDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public VoltAmpereDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereReactiveDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereReactiveDataItem.g.cs index 9423a0cb..9f562d79 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereReactiveDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltAmpereReactiveDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VoltAmpereReactiveDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLT_AMPERE_REACTIVE"; public const string NameId = "voltAmpereReactive"; + public const string DefaultUnits = Devices.Units.VOLT_AMPERE_REACTIVE; public new const string DescriptionText = "Reactive power in an AC electrical circuit (commonly referred to as VAR)."; @@ -23,6 +24,8 @@ public VoltAmpereReactiveDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public VoltAmpereReactiveDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageACDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageACDataItem.g.cs index 1cce18ed..a6b1d853 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageACDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageACDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VoltageACDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLTAGE_AC"; public const string NameId = "voltageAc"; + public const string DefaultUnits = Devices.Units.VOLT; public new const string DescriptionText = "Electrical potential between two points in an electrical circuit in which the current periodically reverses direction."; @@ -42,6 +43,8 @@ public VoltageACDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDCDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDCDataItem.g.cs index ea8d7023..9803515d 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDCDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDCDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VoltageDCDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLTAGE_DC"; public const string NameId = "voltageDc"; + public const string DefaultUnits = Devices.Units.VOLT; public new const string DescriptionText = "Electrical potential between two points in an electrical circuit in which the current is unidirectional."; @@ -42,6 +43,8 @@ public VoltageDCDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -55,6 +58,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDataItem.g.cs index efe5d496..aa4732de 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VoltageDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VoltageDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLTAGE"; public const string NameId = "voltage"; + public const string DefaultUnits = Devices.Units.VOLT; public new const string DescriptionText = "Electrical potential between two points.**DEPRECATED** in *Version 1.6*. Replaced by `VOLTAGE_AC` and `VOLTAGE_DC`."; @@ -47,6 +48,8 @@ public VoltageDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -60,6 +63,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeFluidDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeFluidDataItem.g.cs index babdce32..0198642e 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeFluidDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeFluidDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VolumeFluidDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLUME_FLUID"; public const string NameId = "volumeFluid"; + public const string DefaultUnits = Devices.Units.MILLILITER; public new const string DescriptionText = "Fluid volume of an object or container."; @@ -57,6 +58,8 @@ public VolumeFluidDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -70,6 +73,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeSpatialDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeSpatialDataItem.g.cs index f5e576b3..50e350ef 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeSpatialDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/VolumeSpatialDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class VolumeSpatialDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "VOLUME_SPATIAL"; public const string NameId = "volumeSpatial"; + public const string DefaultUnits = Devices.Units.CUBIC_MILLIMETER; public new const string DescriptionText = "Geometric volume of an object or container."; @@ -57,6 +58,8 @@ public VolumeSpatialDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -70,6 +73,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WaitStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WaitStateDataItem.g.cs index 8133c7b0..a1efe035 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WaitStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WaitStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class WaitStateDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "WAIT_STATE"; public const string NameId = "waitState"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.VALUE; public new const string DescriptionText = "Indication of the reason that Execution is reporting a value of `WAIT`."; @@ -23,6 +24,8 @@ public WaitStateDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public WaitStateDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WattageDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WattageDataItem.g.cs index 267e2bd0..80a90988 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WattageDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WattageDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class WattageDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "WATTAGE"; public const string NameId = "wattage"; + public const string DefaultUnits = Devices.Units.WATT; public new const string DescriptionText = "Power flowing through or dissipated by an electrical circuit or piece of equipment."; @@ -37,6 +38,8 @@ public WattageDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -50,6 +53,7 @@ SubTypes subType Type = TypeId; SubType = subType.ToString(); Name = NameId; + Units = DefaultUnits; } diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WireDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WireDataItem.g.cs index 92310791..818ae870 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WireDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WireDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class WireDataItem : DataItem public const string TypeId = "WIRE"; public const string NameId = "wire"; + public new const string DescriptionText = "Identifier for the type of wire used as the cutting mechanism in Electrical Discharge Machining or similar processes."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public WireDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public WireDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetDataItem.g.cs index 90ef5e4a..37d2928f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class WorkOffsetDataItem : DataItem public const string TypeId = "WORK_OFFSET"; public const string NameId = "workOffset"; + public new const string DescriptionText = "Reference to offset variables for a work piece or part."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public WorkOffsetDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public WorkOffsetDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetsDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetsDataItem.g.cs index 54b16bea..bbcedb7f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetsDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkOffsetsDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class WorkOffsetsDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.EVENT; public const string TypeId = "WORK_OFFSETS"; public const string NameId = "workOffsets"; + public const DataItemRepresentation DefaultRepresentation = DataItemRepresentation.TABLE; public new const string DescriptionText = "Properties of each addressable work offset."; @@ -23,6 +24,8 @@ public WorkOffsetsDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Representation = DefaultRepresentation; } @@ -32,6 +35,8 @@ public WorkOffsetsDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + Representation = DefaultRepresentation; + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkholdingIdDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkholdingIdDataItem.g.cs index c78ce7b8..16f0f564 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/WorkholdingIdDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/WorkholdingIdDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -12,6 +12,7 @@ public class WorkholdingIdDataItem : DataItem public const string TypeId = "WORKHOLDING_ID"; public const string NameId = "workholdingId"; + public new const string DescriptionText = "Identifier for the current workholding or part clamp in use by a piece of equipment."; public override string TypeDescription => DescriptionText; @@ -23,6 +24,8 @@ public WorkholdingIdDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + } @@ -32,6 +35,8 @@ public WorkholdingIdDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/XDimensionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/XDimensionDataItem.g.cs index af8f8bcd..5e1304c8 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/XDimensionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/XDimensionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class XDimensionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "X_DIMENSION"; public const string NameId = "xDimension"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Dimension of an entity relative to the X direction of the referenced coordinate system."; @@ -23,6 +24,8 @@ public XDimensionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public XDimensionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/YDimensionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/YDimensionDataItem.g.cs index 4da865cc..d5d2f80f 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/YDimensionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/YDimensionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class YDimensionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "Y_DIMENSION"; public const string NameId = "yDimension"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Dimension of an entity relative to the Y direction of the referenced coordinate system."; @@ -23,6 +24,8 @@ public YDimensionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public YDimensionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/DataItems/ZDimensionDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/DataItems/ZDimensionDataItem.g.cs index 0312a602..220cd7d3 100644 --- a/libraries/MTConnect.NET-Common/Devices/DataItems/ZDimensionDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DataItems/ZDimensionDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.DataItems @@ -11,6 +11,7 @@ public class ZDimensionDataItem : DataItem public const DataItemCategory CategoryId = DataItemCategory.SAMPLE; public const string TypeId = "Z_DIMENSION"; public const string NameId = "zDimension"; + public const string DefaultUnits = Devices.Units.MILLIMETER; public new const string DescriptionText = "Dimension of an entity relative to the Z direction of the referenced coordinate system."; @@ -23,6 +24,8 @@ public ZDimensionDataItem() { Category = CategoryId; Type = TypeId; + Name = NameId; + Units = DefaultUnits; } @@ -32,6 +35,8 @@ public ZDimensionDataItem(string deviceId) Category = CategoryId; Type = TypeId; Name = NameId; + + Units = DefaultUnits; } } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/Description.g.cs b/libraries/MTConnect.NET-Common/Devices/Description.g.cs index ef15b77e..d83bf366 100644 --- a/libraries/MTConnect.NET-Common/Devices/Description.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Description.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_64352755_7251_46af_846D_937E5A1E3949 diff --git a/libraries/MTConnect.NET-Common/Devices/DescriptionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DescriptionDescriptions.g.cs index 9b01df34..767dbc0d 100644 --- a/libraries/MTConnect.NET-Common/Devices/DescriptionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DescriptionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Device.cs b/libraries/MTConnect.NET-Common/Devices/Device.cs index 82a73eeb..ccd584b4 100644 --- a/libraries/MTConnect.NET-Common/Devices/Device.cs +++ b/libraries/MTConnect.NET-Common/Devices/Device.cs @@ -1,6 +1,7 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. +using MTConnect.Devices.Components; using System; using System.Collections.Generic; using System.Linq; @@ -83,7 +84,14 @@ public partial class Device : IDevice public virtual Version MinimumVersion => DefaultMinimumVersion; - public Device() + public string ComponentIdFormat { get; set; } + + public string CompositionIdFormat { get; set; } + + public string DataItemIdFormat { get; set; } + + + public Device() { Id = StringFunctions.RandomString(10); Name = "dev"; @@ -92,7 +100,11 @@ public Device() DataItems = new List(); Components = new List(); Compositions = new List(); - } + + DataItemIdFormat = Component._defaultDataItemIdFormat; + CompositionIdFormat = Component._defaultCompositionIdFormat; + ComponentIdFormat = Component._defaultComponentIdFormat; + } public string GenerateHash() @@ -201,6 +213,102 @@ private static List GetComponents(IComponent component) return l.Count > 0 ? l : null; } + /// + /// Return the first Component matching the Type + /// + public IComponent GetComponent(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Components; break; + case SearchType.AnyLevel: components = GetComponents(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.FirstOrDefault(o => o.Type == type && o.Name == name); + } + else + { + return components.FirstOrDefault(o => o.Type == type); + } + } + } + + return null; + } + + /// + /// Return the first Component matching the Type + /// + public IComponent GetComponent(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent + { + var typeIdField = typeof(TComponent).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComponent(typeId, name, searchType); + } + } + + return null; + } + + /// + /// Return All Components matching the Type + /// + public IEnumerable GetComponents(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Components; break; + case SearchType.AnyLevel: components = GetComponents(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.Where(o => o.Type == type && o.Name == name); + } + else + { + return components.Where(o => o.Type == type); + } + } + } + + return null; + } + + /// + /// Return All Components matching the Type + /// + public IEnumerable GetComponents(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent + { + var typeIdField = typeof(TComponent).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComponents(typeId, name, searchType); + } + } + + return null; + } + /// /// Add a Component to the Device @@ -210,7 +318,15 @@ public void AddComponent(IComponent component) { if (component != null) { - var components = new List(); + component.Parent = this; + + // Set ID + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(component.Id)) + { + Component.ResetIds(component); + } + + var components = new List(); if (!Components.IsNullOrEmpty()) { @@ -218,14 +334,16 @@ public void AddComponent(IComponent component) } var organizerType = Organizers.GetOrganizerType(component.Type); - if (organizerType != null) + if (organizerType != null && organizerType != ControllersComponent.TypeId) { if (!components.Any(o => o.Type == organizerType)) { var organizer = Component.Create(organizerType); if (organizer != null) { - organizer.AddComponent(component); + organizer.Parent = this; + organizer.Id = Component.CreateContainerId(organizer, ComponentIdFormat); + organizer.AddComponent(component); components.Add(organizer); } } @@ -255,15 +373,20 @@ public void AddComponents(IEnumerable components) { if (!components.IsNullOrEmpty()) { - var newComponents = new List(); - - if (!Components.IsNullOrEmpty()) + foreach (var component in components) { - newComponents.AddRange(Components); + AddComponent(component); } - newComponents.AddRange(components); - Components = newComponents; + //var newComponents = new List(); + + //if (!Components.IsNullOrEmpty()) + //{ + // newComponents.AddRange(Components); + //} + + //newComponents.AddRange(components); + //Components = newComponents; } } @@ -304,7 +427,6 @@ private void RemoveComponent(IComponent component, string componentId) } ((Component)component).Components = components; - //component.Components = components; } } @@ -319,82 +441,215 @@ public IEnumerable GetCompositions() { var l = new List(); - var components = GetComponents(); - if (!components.IsNullOrEmpty()) + if (!Compositions.IsNullOrEmpty()) { - foreach (var component in components) + foreach (var composition in Compositions) { - if (!component.Compositions.IsNullOrEmpty()) + l.Add(composition); + } + } + + if (!Components.IsNullOrEmpty()) + { + foreach (var subComponent in Components) + { + var components = GetCompositions(subComponent); + if (!components.IsNullOrEmpty()) l.AddRange(components); + } + } + return !l.IsNullOrEmpty() ? l : null; + } + + private IEnumerable GetCompositions(IComponent component) + { + var l = new List(); + + if (!component.Compositions.IsNullOrEmpty()) + { + foreach (var composition in component.Compositions) + { + l.Add(composition); + } + } + + if (!component.Components.IsNullOrEmpty()) + { + foreach (var subComponent in component.Components) + { + var compositions = GetCompositions(subComponent); + if (!compositions.IsNullOrEmpty()) l.AddRange(compositions); + } + } + + return !l.IsNullOrEmpty() ? l : null; + } + + /// + /// Return the first Composition matching the Type + /// + public IComposition GetComposition(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Compositions; break; + case SearchType.AnyLevel: components = GetCompositions(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.FirstOrDefault(o => o.Type == type && o.Name == name); + } + else { - l.AddRange(component.Compositions); + return components.FirstOrDefault(o => o.Type == type); } } } - return !l.IsNullOrEmpty() ? l : null; + return null; + } + + /// + /// Return the first Composition matching the Type + /// + public IComposition GetComposition(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition + { + var typeIdField = typeof(TComposition).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetComposition(typeId, name, searchType); + } + } + + return null; + } + + /// + /// Return All Compositions matching the Type + /// + public IEnumerable GetCompositions(string type, string name = null, SearchType searchType = SearchType.AnyLevel) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable components = null; + switch (searchType) + { + case SearchType.Child: components = Compositions; break; + case SearchType.AnyLevel: components = GetCompositions(); break; + } + + if (!components.IsNullOrEmpty()) + { + if (!string.IsNullOrEmpty(name)) + { + return components.Where(o => o.Type == type && o.Name == name); + } + else + { + return components.Where(o => o.Type == type); + } + } + } + + return null; + } + + /// + /// Return All Compositions matching the Type + /// + public IEnumerable GetCompositions(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition + { + var typeIdField = typeof(TComposition).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetCompositions(typeId, name, searchType); + } + } + + return null; } /// - /// Add a Composition to the Device + /// Add a Composition to the Composition /// /// The Composition to add public void AddComposition(IComposition composition) { if (composition != null) { - var compositions = new List(); + composition.Parent = this; + + // Set ID + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(composition.Id)) + { + Component.ResetIds(composition); + } + + var components = new List(); if (!Compositions.IsNullOrEmpty()) { - compositions.AddRange(Compositions); + components.AddRange(Compositions); } - compositions.Add(composition); - Compositions = compositions; + components.Add(composition); + Compositions = components; } } /// - /// Add Compositions to the Device + /// Add Compositions to the Composition /// /// The Compositions to add public void AddCompositions(IEnumerable compositions) { if (!compositions.IsNullOrEmpty()) { - var newCompositions = new List(); - - if (!Compositions.IsNullOrEmpty()) + foreach (var component in compositions) { - newCompositions.AddRange(Compositions); + AddComposition(component); } - - newCompositions.AddRange(compositions); - Compositions = newCompositions; } } /// - /// Remove a Composition from the Device + /// Remove a Composition from the Composition /// /// The ID of the Composition to remove public void RemoveComposition(string compositionId) { - var components = GetComponents(); - if (!components.IsNullOrEmpty()) + if (!Compositions.IsNullOrEmpty()) { - foreach (var component in components) - { - if (!component.Compositions.IsNullOrEmpty()) - { - var compositions = new List(); - compositions.AddRange(component.Compositions); - compositions.RemoveAll(o => o.Id == compositionId); - ((Component)component).Compositions = compositions; - } - } + var compositions = new List(); + compositions.AddRange(Compositions); + compositions.RemoveAll(o => o.Id == compositionId); + + Compositions = compositions; + } + } + + private void RemoveComposition(IComponent component, string compositionId) + { + if (component != null && !component.Compositions.IsNullOrEmpty()) + { + var compositions = new List(); + compositions.AddRange(component.Compositions); + compositions.RemoveAll(o => o.Id == compositionId); + + ((Component)component).AddCompositions(compositions); } } @@ -494,6 +749,134 @@ public IDataItem GetDataItemByKey(string dataItemKey) return null; } + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItemByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type and SubType + /// + public IDataItem GetDataItemByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return the first DataItem matching the Type + /// + public IDataItem GetDataItem(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemByType(typeId, subType, searchType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type + /// + public IEnumerable GetDataItemsByType(string type, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItemsByType(string type, string subType, SearchType searchType = SearchType.Child) + { + if (!string.IsNullOrEmpty(type)) + { + IEnumerable dataItems = null; + switch (searchType) + { + case SearchType.Child: dataItems = DataItems; break; + case SearchType.AnyLevel: dataItems = GetDataItems(); break; + } + + if (!dataItems.IsNullOrEmpty()) + { + return dataItems.Where(o => o.Type == type && o.SubType == subType); + } + } + + return null; + } + + /// + /// Return All DataItems matching the Type and SubType + /// + public IEnumerable GetDataItems(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem + { + var typeIdField = typeof(TDataItem).GetField("TypeId"); + if (typeIdField != null) + { + var typeId = typeIdField.GetValue(null)?.ToString(); + if (!string.IsNullOrEmpty(typeId)) + { + return GetDataItemsByType(typeId, subType, searchType); + } + } + + return null; + } + /// /// Add a DataItem to the Device @@ -503,7 +886,11 @@ public void AddDataItem(IDataItem dataItem) { if (dataItem != null) { - var dataItems = new List(); + ((DataItem)dataItem).Container = this; + + if (!string.IsNullOrEmpty(Id) && string.IsNullOrEmpty(dataItem.Id)) Component.ResetId(this, dataItem); + + var dataItems = new List(); if (!DataItems.IsNullOrEmpty()) { @@ -523,6 +910,41 @@ public void AddDataItem(DataItemCategory category, string type, string subType = } } + /// + /// Add a DataItem to the Component + /// + public void AddDataItem() where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + AddDataItem(dataItem); + } + catch { } + } + } + + /// + /// Add a DataItem to the Component + /// + public void AddDataItem(object subType) where TDataItem : IDataItem + { + var constructor = typeof(TDataItem).GetConstructor(new Type[] { }); + if (constructor != null) + { + try + { + var dataItem = (DataItem)constructor.Invoke(null); + dataItem.SubType = subType?.ToString(); + AddDataItem(dataItem); + } + catch { } + } + } + /// /// Add DataItems to the Device /// @@ -531,16 +953,21 @@ public void AddDataItems(IEnumerable dataItems) { if (!dataItems.IsNullOrEmpty()) { - var newDataItems = new List(); + foreach (var dataItem in dataItems) + { + AddDataItem(dataItem); + } - if (!DataItems.IsNullOrEmpty()) - { - newDataItems.AddRange(DataItems); - } + //var newDataItems = new List(); - newDataItems.AddRange(dataItems); - DataItems = newDataItems; - } + //if (!DataItems.IsNullOrEmpty()) + //{ + // newDataItems.AddRange(DataItems); + //} + + //newDataItems.AddRange(dataItems); + //DataItems = newDataItems; + } } diff --git a/libraries/MTConnect.NET-Common/Devices/Device.g.cs b/libraries/MTConnect.NET-Common/Devices/Device.g.cs index d0e6ee3b..c695f125 100644 --- a/libraries/MTConnect.NET-Common/Devices/Device.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Device.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1620240839406_285612_1596 diff --git a/libraries/MTConnect.NET-Common/Devices/DeviceDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/DeviceDescriptions.g.cs index e0417cde..242c7174 100644 --- a/libraries/MTConnect.NET-Common/Devices/DeviceDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/DeviceDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/EntryDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/EntryDefinition.g.cs index 3b4fee25..2525e74d 100644 --- a/libraries/MTConnect.NET-Common/Devices/EntryDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/EntryDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1582939685398_830533_4339 diff --git a/libraries/MTConnect.NET-Common/Devices/EntryDefinitionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/EntryDefinitionDescriptions.g.cs index d9acfb65..7b80f262 100644 --- a/libraries/MTConnect.NET-Common/Devices/EntryDefinitionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/EntryDefinitionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Filter.g.cs b/libraries/MTConnect.NET-Common/Devices/Filter.g.cs index 651143f0..6abe7533 100644 --- a/libraries/MTConnect.NET-Common/Devices/Filter.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Filter.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_8A5219C3_747D_4904_A58A_A312D13DAEE9 diff --git a/libraries/MTConnect.NET-Common/Devices/FilterDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/FilterDescriptions.g.cs index 611e8e79..4a546d15 100644 --- a/libraries/MTConnect.NET-Common/Devices/FilterDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/FilterDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IAbstractDataItemRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/IAbstractDataItemRelationship.g.cs index 750d2192..a346d8ca 100644 --- a/libraries/MTConnect.NET-Common/Devices/IAbstractDataItemRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IAbstractDataItemRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/ICellDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/ICellDefinition.g.cs index 8cdf09d1..bf59fbb5 100644 --- a/libraries/MTConnect.NET-Common/Devices/ICellDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/ICellDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IComponent.cs b/libraries/MTConnect.NET-Common/Devices/IComponent.cs index 69457ae4..56721da3 100644 --- a/libraries/MTConnect.NET-Common/Devices/IComponent.cs +++ b/libraries/MTConnect.NET-Common/Devices/IComponent.cs @@ -1,15 +1,10 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using System.Collections.Generic; namespace MTConnect.Devices { - /// - /// An abstract XML Element. - /// Replaced in the XML document by types of Component elements representing physical and logical parts of the Device. - /// There can be multiple types of Component XML Elements in the document. - /// public partial interface IComponent : IContainer { /// @@ -20,6 +15,58 @@ public partial interface IComponent : IContainer bool IsOrganizer { get; } + /// + /// Return a list of All Components + /// + IEnumerable GetComponents(); + + /// + /// Return the first Component matching the Type + /// + IComponent GetComponent(string type, string name = null, SearchType searchType = SearchType.AnyLevel); + + /// + /// Return the first Component matching the Type + /// + IComponent GetComponent(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent; + + /// + /// Return All Components matching the Type + /// + IEnumerable GetComponents(string type, string name = null, SearchType searchType = SearchType.AnyLevel); + + /// + /// Return All Components matching the Type + /// + IEnumerable GetComponents(string name = null, SearchType searchType = SearchType.AnyLevel) where TComponent : IComponent; + + + /// + /// Return a list of All Compositions + /// + IEnumerable GetCompositions(); + + /// + /// Return the first Composition matching the Type + /// + IComposition GetComposition(string type, string name = null, SearchType searchType = SearchType.AnyLevel); + + /// + /// Return the first Composition matching the Type + /// + IComposition GetComposition(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition; + + /// + /// Return All Compositions matching the Type + /// + IEnumerable GetCompositions(string type, string name = null, SearchType searchType = SearchType.AnyLevel); + + /// + /// Return All Compositions matching the Type + /// + IEnumerable GetCompositions(string name = null, SearchType searchType = SearchType.AnyLevel) where TComposition : IComposition; + + /// /// Return a list of All DataItems /// @@ -31,13 +78,34 @@ public partial interface IComponent : IContainer IDataItem GetDataItemByKey(string dataItemKey); /// - /// Return a list of All Components + /// Return the first DataItem matching the Type /// - IEnumerable GetComponents(); + IDataItem GetDataItemByType(string type, SearchType searchType = SearchType.Child); + + /// + /// Return the first DataItem matching the Type and SubType + /// + IDataItem GetDataItemByType(string type, string subType, SearchType searchType = SearchType.Child); /// - /// Return a list of All Compositions + /// Return the first DataItem matching the Type and SubType /// - IEnumerable GetCompositions(); + IDataItem GetDataItem(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem; + + /// + /// Return All DataItems matching the Type + /// + IEnumerable GetDataItemsByType(string type, SearchType searchType = SearchType.Child); + + /// + /// Return All DataItems matching the Type and SubType + /// + IEnumerable GetDataItemsByType(string type, string subType, SearchType searchType = SearchType.Child); + + /// + /// Return All DataItems matching the Type and SubType + /// + IEnumerable GetDataItems(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem; + } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/IComponent.g.cs b/libraries/MTConnect.NET-Common/Devices/IComponent.g.cs index 90f5876f..6b360c34 100644 --- a/libraries/MTConnect.NET-Common/Devices/IComponent.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IComponent.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IComposition.cs b/libraries/MTConnect.NET-Common/Devices/IComposition.cs index b6d48de1..5a3dcae9 100644 --- a/libraries/MTConnect.NET-Common/Devices/IComposition.cs +++ b/libraries/MTConnect.NET-Common/Devices/IComposition.cs @@ -1,13 +1,10 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using System.Collections.Generic; namespace MTConnect.Devices { - /// - /// Composition XML elements are used to describe the lowest level physical building blocks of a piece of equipment contained within a Component. - /// public partial interface IComposition : IContainer { /// @@ -19,5 +16,35 @@ public partial interface IComposition : IContainer /// Return the DataItem matching either the ID, Name, or Source of the specified Key /// IDataItem GetDataItemByKey(string dataItemKey); + + /// + /// Return the first DataItem matching the Type + /// + IDataItem GetDataItemByType(string type, SearchType searchType = SearchType.Child); + + /// + /// Return the first DataItem matching the Type and SubType + /// + IDataItem GetDataItemByType(string type, string subType, SearchType searchType = SearchType.Child); + + /// + /// Return the first DataItem matching the Type and SubType + /// + IDataItem GetDataItem(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem; + + /// + /// Return All DataItems matching the Type + /// + IEnumerable GetDataItemsByType(string type, SearchType searchType = SearchType.Child); + + /// + /// Return All DataItems matching the Type and SubType + /// + IEnumerable GetDataItemsByType(string type, string subType, SearchType searchType = SearchType.Child); + + /// + /// Return All DataItems matching the Type and SubType + /// + IEnumerable GetDataItems(string subType = null, SearchType searchType = SearchType.Child) where TDataItem : IDataItem; } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/IComposition.g.cs b/libraries/MTConnect.NET-Common/Devices/IComposition.g.cs index b98524b3..5180e1f1 100644 --- a/libraries/MTConnect.NET-Common/Devices/IComposition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IComposition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IConstraints.g.cs b/libraries/MTConnect.NET-Common/Devices/IConstraints.g.cs index b3ae37d0..010c5894 100644 --- a/libraries/MTConnect.NET-Common/Devices/IConstraints.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IConstraints.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IContainer.cs b/libraries/MTConnect.NET-Common/Devices/IContainer.cs index ac714dd2..42dc5bd0 100644 --- a/libraries/MTConnect.NET-Common/Devices/IContainer.cs +++ b/libraries/MTConnect.NET-Common/Devices/IContainer.cs @@ -67,5 +67,12 @@ public partial interface IContainer : IMTConnectEntity /// The minimum MTConnect Version that this Component Type is valid /// Version MinimumVersion { get; } - } + + + string DataItemIdFormat { get; } + + string CompositionIdFormat { get; } + + string ComponentIdFormat { get; } + } } \ No newline at end of file diff --git a/libraries/MTConnect.NET-Common/Devices/IContainer.g.cs b/libraries/MTConnect.NET-Common/Devices/IContainer.g.cs index 8d294be0..a2b23c15 100644 --- a/libraries/MTConnect.NET-Common/Devices/IContainer.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IContainer.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDataItem.cs b/libraries/MTConnect.NET-Common/Devices/IDataItem.cs index 0b6123ad..c3f9cc18 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDataItem.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDataItem.cs @@ -7,10 +7,6 @@ namespace MTConnect.Devices { - /// - /// An abstract XML Element. Replaced in the XML document by Elements representing various types of DataItem XML Elements. - /// There can be mulitple types of DataItem XML Elements in the document. - /// public partial interface IDataItem : IMTConnectEntity { /// diff --git a/libraries/MTConnect.NET-Common/Devices/IDataItem.g.cs b/libraries/MTConnect.NET-Common/Devices/IDataItem.g.cs index a5920faf..9bc948be 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDataItemDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/IDataItemDefinition.g.cs index c7d2e264..601cc6b6 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDataItemDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDataItemDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDataItemRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/IDataItemRelationship.g.cs index e36bb30e..208a4323 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDataItemRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDataItemRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDescription.g.cs b/libraries/MTConnect.NET-Common/Devices/IDescription.g.cs index e9f2a39d..85700776 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDescription.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDescription.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDevice.cs b/libraries/MTConnect.NET-Common/Devices/IDevice.cs index 7458b764..359c400a 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDevice.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDevice.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IDevice.g.cs b/libraries/MTConnect.NET-Common/Devices/IDevice.g.cs index 1baa1952..c8f75486 100644 --- a/libraries/MTConnect.NET-Common/Devices/IDevice.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IDevice.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs b/libraries/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs index cb55ddfe..6f282c2b 100644 --- a/libraries/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/IFilter.g.cs b/libraries/MTConnect.NET-Common/Devices/IFilter.g.cs index 518263d6..208cd30a 100644 --- a/libraries/MTConnect.NET-Common/Devices/IFilter.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/IFilter.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/ISource.g.cs b/libraries/MTConnect.NET-Common/Devices/ISource.g.cs index 3d6f6964..78028dbe 100644 --- a/libraries/MTConnect.NET-Common/Devices/ISource.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/ISource.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/ISpecificationRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/ISpecificationRelationship.g.cs index be33c2a7..09194ad5 100644 --- a/libraries/MTConnect.NET-Common/Devices/ISpecificationRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/ISpecificationRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/NativeUnits.g.cs b/libraries/MTConnect.NET-Common/Devices/NativeUnits.g.cs index 3fe7f02a..0fc2a81c 100644 --- a/libraries/MTConnect.NET-Common/Devices/NativeUnits.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/NativeUnits.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/NativeUnitsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/NativeUnitsDescriptions.g.cs index 737df1ef..8113aa11 100644 --- a/libraries/MTConnect.NET-Common/Devices/NativeUnitsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/NativeUnitsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/References/ComponentReference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/ComponentReference.g.cs index 4fd2d08e..0c8394de 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/ComponentReference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/ComponentReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1581212139957_418083_223 diff --git a/libraries/MTConnect.NET-Common/Devices/References/DataItemReference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/DataItemReference.g.cs index 0de06d23..8ed2e1c3 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/DataItemReference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/DataItemReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_45f01b9_1581212127193_199949_213 diff --git a/libraries/MTConnect.NET-Common/Devices/References/IComponentReference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/IComponentReference.g.cs index 8a042851..211a3c10 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/IComponentReference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/IComponentReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.References diff --git a/libraries/MTConnect.NET-Common/Devices/References/IDataItemReference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/IDataItemReference.g.cs index 72498582..e14f5d6c 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/IDataItemReference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/IDataItemReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.References diff --git a/libraries/MTConnect.NET-Common/Devices/References/IReference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/IReference.g.cs index 061a6943..cf80aa80 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/IReference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/IReference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.References diff --git a/libraries/MTConnect.NET-Common/Devices/References/Reference.g.cs b/libraries/MTConnect.NET-Common/Devices/References/Reference.g.cs index bc07f355..9f1fcbce 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/Reference.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/Reference.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_25A13743_B12C_4c6c_B1DA_8E2EFDD156EF diff --git a/libraries/MTConnect.NET-Common/Devices/References/ReferenceDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/References/ReferenceDescriptions.g.cs index 8618f1f3..a6bb9192 100644 --- a/libraries/MTConnect.NET-Common/Devices/References/ReferenceDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/References/ReferenceDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices.References diff --git a/libraries/MTConnect.NET-Common/Devices/SearchType.cs b/libraries/MTConnect.NET-Common/Devices/SearchType.cs new file mode 100644 index 00000000..86ec00f7 --- /dev/null +++ b/libraries/MTConnect.NET-Common/Devices/SearchType.cs @@ -0,0 +1,11 @@ +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. +// TrakHound Inc. licenses this file to you under the MIT license. + +namespace MTConnect.Devices +{ + public enum SearchType + { + Child, + AnyLevel + } +} diff --git a/libraries/MTConnect.NET-Common/Devices/Source.g.cs b/libraries/MTConnect.NET-Common/Devices/Source.g.cs index 59c2768d..01316c7d 100644 --- a/libraries/MTConnect.NET-Common/Devices/Source.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Source.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = EAID_A2837EAA_7D27_45c0_B365_BC308844F978 diff --git a/libraries/MTConnect.NET-Common/Devices/SourceDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/SourceDescriptions.g.cs index 77555d6b..a540388a 100644 --- a/libraries/MTConnect.NET-Common/Devices/SourceDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/SourceDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationship.g.cs b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationship.g.cs index 8198acf6..c77a3649 100644 --- a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationship.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationship.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. // MTConnect SysML v2.2 : UML ID = _19_0_3_68e0225_1605645496116_206752_2923 diff --git a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipDescriptions.g.cs index e1f4c48d..ba9710e6 100644 --- a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipType.g.cs b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipType.g.cs index 85792798..74f2e98b 100644 --- a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipType.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipTypeDescriptions.g.cs index 2e30fbf7..98d0a20c 100644 --- a/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/SpecificationRelationshipTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/Units.g.cs b/libraries/MTConnect.NET-Common/Devices/Units.g.cs index 9833c175..1fb0eb17 100644 --- a/libraries/MTConnect.NET-Common/Devices/Units.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/Units.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Devices/UnitsDescriptions.g.cs b/libraries/MTConnect.NET-Common/Devices/UnitsDescriptions.g.cs index ddad4185..21cc084f 100644 --- a/libraries/MTConnect.NET-Common/Devices/UnitsDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Devices/UnitsDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Devices diff --git a/libraries/MTConnect.NET-Common/Extensions/StringFunctions.cs b/libraries/MTConnect.NET-Common/Extensions/StringFunctions.cs index 89bd6da3..6740b375 100644 --- a/libraries/MTConnect.NET-Common/Extensions/StringFunctions.cs +++ b/libraries/MTConnect.NET-Common/Extensions/StringFunctions.cs @@ -383,8 +383,8 @@ public static byte[] ToMD5HashBytes(byte[][] hashBytes) if (hashBytes != null && hashBytes.Length > 0) { var x1 = hashBytes[0]; - var x2 = x1; - byte[] a1; + byte[] x2; + byte[] a1 = x1; for (int i = 1; i < hashBytes.Length; i++) { @@ -399,7 +399,7 @@ public static byte[] ToMD5HashBytes(byte[][] hashBytes) } } - return x2; + return a1; } return null; diff --git a/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs b/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs index 543f75eb..0f9f8240 100644 --- a/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs +++ b/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs @@ -32,6 +32,12 @@ public abstract class MTConnectDataSource : IMTConnectDataSource public event MTConnectLogEventHandler LogReceived; + public MTConnectDataSource() + { + Configuration = new DataSourceConfiguration(); + } + + protected virtual void OnStart() { } protected virtual void OnStop() { } @@ -90,7 +96,34 @@ private async Task Worker() } - public void AddObservation(string dataItemKey, object resultValue) + public void AddObservation(IDataItem dataItem, object resultValue) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue); + AddObservation(observation); + } + } + + public void AddObservation(IDataItem dataItem, object resultValue, long? timestamp = null) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue, timestamp.Value); + AddObservation(observation); + } + } + + public void AddObservation(IDataItem dataItem, object resultValue, DateTime? timestamp = null) + { + if (dataItem != null && !string.IsNullOrEmpty(dataItem.Id)) + { + var observation = new ObservationInput(dataItem.Id, resultValue, timestamp.Value); + AddObservation(observation); + } + } + + public void AddObservation(string dataItemKey, object resultValue) { var observation = new ObservationInput(dataItemKey, resultValue); AddObservation(observation); diff --git a/libraries/MTConnect.NET-Common/Interfaces/CloseChuckDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/CloseChuckDataItem.g.cs index 4c29359c..127c4c6a 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/CloseChuckDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/CloseChuckDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/CloseDoorDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/CloseDoorDataItem.g.cs index 3f0e6de2..224dd133 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/CloseDoorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/CloseDoorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/InterfaceStateDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/InterfaceStateDataItem.g.cs index 92d84a38..7371df38 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/InterfaceStateDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/InterfaceStateDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/MaterialChangeDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/MaterialChangeDataItem.g.cs index eec453eb..1637aca7 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/MaterialChangeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/MaterialChangeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/MaterialFeedDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/MaterialFeedDataItem.g.cs index ca0021dd..cbc54c42 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/MaterialFeedDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/MaterialFeedDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/MaterialLoadDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/MaterialLoadDataItem.g.cs index a553b947..64024491 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/MaterialLoadDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/MaterialLoadDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/MaterialRetractDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/MaterialRetractDataItem.g.cs index 3b74b3bc..0ba275bd 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/MaterialRetractDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/MaterialRetractDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/MaterialUnloadDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/MaterialUnloadDataItem.g.cs index 95bc50f4..1d667f9f 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/MaterialUnloadDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/MaterialUnloadDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/OpenChuckDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/OpenChuckDataItem.g.cs index 4770cf13..ae06c54e 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/OpenChuckDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/OpenChuckDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/OpenDoorDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/OpenDoorDataItem.g.cs index d92f05a7..373cc590 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/OpenDoorDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/OpenDoorDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Interfaces/PartChangeDataItem.g.cs b/libraries/MTConnect.NET-Common/Interfaces/PartChangeDataItem.g.cs index 0a54ae0c..48da79db 100644 --- a/libraries/MTConnect.NET-Common/Interfaces/PartChangeDataItem.g.cs +++ b/libraries/MTConnect.NET-Common/Interfaces/PartChangeDataItem.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Devices; diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ActuatorState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ActuatorState.g.cs index c3fe6e18..7668eaa1 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ActuatorState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ActuatorState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ActuatorStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ActuatorStateDescriptions.g.cs index d76de0cc..0dca6d00 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ActuatorStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ActuatorStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/Availability.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/Availability.g.cs index 0fa3c36d..1187c277 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/Availability.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/Availability.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AvailabilityDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AvailabilityDescriptions.g.cs index 0fd13b4c..44fe611e 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AvailabilityDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AvailabilityDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisCoupling.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisCoupling.g.cs index cff81b7f..bae7d9e8 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisCoupling.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisCoupling.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisCouplingDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisCouplingDescriptions.g.cs index 2618b258..9eb36aaa 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisCouplingDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisCouplingDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlock.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlock.g.cs index f5e2a4f6..0ec52d6e 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlock.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlock.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlockDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlockDescriptions.g.cs index 7ac5c8bb..c4cd1a20 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlockDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisInterlockDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisState.g.cs index 544d14ab..b5b6a5ed 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/AxisStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/AxisStateDescriptions.g.cs index e699862d..7113a6b9 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/AxisStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/AxisStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/BatteryState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/BatteryState.g.cs index 76acdf60..3d6b6dd4 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/BatteryState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/BatteryState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/BatteryStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/BatteryStateDescriptions.g.cs index b0212e11..c0caed6a 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/BatteryStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/BatteryStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatus.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatus.g.cs index 6fbfd610..9790fd2d 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatus.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatus.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatusDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatusDescriptions.g.cs index 8100b38b..886960ec 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatusDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/CharacteristicStatusDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlock.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlock.g.cs index 83a837e7..84414de5 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlock.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlock.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlockDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlockDescriptions.g.cs index faebcbfc..358337bb 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlockDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ChuckInterlockDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ChuckState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ChuckState.g.cs index 3948a4cb..27de52c0 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ChuckState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ChuckState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ChuckStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ChuckStateDescriptions.g.cs index c84356b7..4bfc59ce 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ChuckStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ChuckStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatus.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatus.g.cs index cf5f058b..b7db151f 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatus.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatus.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatusDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatusDescriptions.g.cs index 58aa8e32..287524dc 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatusDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ConnectionStatusDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ControllerMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ControllerMode.g.cs index 48741d65..c90008a0 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ControllerMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ControllerMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeDescriptions.g.cs index 422b0003..f98ff990 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverride.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverride.g.cs index 26bbd802..cd5824c8 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverride.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverride.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverrideDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverrideDescriptions.g.cs index 92dbf136..4eaceb42 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverrideDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ControllerModeOverrideDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/Direction.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/Direction.g.cs index af54838a..1122e28e 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/Direction.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/Direction.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/DirectionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/DirectionDescriptions.g.cs index de0facc6..7a8b1cc6 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/DirectionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/DirectionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/DoorState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/DoorState.g.cs index 05afcbc1..a80eb710 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/DoorState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/DoorState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/DoorStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/DoorStateDescriptions.g.cs index beacc09b..b28b5e1f 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/DoorStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/DoorStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStop.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStop.g.cs index 99def479..95b412b1 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStop.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStop.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStopDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStopDescriptions.g.cs index e9bfde58..492b06f8 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStopDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EmergencyStopDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EndOfBar.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EndOfBar.g.cs index 81c86d37..64311c67 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EndOfBar.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EndOfBar.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EndOfBarDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EndOfBarDescriptions.g.cs index 118c60f8..f5310a81 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EndOfBarDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EndOfBarDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EquipmentMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EquipmentMode.g.cs index 70a05967..4d7455da 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EquipmentMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EquipmentMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/EquipmentModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/EquipmentModeDescriptions.g.cs index 7091a05f..07d69949 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/EquipmentModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/EquipmentModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/Execution.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/Execution.g.cs index 752c315e..cb6b7a1c 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/Execution.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/Execution.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ExecutionDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ExecutionDescriptions.g.cs index 247305a8..8199947b 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ExecutionDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ExecutionDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/FunctionalMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/FunctionalMode.g.cs index 5b23410b..43e656a7 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/FunctionalMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/FunctionalMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/FunctionalModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/FunctionalModeDescriptions.g.cs index dcc28878..65f7c395 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/FunctionalModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/FunctionalModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/InterfaceState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/InterfaceState.g.cs index d0fe84e3..bbd0c152 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/InterfaceState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/InterfaceState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/InterfaceStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/InterfaceStateDescriptions.g.cs index 2e206e04..8d7e33bb 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/InterfaceStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/InterfaceStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/LeakDetect.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/LeakDetect.g.cs index 13b8bf91..ef9b10c8 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/LeakDetect.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/LeakDetect.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/LeakDetectDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/LeakDetectDescriptions.g.cs index eef19826..3a43bb3b 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/LeakDetectDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/LeakDetectDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/LockState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/LockState.g.cs index 100d6ffb..635f657d 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/LockState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/LockState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/LockStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/LockStateDescriptions.g.cs index b9275799..ec92152f 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/LockStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/LockStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/OperatingMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/OperatingMode.g.cs index b283830c..3b79bd7c 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/OperatingMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/OperatingMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/OperatingModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/OperatingModeDescriptions.g.cs index 297c215c..d9e095fd 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/OperatingModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/OperatingModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartCountType.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartCountType.g.cs index 53fcabe2..bba510a9 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartCountType.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartCountType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartCountTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartCountTypeDescriptions.g.cs index a1363695..7a381fbf 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartCountTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartCountTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartDetect.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartDetect.g.cs index 51273468..c19b7286 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartDetect.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartDetect.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartDetectDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartDetectDescriptions.g.cs index 09292329..e16bd8d2 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartDetectDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartDetectDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingState.g.cs index 9945d31d..57b53079 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingStateDescriptions.g.cs index b824c265..48ebbb4c 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartProcessingStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartStatus.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartStatus.g.cs index 7a42d805..7349925c 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartStatus.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartStatus.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PartStatusDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PartStatusDescriptions.g.cs index 95257de2..86a5fb7d 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PartStatusDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PartStatusDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PathMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PathMode.g.cs index 9c5d2275..1015df87 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PathMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PathMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PathModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PathModeDescriptions.g.cs index cf1df8f5..ea1a5d57 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PathModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PathModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PowerState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PowerState.g.cs index 9dfcf4bd..e1f0ff6c 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PowerState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PowerState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PowerStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PowerStateDescriptions.g.cs index a9203b60..cf8ad3c8 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PowerStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PowerStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PowerStatus.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PowerStatus.g.cs index 0df06bea..b1d6ca48 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PowerStatus.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PowerStatus.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/PowerStatusDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/PowerStatusDescriptions.g.cs index cca992b9..9bdb4e1e 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/PowerStatusDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/PowerStatusDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProcessState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProcessState.g.cs index 64ed0e82..04c59029 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProcessState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProcessState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProcessStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProcessStateDescriptions.g.cs index d7a2698a..18db2b6d 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProcessStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProcessStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProgramEdit.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProgramEdit.g.cs index 2905b5dc..e7a76042 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProgramEdit.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProgramEdit.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProgramEditDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProgramEditDescriptions.g.cs index 6975a2a4..5e2c8e45 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProgramEditDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProgramEditDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationType.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationType.g.cs index da767b73..01ea1e64 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationType.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationTypeDescriptions.g.cs index 2378c381..11f176c1 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ProgramLocationTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/RotaryMode.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/RotaryMode.g.cs index 0c1d8d2a..cd4060d0 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/RotaryMode.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/RotaryMode.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/RotaryModeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/RotaryModeDescriptions.g.cs index 7c65ca63..c19ee7c3 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/RotaryModeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/RotaryModeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlock.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlock.g.cs index 45456c53..8915c7fc 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlock.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlock.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlockDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlockDescriptions.g.cs index 09edd0f5..35342c6d 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlockDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/SpindleInterlockDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyType.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyType.g.cs index 334ee936..cc28867a 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyType.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyType.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyTypeDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyTypeDescriptions.g.cs index 9bb16741..8ee6897e 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyTypeDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/UncertaintyTypeDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ValveState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ValveState.g.cs index 38336e2b..95183072 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ValveState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ValveState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/ValveStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/ValveStateDescriptions.g.cs index c4318c58..001b5d57 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/ValveStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/ValveStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/WaitState.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/WaitState.g.cs index e1f3bb34..8fd59908 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/WaitState.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/WaitState.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-Common/Observations/Events/WaitStateDescriptions.g.cs b/libraries/MTConnect.NET-Common/Observations/Events/WaitStateDescriptions.g.cs index 865b18c8..299817d1 100644 --- a/libraries/MTConnect.NET-Common/Observations/Events/WaitStateDescriptions.g.cs +++ b/libraries/MTConnect.NET-Common/Observations/Events/WaitStateDescriptions.g.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. namespace MTConnect.Observations.Events diff --git a/libraries/MTConnect.NET-HTTP/Configurations/HttpServerConfiguration.cs b/libraries/MTConnect.NET-HTTP/Configurations/HttpServerConfiguration.cs index 9e19b7a2..0a6978bc 100644 --- a/libraries/MTConnect.NET-HTTP/Configurations/HttpServerConfiguration.cs +++ b/libraries/MTConnect.NET-HTTP/Configurations/HttpServerConfiguration.cs @@ -137,6 +137,8 @@ public HttpServerConfiguration() Server = null; Port = 5000; + DocumentFormat = MTConnect.DocumentFormat.XML; + Accept = new Dictionary(); Accept["text/xml"] = "XML"; Accept["application/xml"] = "XML"; diff --git a/libraries/MTConnect.NET-SHDR/Adapters/ShdrAdapterClient.cs b/libraries/MTConnect.NET-SHDR/Adapters/ShdrAdapterClient.cs index 1bd3cea4..3fc88bdb 100644 --- a/libraries/MTConnect.NET-SHDR/Adapters/ShdrAdapterClient.cs +++ b/libraries/MTConnect.NET-SHDR/Adapters/ShdrAdapterClient.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 TrakHound Inc., All Rights Reserved. +// Copyright (c) 2024 TrakHound Inc., All Rights Reserved. // TrakHound Inc. licenses this file to you under the MIT license. using MTConnect.Agents; @@ -12,16 +12,19 @@ namespace MTConnect.Adapters { - /// - /// A client to connect to MTConnect Adapters using TCP and communicating using the SHDR Protocol - /// - public class ShdrAdapterClient : ShdrClient + /// + /// A client to connect to MTConnect Adapters using TCP and communicating using the SHDR Protocol + /// + public class ShdrAdapterClient : ShdrClient { private readonly IShdrAdapterClientConfiguration _configuration; private readonly IMTConnectAgent _agent; private IDevice _device; + public IDevice Device => _device; + + public ShdrAdapterClient( IShdrAdapterClientConfiguration configuration, IMTConnectAgent agent, diff --git a/libraries/MTConnect.NET-SHDR/Configurations/ShdrAdapterClientConfiguration.cs b/libraries/MTConnect.NET-SHDR/Configurations/ShdrAdapterClientConfiguration.cs index 37b0a334..9d882663 100644 --- a/libraries/MTConnect.NET-SHDR/Configurations/ShdrAdapterClientConfiguration.cs +++ b/libraries/MTConnect.NET-SHDR/Configurations/ShdrAdapterClientConfiguration.cs @@ -11,7 +11,7 @@ namespace MTConnect.Configurations public class ShdrAdapterClientConfiguration : ShdrClientConfiguration, IShdrAdapterClientConfiguration { /// - /// For devices that do not have the ability to provide available events, if yes, this sets the Availability to AVAILABLE upon connection. + /// For devices that do not have the ability to provide available events, if TRUE, this sets the Availability to AVAILABLE upon connection. /// [JsonPropertyName("availableOnConnection")] public bool AvailableOnConnection { get; set; } diff --git a/libraries/MTConnect.NET-SysML/Models/Devices/MTConnectComponentType.cs b/libraries/MTConnect.NET-SysML/Models/Devices/MTConnectComponentType.cs index 2963d69d..c153cd03 100644 --- a/libraries/MTConnect.NET-SysML/Models/Devices/MTConnectComponentType.cs +++ b/libraries/MTConnect.NET-SysML/Models/Devices/MTConnectComponentType.cs @@ -44,7 +44,7 @@ public MTConnectComponentType(XmiDocument xmiDocument, string idPrefix, UmlClass Id = $"{idPrefix}.{name}"; Name = name; Type = umlClass.Name; - DefaultName = name.ToCamelCase(); + DefaultName = GetName(Type); IsAbstract = umlClass.IsAbstract; IsOrganizer = isOrganizer; @@ -78,5 +78,16 @@ public static IEnumerable Parse(XmiDocument xmiDocument, return subClasses; } + + private static string GetName(string type) + { + switch (type) + { + case "Controller": return "cont"; + case "Environment": return "env"; + } + + return type.ToCamelCase(); + } } } diff --git a/libraries/MTConnect.NET-XML/Devices/XmlDevicesHeader.cs b/libraries/MTConnect.NET-XML/Devices/XmlDevicesHeader.cs index 51d84179..d27ab7be 100644 --- a/libraries/MTConnect.NET-XML/Devices/XmlDevicesHeader.cs +++ b/libraries/MTConnect.NET-XML/Devices/XmlDevicesHeader.cs @@ -62,9 +62,9 @@ public static void WriteXml(XmlWriter writer, IMTConnectDevicesHeader header) writer.WriteAttributeString("version", header.Version.ToString()); writer.WriteAttributeString("sender", header.Sender); writer.WriteAttributeString("bufferSize", header.BufferSize.ToString()); - writer.WriteAttributeString("assetBufferSize", header.AssetBufferSize.ToString()); - writer.WriteAttributeString("assetCount", header.AssetCount.ToString()); - writer.WriteAttributeString("deviceModelChangeTime", header.DeviceModelChangeTime); + if (header.AssetBufferSize >= 0) writer.WriteAttributeString("assetBufferSize", header.AssetBufferSize.ToString()); + if (header.AssetCount >= 0) writer.WriteAttributeString("assetCount", header.AssetCount.ToString()); + if (!string.IsNullOrEmpty(header.DeviceModelChangeTime)) writer.WriteAttributeString("deviceModelChangeTime", header.DeviceModelChangeTime); if (header.TestIndicator) writer.WriteAttributeString("testIndicator", header.TestIndicator.ToString()); writer.WriteAttributeString("creationTime", header.CreationTime.ToString("o")); writer.WriteEndElement();