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

Merge branch 'RDM-2025-0047-Add_missing_short_names_for_railway_domain_devices' into R5 

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
parents e8b65268 aa1b49d6
No related branches found
No related tags found
1 merge request!60RDM-2025-0047-Add_missing_short_names_for_railway_domain_devices
Hide whitespace changes
Inline Side-by-side
TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
+ 13
− 32
View file @ 863a5aeb
......@@ -3621,9 +3621,6 @@ A cow activity monitor device is a battery-powered wireless metering device that
#### 5.5.8.1 deviceHandheldPTTTerminal
A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
**Table 5.5.8.1-1: Modules of deviceHandheldPTTTerminal Device model**
|Module Instance Name |Module Class Name |Multiplicity |Description |
......@@ -3641,13 +3638,9 @@ A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The te
|signalStrength |[signalStrength](#53178-signalstrength) |0..1 |See clause [5.3.1.78](#53178-signalstrength). |
#### 5.5.8.2 deviceTrainborneTerminal
A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
**Table 5.5.8.2-1: Modules of deviceTrainborneTerminal Device model**
|Module Instance Name |Module Class Name |Multiplicity |Description |
......@@ -3666,14 +3659,9 @@ A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The te
|connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
#### 5.5.8.3 deviceCardRechargingMachine
A card recharging machine is a device of the Railway Domain. The machine provides recharging service for pre-paid card for transportation. Railway users simply recharging their cards and use it as a payment method for transportation fare.
<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
**Table 5.5.8.3-1: Modules of deviceCardRechargingMachine Device model**
|Module Instance Name |Module Class Name |Multiplicity |Description |
......@@ -3695,14 +3683,9 @@ A card recharging machine is a device of the Railway Domain. The machine provide
|lock |[lock](#53152-lock) |1 |See clause [5.3.1.52](#53152-lock). |
#### 5.5.8.4 deviceSmartGate
A smart gate is a device of the Railway Domain. The gate provides passenger service for checking ticket and control the gate usage. Railway users simply use the gate with their ticket (e.g. passenger card) which have pre-paid card function.
<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
**Table 5.5.8.4-1: Modules of deviceSmartGate Device model**
|Module Instance Name |Module Class Name |Multiplicity |Description |
......@@ -3723,32 +3706,25 @@ A smart gate is a device of the Railway Domain. The gate provides passenger serv
|crossingBarrier |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
#### 5.5.8.5 deviceSmartScreenDoor
A smart screen door is a device of the Railway Domain. The screen doors are pairs of sliding doors in a platform with synchronization of doors of a train that is staying in the platform. When the train doors are open, the smart screen doors are open in simultaneously, and vice versa. The screen doors are used in the metro platform mostly.
<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
**Table 5.5.8.5-1: Modules of deviceSmartScreenDoor Device Model**
|Module Instance Name |Module Class Name |Multiplicity |Description |
|-|-|-|-|
|audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [audioVolume](#5318-audiovolume). |
|binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
|screenDoor |[doorStatus](#53130-doorstatus) |1..N |See clause [5.3.1.30](#53130-doorstatus). |
|releaseSwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
|emergencyButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
|audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [audioVolume](#5318-audiovolume). |
|crossingSensor |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
|connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
|gateState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
|directionPanel |[headingSensor](#531113-headingsensor) |0..1 |See clause [5.3.1.113](#531113-headingsensor). |
|crossingIndicatorColourBrightness |[brightness](#53117-brightness) |0..1 |See clause [5.3.1.17](#53117-brightness). |
|crossingIndicatorColour |[colour](#53123-colour) |0..1 |See clause [5.3.1.23](#53123-colour). |
|crossingIndicatorColourSaturation |[colourSaturation](#53124-coloursaturation) |0..1 |See clause [5.3.1.24](#53124-coloursaturation). |
|crossingIndicatorColourBrightness |[brightness](#53117-brightness) |0..1 |See clause [5.3.1.17](#53117-brightness). |
|connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
|crossingSensor |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
|screenDoor |[doorStatus](#53130-doorstatus) |1..N |See clause [5.3.1.30](#53130-doorstatus). |
|directionPanel |[headingSensor](#531113-headingsensor) |0..1 |See clause [5.3.1.113](#531113-headingsensor). |
|emergencyButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
|gateState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
### 5.5.9 Public Safety Domain
......@@ -5510,6 +5486,7 @@ In protocol bindings resource type names for device models shall be translated i
|[deviceAudioReceiver](#5513-deviceaudioreceiver) |deARr |
|[deviceBloodPressureMonitor](#5531-devicebloodpressuremonitor) |dBPMr |
|[deviceCamera](#5514-devicecamera) |devCa |
|[deviceCardRechargingMachine](#5583-devicecardrechargingmachine) |dCRMe |
|[deviceClothesDryer](#5543-deviceclothesdryer) |deCDr |
|[deviceClothesWasher](#5544-deviceclotheswasher) |deCWr |
|[deviceClothesWasherDryer](#5545-deviceclotheswasherdryer) |dCWDr |
......@@ -5529,6 +5506,7 @@ In protocol bindings resource type names for device models shall be translated i
|[deviceFreezer](#55414-devicefreezer) |devFr |
|[deviceGenericSensor](#55117-devicegenericsensor) |deGSr |
|[deviceGlucosemeter](#5532-deviceglucosemeter) |devGr |
|[deviceHandheldPTTTerminal](#5581-devicehandheldpttterminal) |dHPTl |
|[deviceHeartRateMonitor](#5533-deviceheartratemonitor) |dHRMr |
|[deviceHomeCCTV](#55415-devicehomecctv) |dHCCT |
|[deviceHumidifier](#55416-devicehumidifier) |devHr |
......@@ -5552,7 +5530,9 @@ In protocol bindings resource type names for device models shall be translated i
|[deviceShoesWasher](#55435-deviceshoeswasher) |deSWr |
|[deviceSmartElectricMeter](#5523-devicesmartelectricmeter) |dSEMr |
|[deviceSmartGasMeter](#5524-devicesmartgasmeter) | dSGMr |
|[deviceSmartGate](#5584-devicesmartgate) |deSGe |
|[deviceSmartPlug](#55111-devicesmartplug) |deSPg |
|[deviceSmartScreenDoor](#5585-devicesmartscreendoor) |dSSDr |
|[deviceSmartWaterMeter](#5525-devicesmartwatermeter) |dSWMr |
|[deviceSteamCloset](#55425-devicesteamcloset) |deSCt |
|[deviceStorageBattery](#55426-devicestoragebattery) |deSBy |
......@@ -5561,6 +5541,7 @@ In protocol bindings resource type names for device models shall be translated i
|[deviceTelevision](#55427-devicetelevision) |devTn |
|[deviceThermometer](#55113-devicethermometer) |devTr |
|[deviceThermostat](#55114-devicethermostat) |devTt |
|[deviceTrainborneTerminal](#5582-devicetrainborneterminal) | deTTl |
|[deviceWaterHeater](#55428-devicewaterheater) |deWHr |
|[deviceWaterValve](#55115-devicewatervalve) |deWVe |
|[deviceWeightScaleAndBodyCompositionAnalyser](#5535-deviceweightscaleandbodycompositionanalyser) |dWSAB |
......
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