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

Contribution RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC merged into R5 

Original contribution:RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC

See merge request !19

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts
parents fcef142a ffb0931b
No related branches found
No related tags found
1 merge request!19RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC
Hide whitespace changes
Inline Side-by-side
TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
+ 13
− 5
View file @ ba97f7f2
...@@ -1717,9 +1717,6 @@ This ModuleClass provides capabilities to set service parameters. ...@@ -1717,9 +1717,6 @@ This ModuleClass provides capabilities to set service parameters.
#### 5.3.1.81 slcReportInfo #### 5.3.1.81 slcReportInfo
This ModuleClass provides information of status of the street light controller. This ModuleClass provides information of status of the street light controller.
<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
**Table 5.3.1.81-1: DataPoints of slcReportInfo ModuleClass** **Table 5.3.1.81-1: DataPoints of slcReportInfo ModuleClass**
|Name |Type |R/W |Optional |Unit |Documentation | |Name |Type |R/W |Optional |Unit |Documentation |
...@@ -1739,8 +1736,6 @@ This ModuleClass provides information of status of the street light controller. ...@@ -1739,8 +1736,6 @@ This ModuleClass provides information of status of the street light controller.
|lampTechnology |xs:string |R |true | |A string that indicates the type of lamp technology that is used in the street lamps, e.g. "LED", "Tungsten", etc | |lampTechnology |xs:string |R |true | |A string that indicates the type of lamp technology that is used in the street lamps, e.g. "LED", "Tungsten", etc |
#### 5.3.1.82 smokeSensor #### 5.3.1.82 smokeSensor
This ModuleClass provides the capabilities to indicate the detection of smoke and raising an alarm if the triggering criterion is met. This ModuleClass provides the capabilities to indicate the detection of smoke and raising an alarm if the triggering criterion is met.
...@@ -6159,6 +6154,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6159,6 +6154,7 @@ In protocol bindings resource attributes names for data points of module classes
|code |[faultDetection](#53134-faultdetection), [filterInfo](#53135-filterinfo) |code | |code |[faultDetection](#53134-faultdetection), [filterInfo](#53135-filterinfo) |code |
|coldWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |colWh | |coldWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |colWh |
|colourSaturation |[colourSaturation](#53124-coloursaturation) |colSn | |colourSaturation |[colourSaturation](#53124-coloursaturation) |colSn |
|colourTemperature |[slcReportInfo](#53181-slcreportinfo) |colTe |
|commFreqValue |[connectivity](#53125-connectivity) |coFVe | |commFreqValue |[connectivity](#53125-connectivity) |coFVe |
|component |[dmFirmware](#585-dmfirmware) |compt | |component |[dmFirmware](#585-dmfirmware) |compt |
|concentration |[glucometer](#53142-glucometer) |concn | |concentration |[glucometer](#53142-glucometer) |concn |
...@@ -6247,12 +6243,21 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6247,12 +6243,21 @@ In protocol bindings resource attributes names for data points of module classes
|jobStates |[runState](#53175-runstate) |jobSs | |jobStates |[runState](#53175-runstate) |jobSs |
|kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal | |kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal |
|keyNumber |[keypad](#53149-keypad) |keyNr | |keyNumber |[keypad](#53149-keypad) |keyNr |
|lampTechnology |[slcReportInfo](#53181-slcreportinfo) |lamTy |
|largeFlowAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |LaFAm | |largeFlowAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |LaFAm |
|latitude |[geoLocation](#53141-geolocation) |latie | |latitude |[geoLocation](#53141-geolocation) |latie |
|leakageAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |leaAm | |leakageAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |leaAm |
|level |[battery](#53110-battery) |lvl | |level |[battery](#53110-battery) |lvl |
|light |[alarmSpeaker](#5317-alarmspeaker) |light | |light |[alarmSpeaker](#5317-alarmspeaker) |light |
|lightActivePower |[slcReportInfo](#53181-slcreportinfo) |LiAPr |
|lightCount |[slcParameterSetting](#53180-slcparametersetting) |ligCt | |lightCount |[slcParameterSetting](#53180-slcparametersetting) |ligCt |
|lightCurrent |[slcReportInfo](#53181-slcreportinfo) |ligCt |
|lightApparentPower |[slcReportInfo](#53181-slcreportinfo) |liAPr |
|lightDimmingValue |[slcReportInfo](#53181-slcreportinfo) |liDVe |
|lightPolarizationAxis |[slcReportInfo](#53181-slcreportinfo) |liPAs |
|lightPowerFactor |[slcReportInfo](#53181-slcreportinfo) |liPFr |
|lightReactivePower |[slcReportInfo](#53181-slcreportinfo) |LiRPr |
|lightVoltage |[slcReportInfo](#53181-slcreportinfo) |ligVe |
|liquidLevel |[liquidLevel](#53150-liquidlevel) |liqLl | |liquidLevel |[liquidLevel](#53150-liquidlevel) |liqLl |
|liquidRemaining |[liquidRemaining](#53151-liquidremaining) |liqRg | |liquidRemaining |[liquidRemaining](#53151-liquidremaining) |liqRg |
|locale |[location](#5392-location) |locae | |locale |[location](#5392-location) |locae |
...@@ -6307,6 +6312,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6307,6 +6312,7 @@ In protocol bindings resource attributes names for data points of module classes
|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 | |odor |[airQualitySensor](#5316-airqualitysensor) |odor |
|onlineStatus |[slcReportInfo](#53181-slcreportinfo) |onlSs |
|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 |
...@@ -6417,6 +6423,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6417,6 +6423,7 @@ In protocol bindings resource attributes names for data points of module classes
|supportURL |[dmDeviceInfo](#583-dmdeviceinfo) |suURL | |supportURL |[dmDeviceInfo](#583-dmdeviceinfo) |suURL |
|surplusCredit |[gasChargingControl](#53138-gaschargingcontrol) |surCt | |surplusCredit |[gasChargingControl](#53138-gaschargingcontrol) |surCt |
|surplusGas |[gasChargingControl](#53138-gaschargingcontrol) |surGs | |surplusGas |[gasChargingControl](#53138-gaschargingcontrol) |surGs |
|switchStatus |[slcReportInfo](#53181-slcreportinfo) |swiSs |
|swVersion |[dmDeviceInfo](#583-dmdeviceinfo) |sweVn | |swVersion |[dmDeviceInfo](#583-dmdeviceinfo) |sweVn |
|systemTime |[dmAgent](#582-dmagent) |sysTe | |systemTime |[dmAgent](#582-dmagent) |sysTe |
|systolicPressure |[sphygmomanometer](#53183-sphygmomanometer) |sysPe | |systolicPressure |[sphygmomanometer](#53183-sphygmomanometer) |sysPe |
...@@ -6462,6 +6469,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6462,6 +6469,7 @@ In protocol bindings resource attributes names for data points of module classes
|voc |[airQualitySensor](#5316-airqualitysensor) |voc | |voc |[airQualitySensor](#5316-airqualitysensor) |voc |
|voltage |[battery](#53110-battery) |volte | |voltage |[battery](#53110-battery) |volte |
|voltage |[energyConsumption](#53132-energyconsumption) |volte | |voltage |[energyConsumption](#53132-energyconsumption) |volte |
|voltageFrequency |[slcReportInfo](#53181-slcreportinfo) |volFy |
|volumePercentage |[audioVolume](#5318-audiovolume) |volPe | |volumePercentage |[audioVolume](#5318-audiovolume) |volPe |
|washTemp |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |wasTp | |washTemp |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |wasTp |
|water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water | |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
......
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