Skip to content
Snippets Groups Projects
Commit 1631ba3c authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch... 

Merge branch 'RDM-2024-0037-Correcting_and_adding_short_names_for_airQualitySensor' into RDM-2024-0038-Adding_short_names_for_connectivity_MC

Resolve conflict with Merge Request X
parents 5b038c18 534f4809
No related branches found
No related tags found
No related merge requests found
Pipeline #1444 failed
Stage: checking
Stage: generation
Hide whitespace changes
Inline Side-by-side
TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
+ 15
− 10
View file @ 1631ba3c
...@@ -423,7 +423,7 @@ This ModuleClass provides capabilities for a 3D printer. ...@@ -423,7 +423,7 @@ This ModuleClass provides capabilities for a 3D printer.
|printSizeY |xs:float |R |false |mm |This data point represents the maximum size of printing object in the direction of Y-axis. | |printSizeY |xs:float |R |false |mm |This data point represents the maximum size of printing object in the direction of Y-axis. |
|printSizeZ |xs:float |R |false |mm |This data point represents the maximum size of printing object in the direction of Z-axis. | |printSizeZ |xs:float |R |false |mm |This data point represents the maximum size of printing object in the direction of Z-axis. |
|network |xs:boolean |R |false | |This value indicates the Wide Area Network (WAN) connectivity of the 3D printer, such as Internet or GSM.<br />"False" indicates that the printer does not have network connectivity to a WAN. "True" indicates that the printer has WAN network connectivity. | |network |xs:boolean |R |false | |This value indicates the Wide Area Network (WAN) connectivity of the 3D printer, such as Internet or GSM.<br />"False" indicates that the printer does not have network connectivity to a WAN. "True" indicates that the printer has WAN network connectivity. |
|memorySize |xs:float |R |false |MB |This value represents the total memory size of the printer. <mark>The unit of measure is.</mark> | |memorySize |xs:float |R |false |MB |This value represents the total memory size of the printer. The unit of measure is Megabyte (MB). |
...@@ -494,8 +494,6 @@ This ModuleClasses provides capabilities to control and monitor the job modes of ...@@ -494,8 +494,6 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
#### 5.3.1.6 airQualitySensor #### 5.3.1.6 airQualitySensor
This ModuleClass provides capabilities for a monitoring sensor that measures the air quality. This ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
<mark>Editor's note: Check the short names for this module class. They are not aligned</mark>
**Table 5.3.1.6-1: DataPoints of airQualitySense ModuleClass** **Table 5.3.1.6-1: DataPoints of airQualitySense ModuleClass**
...@@ -523,7 +521,6 @@ This ModuleClass provides capabilities for a monitoring sensor that measures the ...@@ -523,7 +521,6 @@ This ModuleClass provides capabilities for a monitoring sensor that measures the
#### 5.3.1.7 alarmSpeaker #### 5.3.1.7 alarmSpeaker
This ModuleClass provides the capabilities to initiate and monitor an alarm. This ModuleClass provides the capabilities to initiate and monitor an alarm.
...@@ -6172,6 +6169,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6172,6 +6169,7 @@ In protocol bindings resource attributes names for data points of module classes
|absoluteStopTime |[timer](#53190-timer) |abST0 | |absoluteStopTime |[timer](#53190-timer) |abST0 |
|acousticStatus |[acousticSensor](#5312-acousticsensor) |acoSs | |acousticStatus |[acousticSensor](#5312-acousticsensor) |acoSs |
|adfStates |[autoDocumentFeeder](#5319-autodocumentfeeder) |adfSs | |adfStates |[autoDocumentFeeder](#5319-autodocumentfeeder) |adfSs |
|airPressure |[airQualitySensor](#5316-airqualitysensor) |airPe |
|alarm |[motionSensor](#53154-motionsensor), [smokeSensor](#53182-smokesensor), [temperatureAlarm](#53188-temperaturealarm), [waterSensor](#53197-watersensor) |alarm | |alarm |[motionSensor](#53154-motionsensor), [smokeSensor](#53182-smokesensor), [temperatureAlarm](#53188-temperaturealarm), [waterSensor](#53197-watersensor) |alarm |
|alarmStatus |[alarmSpeaker](#5317-alarmspeaker) |alaSs | |alarmStatus |[alarmSpeaker](#5317-alarmspeaker) |alaSs |
|altitude |[geoLocation](#53141-geolocation) |altie | |altitude |[geoLocation](#53141-geolocation) |altie |
...@@ -6271,6 +6269,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6271,6 +6269,7 @@ In protocol bindings resource attributes names for data points of module classes
|height |[height](#53145-height) |heigt | |height |[height](#53145-height) |heigt |
|horizontalAccuracy |[geoLocation](#53141-geolocation) |horAy | |horizontalAccuracy |[geoLocation](#53141-geolocation) |horAy |
|horizontalDirection |[airFlow](#5314-airflow) |horDn | |horizontalDirection |[airFlow](#5314-airflow) |horDn |
|humidity |[airQualitySensor](#5316-airqualitysensor) |humiy |
|hwVersion |[dmDeviceInfo](#583-dmdeviceinfo)|hweVn | |hwVersion |[dmDeviceInfo](#583-dmdeviceinfo)|hweVn |
|impactDirectionHorizontal |[impactSensor](#53147-impactsensor) |imDHl | |impactDirectionHorizontal |[impactSensor](#53147-impactsensor) |imDHl |
|impactDirectionVertical |[impactSensor](#53147-impactsensor) |imDVl | |impactDirectionVertical |[impactSensor](#53147-impactsensor) |imDVl |
...@@ -6326,9 +6325,13 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6326,9 +6325,13 @@ In protocol bindings resource attributes names for data points of module classes
|muteEnabled |[audioVolume](#5318-audiovolume) |mutEd | |muteEnabled |[audioVolume](#5318-audiovolume) |mutEd |
|name |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |name | |name |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |name |
|network |[threeDprinter](#5311-threedprinter) |netwk | |network |[threeDprinter](#5311-threedprinter) |netwk |
|no2 |[airQualitySensor](#5316-airqualitysensor) |no2 |
|noise |[airQualitySensor](#5316-airqualitysensor) |noise |
|numberValue |[numberValue](#53155-numbervalue) |numVe | |numberValue |[numberValue](#53155-numbervalue) |numVe |
|o3 |[airQualitySensor](#5316-airqualitysensor) |o3 |
|object |[binaryObject](#53111-binaryobject) |objet | |object |[binaryObject](#53111-binaryobject) |objet |
|objectType |[binaryObject](#53111-binaryobject) |objTe | |objectType |[binaryObject](#53111-binaryobject) |objTe |
|odor |[airQualitySensor](#5316-airqualitysensor) |odor |
|openAlarm |[doorStatus](#53130-doorstatus) |opeAm | |openAlarm |[doorStatus](#53130-doorstatus) |opeAm |
|openDuration |[doorStatus](#53130-doorstatus) |opeDn | |openDuration |[doorStatus](#53130-doorstatus) |opeDn |
|openLevel |[openLevel](#53156-openlevel) |opeLl | |openLevel |[openLevel](#53156-openlevel) |opeLl |
...@@ -6341,6 +6344,9 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6341,6 +6344,9 @@ In protocol bindings resource attributes names for data points of module classes
|ozoneValuePPM |[ozoneMeter](#53160-ozonemeter) |oVPPM | |ozoneValuePPM |[ozoneMeter](#53160-ozonemeter) |oVPPM |
|password |[credentials](#53127-credentials) |pwd | |password |[credentials](#53127-credentials) |pwd |
|pci |[connectivity](#53125-connectivity) |pci | |pci |[connectivity](#53125-connectivity) |pci |
|pm1 |[airQualitySensor](#5316-airqualitysensor) | pm1 |
|pm10 |[airQualitySensor](#5316-airqualitysensor) |pm10 |
|pm25 |[airQualitySensor](#5316-airqualitysensor) | pm25 |
|postalAddress |[location](#5392-location) |posAs | |postalAddress |[location](#5392-location) |posAs |
|power |[energyConsumption](#53132-energyconsumption) |power | |power |[energyConsumption](#53132-energyconsumption) |power |
|powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa | |powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa |
...@@ -6388,18 +6394,14 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6388,18 +6394,14 @@ In protocol bindings resource attributes names for data points of module classes
|secondaryVersion |[dmFirmware](#585-dmfirmware) |secVn | |secondaryVersion |[dmFirmware](#585-dmfirmware) |secVn |
|securityModes |[securityMode](#53176-securitymode) |secMs | |securityModes |[securityMode](#53176-securitymode) |secMs |
|sensitivity |[motionSensor](#53154-motionsensor) |sensy | |sensitivity |[motionSensor](#53154-motionsensor) |sensy |
|sensorHumidity |[airQualitySensor](#5316-airqualitysensor) |senHy |
|sensorOdor |[airQualitySensor](#5316-airqualitysensor) |senOr |
|sensorPM1 |[airQualitySensor](#5316-airqualitysensor) |sePM1 |
|sensorPM10 |[airQualitySensor](#5316-airqualitysensor) |sePM0 |
|serialNumber |[dmDeviceInfo](#583-dmdeviceinfo) |serNr | |serialNumber |[dmDeviceInfo](#583-dmdeviceinfo) |serNr |
|sensorPM2 |[airQualitySensor](#5316-airqualitysensor) |sePM2 |
|signalECL |[connectivity](#53125-connectivity) |siECL | |signalECL |[connectivity](#53125-connectivity) |siECL |
|significantDigits |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |sigDs | |significantDigits |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |sigDs |
|silentTime |[motionSensor](#53154-motionsensor) |silTe | |silentTime |[motionSensor](#53154-motionsensor) |silTe |
|sinr |[connectivity](#53125-connectivity) |sinr | |sinr |[connectivity](#53125-connectivity) |sinr |
|size |[binaryObject](#53111-binaryobject), [features](#5391-features) |size | |size |[binaryObject](#53111-binaryobject), [features](#5391-features) |size |
|smokeThreshold |[smokeSensor](#53182-smokesensor) |smoTd | |smokeThreshold |[smokeSensor](#53182-smokesensor) |smoTd |
|so2 |[airQualitySensor](#5316-airqualitysensor) |so2 |
|softLeanMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |soLMs | |softLeanMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |soLMs |
|soilLevel |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |soiLl | |soilLevel |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |soiLl |
|speed |[airFlow](#5314-airflow) |speed | |speed |[airFlow](#5314-airflow) |speed |
...@@ -6433,12 +6435,13 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6433,12 +6435,13 @@ In protocol bindings resource attributes names for data points of module classes
|targetTemperature |[temperature](#53187-temperature) |tarTe | |targetTemperature |[temperature](#53187-temperature) |tarTe |
|targetTimeToStart |[timer](#53190-timer) |tTTSt | |targetTimeToStart |[timer](#53190-timer) |tTTSt |
|targetTimeToStop |[timer](#53190-timer) |tTTSp | |targetTimeToStop |[timer](#53190-timer) |tTTSp |
|temperature |[temperatureAlarm](#53188-temperaturealarm) |tempe | |temperature |[airQualitySensor](#5316-airqualitysensor), [temperatureAlarm](#53188-temperaturealarm) |tempe |
|temperatureThreshold <mark>This data point has been changed to two different data points</mark> |[temperatureAlarm](#53188-temperaturealarm) |temTd | |temperatureThreshold <mark>This data point has been changed to two different data points</mark> |[temperatureAlarm](#53188-temperaturealarm) |temTd |
|textMessage |[textMessage](#53189-textmessage) |texMe | |textMessage |[textMessage](#53189-textmessage) |texMe |
|time |[keepWarm](#53148-keepwarm) |time | |time |[keepWarm](#53148-keepwarm) |time |
|token |[credentials](#53127-credentials) |tk | |token |[credentials](#53127-credentials) |tk |
|tone |[alarmSpeaker](#5317-alarmspeaker) |tone | |tone |[alarmSpeaker](#5317-alarmspeaker) |tone |
|tsp |[airQualitySensor](#5316-airqualitysensor) |tsp |
|turboEnabled |[turbo](#53191-turbo) |turEd | |turboEnabled |[turbo](#53191-turbo) |turEd |
|type |[dmEventLog](#587-dmeventlog) |type | |type |[dmEventLog](#587-dmeventlog) |type |
|unit |[temperature](#53187-temperature) |unit | |unit |[temperature](#53187-temperature) |unit |
...@@ -6459,6 +6462,8 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6459,6 +6462,8 @@ In protocol bindings resource attributes names for data points of module classes
|water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water | |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
|waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh | |waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh |
|weight |[weight](#53199-weight) |weigt | |weight |[weight](#53199-weight) |weigt |
|windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |
|windSpeed |[airQualitySensor](#5316-airqualitysensor) |winSd |
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment