diff --git a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md index 00ff853e959bffe39f2ed2abccf6dfe6a438f941..19186013c967b71d11771cd417c09dcf96d688fb 100644 --- a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md +++ b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md @@ -2944,14 +2944,10 @@ An outdoor lamp is a smart home appliance to provide lights and information for |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). | - #### 5.5.2.2 deviceMagneticParkingMonitor A parking detector is used to detect the state of the parking space. When the vehicle enters the parking space, the detector measure the change of the geomagnetic field strength, and report the state of the parking space to a server. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.2-1: Modules of deviceMagneticParkingMonitor Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2963,12 +2959,9 @@ A parking detector is used to detect the state of the parking space. When the ve |magneticSensorParameters |[magneticSensorParameters](#53161-magneticsensorparameters) |1 |See clause [5.3.1.61](#53161-magneticsensorparameters). | - - #### 5.5.2.3 deviceSmartElectricMeter A smart electric meter is a metering device that is used to measure consumption data for electricity. - **Table 5.5.2.3-1: Modules of deviceSmartElectricMeter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2982,14 +2975,9 @@ A smart electric meter is a metering device that is used to measure consumption |energyGeneration |[energyGeneration](#53133-energygeneration) |0..1 |See clause [5.3.1.33](#53133-energygeneration). | - - #### 5.5.2.4 deviceSmartGasMeter A smart gas meter is a metering device that is used to measure consumption data for gas. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.4-1: Modules of deviceSmartGasMeter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -3003,14 +2991,9 @@ A smart gas meter is a metering device that is used to measure consumption data |gasMeterAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |0..1 |See clause [5.3.1.39](#53139-gasmeteralarm). | - - #### 5.5.2.5 deviceSmartWaterMeter A smart water meter is a metering device that is used to measure consumption data for water. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.5-1: Modules of deviceSmartWaterMeter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -3025,14 +3008,9 @@ A smart water meter is a metering device that is used to measure consumption dat |waterMeterAlarm |[waterMeterAlarm](#53194-watermeteralarm) |0..1 |See clause 5.3.1.94. | - - #### 5.5.2.6 deviceStreetLightController A street light controller is used to control the opening and closing of the street light. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.6-1: Modules of deviceStreetLightController Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -3045,14 +3023,9 @@ A street light controller is used to control the opening and closing of the stre |slcAlarm |[slcAlarm](#53179-slcalarm) |1 |See clause [5.3.1.79](#53179-slcalarm). | - - #### 5.5.2.7 deviceWaterQualityMonitor A water quality monitor is an environmental monitoring device used to monitor water quality. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.7-1: Modules of deviceWaterQualityMonitor Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -3063,14 +3036,9 @@ A water quality monitor is an environmental monitoring device used to monitor wa |waterQualityMonitor |[waterQualityMonitor](#53198-waterqualitymonitor) |1 |See clause [5.3.1.98](#53198-waterqualitymonitor). | - - #### 5.5.2.8 deviceWeatherStation A weather station is a device that measures various atmospheric parameters. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.2.8-1: Modules of deviceWeatherStation Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -3085,8 +3053,6 @@ A weather station is a device that measures various atmospheric parameters. |uvSensor |[uvSensor](#53192-uvsensor) |0..1 |See clause [5.3.1.92](#53192-uvsensor). | - - ### 5.5.3 Health Domain #### 5.5.3.1 deviceBloodPressureMonitor @@ -5730,6 +5696,7 @@ In protocol bindings resource type names for device models shall be translated i |[deviceJuicer](#55434-devicejuicer) |devJr | |[deviceKettle](#55417-devicekettle) |devKe | |[deviceLight](#5517-devicelight) |devLt | +|[deviceMagneticParkingMonitor](#5522-devicemagneticparkingmonitor) | dMPMr | |[deviceMicrogeneration](#55418-devicemicrogeneration) |devMn | |[deviceMultiFunctionPrinter](#5518-devicemultifunctionprinter) |dMFPr | |[deviceOutdoorLamp](#5521-deviceoutdoorlamp) |deOLp | @@ -5743,9 +5710,12 @@ In protocol bindings resource type names for device models shall be translated i |[deviceSetTopBox](#55424-devicesettopbox) |dSTBx | |[deviceShoesWasher](#55435-deviceshoeswasher) |deSWr | |[deviceSmartElectricMeter](#5523-devicesmartelectricmeter) |dSEMr | +|[deviceSmartGasMeter](#5524-devicesmartgasmeter) | dSGMr | |[deviceSmartPlug](#55111-devicesmartplug) |deSPg | +|[deviceSmartWaterMeter](#5525-devicesmartwatermeter) |dSWMr | |[deviceSteamCloset](#55425-devicesteamcloset) |deSCt | |[deviceStorageBattery](#55426-devicestoragebattery) |deSBy | +|[deviceStreetLightController](#5526-devicestreetlightcontroller) |dSLCr | |[deviceSwitch](#55112-deviceswitch) |devSh | |[deviceTelevision](#55427-devicetelevision) |devTn | |[deviceThermometer](#55113-devicethermometer) |devTr | @@ -5757,6 +5727,8 @@ In protocol bindings resource type names for device models shall be translated i |[deviceBottleWarmer](#55430-devicebottlewarmer) |deBWr | |[deviceGarbageDisposal](#55431-devicegarbagedisposal) |deGDp | |[deviceWaterPurifier](#55432-devicewaterpurifier) |deWPr | +|[deviceWaterQualityMonitor](#5527-devicewaterqualitymonitor) | dWQMr | +|[deviceWeatherStation](#5528-deviceweatherstation) | deWSt | |[flexNode](#581-flexnode) |fleNe |