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

Merge branch 'RDM-2025-0014-Adding_short_names_for_prePaidCardReader_MC' into R5

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
parents d651721d f6f257ad
No related branches found
No related tags found
1 merge request!34RDM-2025-0014-Adding_short_names_for_prePaidCardReader_MC
...@@ -2198,9 +2198,6 @@ This ModuleClass provides the capability to get selections of a user from the pr ...@@ -2198,9 +2198,6 @@ This ModuleClass provides the capability to get selections of a user from the pr
#### 5.3.1.107 prePaidCardReader #### 5.3.1.107 prePaidCardReader
The Pre-paid card reader ModuleClass provides functions to read NFC card and indicates its information. The Pre-paid card reader ModuleClass provides functions to read NFC card and indicates its information.
<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
**Table 5.3.1.107-1: DataPoints of prePaidCardReader ModuleClass** **Table 5.3.1.107-1: DataPoints of prePaidCardReader ModuleClass**
|Name |Type |R/W |Optional |Unit |Documentation | |Name |Type |R/W |Optional |Unit |Documentation |
...@@ -2212,7 +2209,6 @@ The Pre-paid card reader ModuleClass provides functions to read NFC card and ind ...@@ -2212,7 +2209,6 @@ The Pre-paid card reader ModuleClass provides functions to read NFC card and ind
#### 5.3.1.108 billDeposit #### 5.3.1.108 billDeposit
This ModuleClass provides the capability to deposit bills, indicates the balance of the deposited bills and detects fakes. This ModuleClass provides the capability to deposit bills, indicates the balance of the deposited bills and detects fakes.
...@@ -6076,6 +6072,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6076,6 +6072,7 @@ In protocol bindings resource attributes names for data points of module classes
|automode |[airFlow](#5314-airflow) |autoe | |automode |[airFlow](#5314-airflow) |autoe |
|availableChannels |[televisionChannel](#53186-televisionchannel) |avaCs | |availableChannels |[televisionChannel](#53186-televisionchannel) |avaCs |
|backoffTime |[periodicalReportConfig](#53163-periodicalreportconfig) |bacTe | |backoffTime |[periodicalReportConfig](#53163-periodicalreportconfig) |bacTe |
|balance |[prePaidCardReader](#531107-prepaidcardreader) |balae |
|basalMetabolism |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |basMm | |basalMetabolism |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |basMm |
|bath |[hotWaterSupply](#53146-hotwatersupply) |bath | |bath |[hotWaterSupply](#53146-hotwatersupply) |bath |
|batteryThreshold |[battery](#53110-battery) |batTd | |batteryThreshold |[battery](#53110-battery) |batTd |
...@@ -6095,6 +6092,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6095,6 +6092,7 @@ In protocol bindings resource attributes names for data points of module classes
|ch2o |[airQualitySensor](#5316-airqualitysensor) |ch2o | |ch2o |[airQualitySensor](#5316-airqualitysensor) |ch2o |
|channelId |[televisionChannel](#53186-televisionchannel) |chaId | |channelId |[televisionChannel](#53186-televisionchannel) |chaId |
|channelName |[televisionChannel](#53186-televisionchannel) |chaNe | |channelName |[televisionChannel](#53186-televisionchannel) |chaNe |
|cardInfo |[prePaidCardReader](#531107-prepaidcardreader) |carIo |
|charging |[battery](#53110-battery) |charg | |charging |[battery](#53110-battery) |charg |
|chargingCapacity |[electricVehicleConnector](#53131-electricvehicleconnector) |chaCy | |chargingCapacity |[electricVehicleConnector](#53131-electricvehicleconnector) |chaCy |
|chlorophyll_a |[waterQualityMonitor](#53198-waterqualitymonitor) |chloa | |chlorophyll_a |[waterQualityMonitor](#53198-waterqualitymonitor) |chloa |
...@@ -6125,6 +6123,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6125,6 +6123,7 @@ In protocol bindings resource attributes names for data points of module classes
|cr6 |[waterQualityMonitor](#53198-waterqualitymonitor) |cr6 | |cr6 |[waterQualityMonitor](#53198-waterqualitymonitor) |cr6 |
|cu |[waterQualityMonitor](#53198-waterqualitymonitor) |cu | |cu |[waterQualityMonitor](#53198-waterqualitymonitor) |cu |
|cupsNumber |[brewing](#53116-brewing) |cupNr | |cupsNumber |[brewing](#53116-brewing) |cupNr |
|currency |[prePaidCardReader](#531107-prepaidcardreader) |curry |
|current |[energyConsumption](#53132-energyconsumption) |currt | |current |[energyConsumption](#53132-energyconsumption) |currt |
|currentAdfState |[autoDocumentFeeder](#5319-autodocumentfeeder) |cuASe | |currentAdfState |[autoDocumentFeeder](#5319-autodocumentfeeder) |cuASe |
|currentCycleTransmissionErrors |[connectivity](#53125-connectivity) |cCTEs | |currentCycleTransmissionErrors |[connectivity](#53125-connectivity) |cCTEs |
...@@ -6363,6 +6362,7 @@ In protocol bindings resource attributes names for data points of module classes ...@@ -6363,6 +6362,7 @@ In protocol bindings resource attributes names for data points of module classes
|ramTotal |[dmAgent](#582-dmagent) |ramTl | |ramTotal |[dmAgent](#582-dmagent) |ramTl |
|rapidCool |[refrigeration](#53171-refrigeration) |rapCl | |rapidCool |[refrigeration](#53171-refrigeration) |rapCl |
|rapidFreeze |[refrigeration](#53171-refrigeration) |rapFe | |rapidFreeze |[refrigeration](#53171-refrigeration) |rapFe |
|readStatus |[prePaidCardReader](#531107-prepaidcardreader) |reaSs |
|rechargeCredit |[gasChargingControl](#53138-gaschargingcontrol) |recCt | |rechargeCredit |[gasChargingControl](#53138-gaschargingcontrol) |recCt |
|rechargeGas |[gasChargingControl](#53138-gaschargingcontrol) |recGs | |rechargeGas |[gasChargingControl](#53138-gaschargingcontrol) |recGs |
|recipientID |[phoneCall](#53164-phonecall) |recID | |recipientID |[phoneCall](#53164-phonecall) |recID |
......
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