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..6126af214941918f46ca6584b5a47e91e19cec15 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 @@ -2616,8 +2616,6 @@ A 3D printer is a smart home appliance to provide 3D printing capabilities. |printQueue |[printQueue](#53167-printqueue) |1 |See clause [5.3.1.67](#53167-printqueue). | - - #### 5.5.1.2 deviceAirQualityMonitor An air quality monitor is an environmental monitoring device used to monitor the air quality. @@ -2631,12 +2629,9 @@ An air quality monitor is an environmental monitoring device used to monitor the |periodicalReportConfig |[periodicalReportConfig](#53163-periodicalreportconfig) |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). | - - #### 5.5.1.3 deviceAudioReceiver An audio receiver is a device that receives audio signals from a number of sources, processing them to drive speakers. - **Table 5.5.3.1-1: Modules of deviceAudioReceiver model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2647,12 +2642,9 @@ An audio receiver is a device that receives audio signals from a number of sourc |mediaOutput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). | - - #### 5.5.1.4 deviceCamera A camera is an optical instrument for recording or capturing images, which may be stored locally or transmitted to another locations. - **Table 5.5.1.4-1: Modules of deviceCamera Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2662,12 +2654,9 @@ A camera is an optical instrument for recording or capturing images, which may b |motionSensor |[motionSensor](#53154-motionsensor) |0..1 |See clause [5.3.1.54](#53154-motionsensor). | - - #### 5.5.1.5 deviceDoor A door is a device that is used to open and close a door. - **Table 5.5.1.5-1: Modules of deviceDoor model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2677,12 +2666,9 @@ A door is a device that is used to open and close a door. |doorStatus |[doorStatus](#53130-doorstatus) |0..1 |See clause [5.3.1.30](#53130-doorstatus). | - - #### 5.5.1.6 deviceDoorLock A door lock is a device that can be used to lock, for example, a door. - **Table 5.5.1.6-1: Modules of deviceDoorLock Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2692,12 +2678,9 @@ A door lock is a device that can be used to lock, for example, a door. |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). | - - #### 5.5.1.7 deviceLight A light is a device that is used to control the state of an illumination appliance. - **Table 5.5.1.7-1: Modules of deviceLight Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2711,12 +2694,9 @@ A light is a device that is used to control the state of an illumination applian |timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). | - - #### 5.5.1.8 deviceMultiFunctionPrinter A Multi Function Printer (MFP) is an office machine which incorporates the functionality of multiple devices in one, so as to have a smaller footprint in home or office. A typical MFP may act as a combination of printer, scanner and more. This MFP information model provides capabilities to control and monitor MFP specific functions and resources. - **Table 5.5.1.8-1: Modules of deviceMultiFunctionPrinter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2728,12 +2708,9 @@ A Multi Function Printer (MFP) is an office machine which incorporates the funct |printQueue |[printQueue](#53167-printqueue) |0..1 |See clause [5.3.1.67](#53167-printqueue). | - - #### 5.5.1.9 devicePrinter A printer is a device that is used to monitor or control the state of a printing appliance. - **Table 5.5.1.9-1: Modules of devicePrinter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2743,12 +2720,9 @@ A printer is a device that is used to monitor or control the state of a printing |printQueue |[printQueue](#53167-printqueue) |0..1 |See clause [5.3.1.67](#53167-printqueue). | - - #### 5.5.1.10 deviceScanner A scanner is a device that optically scans images, printed text, handwriting or an object, and converts it to a digital image. - **Table 5.5.1.10-1: Modules of deviceScanner model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2758,12 +2732,9 @@ A scanner is a device that optically scans images, printed text, handwriting or |autoDocumentFeeder |[autoDocumentFeeder](#5319-autodocumentfeeder) |0..1 |See clause [5.3.1.9](#5319-autodocumentfeeder). | - - #### 5.5.1.11 deviceSmartPlug A smart plug is a device that can turn on and off a connected appliance. - **Table 5.5.1.11-1: Modules of deviceSmartPlug model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2773,8 +2744,6 @@ A smart plug is a device that can turn on and off a connected appliance. |remoteControlEnable |[remoteControlEnable](#53173-remotecontrolenable) |0..1 |See clause [5.3.1.73](#53173-remotecontrolenable). | - - **Table 5.5.1.11-2: SubDevice of deviceSmartPlug Device model** |SubDevice Instance Name |SubDevice Name |Multiplicity |Description | @@ -2782,7 +2751,6 @@ A smart plug is a device that can turn on and off a connected appliance. |powerOutlet0<br/><mark>Discuss: This should be "powerOutlet"</mark> |[subDevicePowerOutlet](#5412-subdevicepoweroutlet) |1..N |See clause [5.4.1.2](#5412-subdevicepoweroutlet). | - #### 5.5.1.12 deviceSwitch A switch is a device that is used to control and monitor the state of power. @@ -2793,12 +2761,9 @@ A switch is a device that is used to control and monitor the state of power. |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). | - - #### 5.5.1.13 deviceThermometer A thermometer is a device that can be used to check, for example, the body or other temperatures. - **Table 5.5.1.13-1: Modules of deviceThermoMeter Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2808,8 +2773,6 @@ A thermometer is a device that can be used to check, for example, the body or ot |temperatureAlarm |[temperatureAlarm](#53188-temperaturealarm) |0..1 |See clause [5.3.1.88](#53188-temperaturealarm). | - - #### 5.5.1.14 deviceThermostat A thermostat is used to control the ambient temperature of rooms within, for example, a house. This information model provides capabilities to interact with specific functions of thermostats. @@ -2822,12 +2785,9 @@ A thermostat is used to control the ambient temperature of rooms within, for exa |temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). | - - #### 5.5.1.15 deviceWaterValve A water valve is a device that is used to turn the water supply ON or OFF remotely. - **Table 5.5.1.15-1: Modules of waterValve Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2835,16 +2795,9 @@ A water valve is a device that is used to turn the water supply ON or OFF remote |openLevel |[openLevel](#53156-openlevel) |1 |See clause [5.3.1.56](#53156-openlevel). | - - #### 5.5.1.16 deviceServiceButton A service button is a device that initiates and controls technical or business processes, such as ordering consumer and industrial goods over the Internet. It may support optional ModuleClasses to present information to a user, such as presenting textual and graphical information. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - - - **Table 5.5.1.16-1: Modules of deviceServiceButton Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2859,15 +2812,9 @@ A service button is a device that initiates and controls technical or business p |geoLocation |[geoLocation](#53141-geolocation) |0..1 |See clause [5.3.1.41](#53141-geolocation). This ModuleClass may be used to detect and report the geo-location of a deviceServiceButton device. | - #### 5.5.1.17 deviceGenericSensor A device that is composed of one or more basic sensors. This generic model is proposed to represent very simple appliances that feature one or more sensing behaviours (mono/multi sensors). -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - - - **Table 5.5.1.17-1: Modules of deviceGenericSensor Device model** |Module Instance Name |Module Class Name |Optional |Description | @@ -2881,16 +2828,9 @@ A device that is composed of one or more basic sensors. This generic model is pr |waterSensor |[waterSensor](#53197-watersensor) |0..1 |See clause [5.3.1.97](#53197-watersensor). | - - #### 5.5.1.18 device3DDisplay A 3D display is a device to display 3D contents such as 3D character or holographic image. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - - - **Table 5.5.1.18-1: Modules of device3DDisplay Device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2904,14 +2844,9 @@ A 3D display is a device to display 3D contents such as 3D character or holograp |lock |[lock](#53152-lock) |0..1 |See clause [5.3.1.52](#53152-lock). | - - #### 5.5.1.19 device3DScanner A 3D scanner is a device to scan 3D objects such as a statue of a character. -<mark>Editor note: the device is missing from the short name tables in 6.3</mark> - - **Table 5.5.1.19-1: Modules of device3DScanner device model** |Module Instance Name |Module Class Name |Multiplicity |Description | @@ -2923,8 +2858,6 @@ A 3D scanner is a device to scan 3D objects such as a statue of a character. |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). | - - ### 5.5.2 City Domain #### 5.5.2.1 deviceOutdoorLamp @@ -5700,7 +5633,9 @@ In protocol bindings resource type names for device models shall be translated i |Resource Type Name |Short Name | |-|-| +|[device3DDisplay](#55118-device3ddisplay) |dTDDy | |[device3DPrinter](#5511-device3dprinter) |dTDPr | +|[device3DScanner](#55119-device3dscanner)| dTDSr | |[deviceAirConditioner](#5541-deviceairconditioner) |deACr | |[deviceAirHeater](#55433-deviceairheater) |deAHr | |[deviceAirPurifier](#5542-deviceairpurifier) |deAPr | @@ -5723,6 +5658,7 @@ In protocol bindings resource type names for device models shall be translated i |[deviceFan](#55412-devicefan) |devFn | |[deviceFoodProbe](#55413-devicefoodprobe) |deFPe | |[deviceFreezer](#55414-devicefreezer) |devFr | +|[deviceGenericSensor](#55117-devicegenericsensor) |deGSr | |[deviceGlucosemeter](#5532-deviceglucosemeter) |devGr | |[deviceHeartRateMonitor](#5533-deviceheartratemonitor) |dHRMr | |[deviceHomeCCTV](#55415-devicehomecctv) |dHCCT | @@ -5740,6 +5676,7 @@ In protocol bindings resource type names for device models shall be translated i |[deviceRobotCleaner](#55422-devicerobotcleaner) |deRCr | |[deviceScanner](#55110-devicescanner) |devSr | |[deviceSecurityPanel](#55423-devicesecuritypanel) |deSPl | +|[deviceServiceButton](#55116-deviceservicebutton) |deSBn | |[deviceSetTopBox](#55424-devicesettopbox) |dSTBx | |[deviceShoesWasher](#55435-deviceshoeswasher) |deSWr | |[deviceSmartElectricMeter](#5523-devicesmartelectricmeter) |dSEMr | @@ -5760,7 +5697,6 @@ In protocol bindings resource type names for device models shall be translated i |[flexNode](#581-flexnode) |fleNe | - In protocol bindings resource type names for SubDevice model shall be translated into short names of Table 6.3.2-2. **Table 6.3.2-2: Specialization type short names (SubDevice models)**