Skip to content
Snippets Groups Projects
Commit 977d52e8 authored by Andreas Kraft's avatar Andreas Kraft
Browse files

Merge branch 'RDM-2025-0031-Adding_short_names_for_threeDScanner_MC' into R5

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
parents 6ca065ec cec098d4
No related branches found
No related tags found
1 merge request!45RDM-2025-0031-Adding_short_names_for_threeDScanner_MC
...@@ -2323,9 +2323,6 @@ This ModuleClass provides capabilities to give the information of a 3D display. ...@@ -2323,9 +2323,6 @@ This ModuleClass provides capabilities to give the information of a 3D display.
#### 5.3.1.117 threeDScanner #### 5.3.1.117 threeDScanner
This ModuleClass provides the capability to scanning 3D object for the user. This ModuleClass provides the capability to scanning 3D object for the user.
<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
**Table 5.3.1.117-1: DataPoints of threeDScanner ModuleClass** **Table 5.3.1.117-1: DataPoints of threeDScanner ModuleClass**
|Name |Type |R/W |Optional |Unit |Documentation | |Name |Type |R/W |Optional |Unit |Documentation |
...@@ -2337,8 +2334,6 @@ This ModuleClass provides the capability to scanning 3D object for the user. ...@@ -2337,8 +2334,6 @@ This ModuleClass provides the capability to scanning 3D object for the user.
|maxSizeZ |xs:float |R |true |cm |This data point indicates the maximum depth of the scanning. | |maxSizeZ |xs:float |R |true |cm |This data point indicates the maximum depth of the scanning. |
#### 5.3.1.118 blender #### 5.3.1.118 blender
This ModuleClass is for controlling a blender, for example in a juicer. This ModuleClass is for controlling a blender, for example in a juicer.
...@@ -6239,6 +6234,9 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6239,6 +6234,9 @@ In protocol bindings resource attributes names for data points of module classes
|maxLength |[textMessage](#53189-textmessage) |maxLh | |maxLength |[textMessage](#53189-textmessage) |maxLh |
|maxLevel |[openLevel](#53156-openlevel) |maxLl | |maxLevel |[openLevel](#53156-openlevel) |maxLl |
|maxPressureThreshold |[barometer](#531101-barometer) |maPTd | |maxPressureThreshold |[barometer](#531101-barometer) |maPTd |
|maxSizeX |[threeDScanner](#531117-threedscanner) |maxSX |
|maxSizeY |[threeDScanner](#531117-threedscanner) |maxSX |
|maxSizeZ |[threeDScanner](#531117-threedscanner) |maxSZ |
|maxSpeed |[airFlow](#5314-airflow) |maxSd | |maxSpeed |[airFlow](#5314-airflow) |maxSd |
|maxValue |[audioVolume](#5318-audiovolume), [numberValue](#53155-numbervalue), [ozoneMeter](#53160-ozonemeter), [temperature](#53187-temperature) |maxVe | |maxValue |[audioVolume](#5318-audiovolume), [numberValue](#53155-numbervalue), [ozoneMeter](#53160-ozonemeter), [temperature](#53187-temperature) |maxVe |
|meanPressure |[sphygmomanometer](#53183-sphygmomanometer) |meaPe | |meanPressure |[sphygmomanometer](#53183-sphygmomanometer) |meaPe |
...@@ -6427,6 +6425,8 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6427,6 +6425,8 @@ In protocol bindings resource attributes names for data points of module classes
|threeDDisplayType |[threeDDisplay](#531116-threeddisplay) |tDDTe | |threeDDisplayType |[threeDDisplay](#531116-threeddisplay) |tDDTe |
|threeDDisplayViewAngle |[threeDDisplay](#531116-threeddisplay) |tDDVe | |threeDDisplayViewAngle |[threeDDisplay](#531116-threeddisplay) |tDDVe |
|threeDGlasses |[threeDDisplay](#531116-threeddisplay) |thDGs | |threeDGlasses |[threeDDisplay](#531116-threeddisplay) |thDGs |
|threeDScannerType |[threeDScanner](#531117-threedscanner) |tDSTe |
|threeDScanResolution |[threeDScanner](#531117-threedscanner) |tDSRn |
|time |[keepWarm](#53148-keepwarm) |time | |time |[keepWarm](#53148-keepwarm) |time |
|timePlanStatus |[slcParameterSetting](#53180-slcparametersetting) |tiPSs | |timePlanStatus |[slcParameterSetting](#53180-slcparametersetting) |tiPSs |
|timer |[crossingBarrier](#531115-crossingbarrier) |timer | |timer |[crossingBarrier](#531115-crossingbarrier) |timer |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment