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

Contribution RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC merged into R5

Original contribution: RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC

See merge request !12

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts
parents db991252 eba83094
No related branches found
No related tags found
1 merge request!12RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC
...@@ -1052,8 +1052,6 @@ This ModuleClass provides capabilities to recharge the gas meter. ...@@ -1052,8 +1052,6 @@ This ModuleClass provides capabilities to recharge the gas meter.
#### 5.3.1.39 gasMeterAlarm #### 5.3.1.39 gasMeterAlarm
This ModuleClass provides capabilities to set service parameters of a gas meter. This ModuleClass provides capabilities to set service parameters of a gas meter.
<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
**Table 5.3.1.39-1: DataPoints of gasMeterAlarm ModuleClass** **Table 5.3.1.39-1: DataPoints of gasMeterAlarm ModuleClass**
...@@ -1068,8 +1066,6 @@ This ModuleClass provides capabilities to set service parameters of a gas meter. ...@@ -1068,8 +1066,6 @@ This ModuleClass provides capabilities to set service parameters of a gas meter.
|singleCountAlarm |xs:boolean |R |true | |The alarm of single reed switch counting. The normal condition is that the double reed switches are working. If only a single reed switch is working, it means that the metering has a problem and shall fire the alarm. | |singleCountAlarm |xs:boolean |R |true | |The alarm of single reed switch counting. The normal condition is that the double reed switches are working. If only a single reed switch is working, it means that the metering has a problem and shall fire the alarm. |
#### 5.3.1.40 gasMeterReportInfo #### 5.3.1.40 gasMeterReportInfo
This ModuleClass provides information of measurements of a gas meter. This ModuleClass provides information of measurements of a gas meter.
...@@ -6275,19 +6271,25 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6275,19 +6271,25 @@ 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 |
|largeFlowAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |LaFAm |
|latitude |[geoLocation](#53141-geolocation) |latie | |latitude |[geoLocation](#53141-geolocation) |latie |
|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 |
|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 |
|lock |[lock](#53152-lock) |lock | |lock |[lock](#53152-lock) |lock |
|lockedDownAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loDAm |
|loginName |[credentials](#53127-credentials) |logNe | |loginName |[credentials](#53127-credentials) |logNe |
|longitude |[geoLocation](#53141-geolocation) |longe | |longitude |[geoLocation](#53141-geolocation) |longe |
|loudness |[acousticSensor](#5312-acousticsensor) |louds | |loudness |[acousticSensor](#5312-acousticsensor) |louds |
|lowBattery |[battery](#53110-battery) |lowBy | |lowBattery |[battery](#53110-battery) |lowBy |
|lowCreditAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loCAm |
|lowGasAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loGAm |
|lqi |[signalStrength](#53178-signalstrength) |lqi | |lqi |[signalStrength](#53178-signalstrength) |lqi |
|machineStates |[runState](#53175-runstate) |macSs | |machineStates |[runState](#53175-runstate) |macSs |
|magneticDisturb |[gasMeterAlarm](#53139-gasmeteralarm) |magDb |
|manufacturer |[dmDeviceInfo](#583-dmdeviceinfo) |manur | |manufacturer |[dmDeviceInfo](#583-dmdeviceinfo) |manur |
|manufacturerDetailsLink |[dmDeviceInfo](#583-dmdeviceinfo) |maDLk | |manufacturerDetailsLink |[dmDeviceInfo](#583-dmdeviceinfo) |maDLk |
|manufacturingDate |[dmDeviceInfo](#583-dmdeviceinfo) |manDe | |manufacturingDate |[dmDeviceInfo](#583-dmdeviceinfo) |manDe |
...@@ -6395,6 +6397,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6395,6 +6397,7 @@ In protocol bindings resource attributes names for data points of module classes
|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 |
|singleCountAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |siCAm |
|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 |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment