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 6791c44f6a48af14c8b6700e82262d88a5bae004..a192e17b265e94b25ca222db3cc22215643527b3 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 @@ -2516,12 +2516,9 @@ This ModuleClass provides information on the origin of the parent device data. ### 5.3.10 Public Safety Domain -#### 5.3.10.1 Disseminator +#### 5.3.10.1 disseminator This ModuleClass provides the capability of creating oneM2M based information from CAP based information received from oneM2M SP Gateway (ASN) and of controlling the change of received public warning messages such as updating oneM2M based information and cancelling the dissemination of oneM2M based information. -<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark> - - **Table 5.3.10.1-1: Actions of disseminator ModuleClass** |Return Type |Name |Argument |Optional |Documentation | @@ -2529,8 +2526,6 @@ This ModuleClass provides the capability of creating oneM2M based information fr |result:<br />xs:string |cancel |warningIdentifier: xs:string |true |cancel previously requested warning | - - **Table 5.3.10.1-2: DataPoints of disseminator ModuleClass** |Name |Type |R/W |Optional |Unit |Documentation | @@ -2555,8 +2550,6 @@ This ModuleClass provides the capability of creating oneM2M based information fr |repetitionCount |xs:integer |RW |false | |This specifies the number of times the warning message is to be sent. | - - #### 5.3.10.2 emergencyHandler This ModuleClass provides the capability of triggering things to change into an emergency mode and of enabling things to identify whether an event described in oneM2M based information that is received from Public Warning Center (MN) is relevant to things. If any change happens in received warning messages such as updating oneM2M based information and cancelling the dissemination of oneM2M based information of previously received public warning messages, this ModuleClass updates oneM2M based information corresponding to those received public warning messages to control behaviour of things. @@ -5980,6 +5973,7 @@ In protocol bindings resource type names for actions shall be translated into sh |[activateClockTimer](#53190-timer) |acCTr | |[answer](#53164-phonecall) |answr | |[call](#53164-phonecall) |call | +|[cancel](#53101-disseminator) |cancl | |[close](#53156-openlevel) |close | |[deactivate](#586-dmsoftware) |deace | |[deactivateClockTimer](#53190-timer) |deCTr | @@ -6047,6 +6041,9 @@ In protocol bindings resource attributes names for data points of module classes |algae |[waterQualityMonitor](#53198-waterqualitymonitor) |algae | |altitude |[geoLocation](#53141-geolocation) |altie | |anionics |[waterQualityMonitor](#53198-waterqualitymonitor) |anios | +|areaLatitude |[disseminator](#53101-disseminator) |areLe | +|areaLongitude |[disseminator](#53101-disseminator) |areL0 | +|areaRadius |[disseminator](#53101-disseminator) |areRs | |aroh |[waterQualityMonitor](#53198-waterqualitymonitor) |aroh | |as |[waterQualityMonitor](#53198-waterqualitymonitor) |as | |atmosphericPressure |[barometer](#531101-barometer) |atmPe | @@ -6070,6 +6067,7 @@ In protocol bindings resource attributes names for data points of module classes |capacity |[battery](#53110-battery) |capay | |cd |[waterQualityMonitor](#53198-waterqualitymonitor) |cd | |cellID |[connectivity](#53125-connectivity) |celID | +|certainty |[disseminator](#53101-disseminator) |certy | |ch2o |[airQualitySensor](#5316-airqualitysensor) |ch2o | |channelId |[televisionChannel](#53186-televisionchannel) |chaId | |channelName |[televisionChannel](#53186-televisionchannel) |chaNe | @@ -6148,10 +6146,13 @@ In protocol bindings resource attributes names for data points of module classes |do |[waterQualityMonitor](#53198-waterqualitymonitor) |do | |doorState |[doorStatus](#53130-doorstatus) |dooSe | |duration |[overcurrentSensor](#53158-overcurrentsensor), [recorder](#53170-recorder) |dur | +|effective |[disseminator](#53101-disseminator) |effee | |electricEnergy |[battery](#53110-battery) |eleEy | |enabled |[dmEventLog](#587-dmeventlog) |enabd | |energy |[pulsemeter](#53168-pulsemeter) |enery | |estimatedTimeToEnd |[timer](#53190-timer) |eTTEd | +|eventCodes |[disseminator](#53101-disseminator) |eveCs | +|expires |[disseminator](#53101-disseminator) |expis | |extraRinse |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |extRe | |f |[waterQualityMonitor](#53198-waterqualitymonitor) |f | |fakeStatus |[billDeposit](#531108-billdeposit), [coinDeposit](#531110-coindeposit) |fakSs | @@ -6192,6 +6193,7 @@ In protocol bindings resource attributes names for data points of module classes |horizontalDirection |[airFlow](#5314-airflow) |horDn | |humidity |[airQualitySensor](#5316-airqualitysensor) |humiy | |hwVersion |[dmDeviceInfo](#583-dmdeviceinfo)|hweVn | +|identifier |[disseminator](#53101-disseminator) |idenr | |impactDirectionHorizontal |[impactSensor](#53147-impactsensor) |imDHl | |impactDirectionVertical |[impactSensor](#53147-impactsensor) |imDVl | |impactLevel |[impactSensor](#53147-impactsensor) |impLl | @@ -6275,6 +6277,7 @@ In protocol bindings resource attributes names for data points of module classes |modality |[pulsemeter](#53168-pulsemeter) |moday | |model |[dmDeviceInfo](#583-dmdeviceinfo) |model | |monitoringEnabled |[airQualitySensor](#5316-airqualitysensor) |monEd | +|msgType |[disseminator](#53101-disseminator) |msgTe | |multiFirmware |[dmFirmware](#585-dmfirmware) |mulFe | |multiplyingFactors |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |mulFs | |muscle |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |musce | @@ -6293,6 +6296,7 @@ In protocol bindings resource attributes names for data points of module classes |odor |[airQualitySensor](#5316-airqualitysensor) |odor | |oil |[waterQualityMonitor](#53198-waterqualitymonitor) |oil | |onlineStatus |[slcReportInfo](#53181-slcreportinfo) |onlSs | +|onset |[disseminator](#53101-disseminator) |onset | |openAlarm |[doorStatus](#53130-doorstatus) |opeAm | |openDuration |[doorStatus](#53130-doorstatus) |opeDn | |openLevel |[openLevel](#53156-openlevel) |opeLl | @@ -6353,9 +6357,12 @@ In protocol bindings resource attributes names for data points of module classes |recipientID |[phoneCall](#53164-phonecall) |recID | |red |[colour](#53123-colour) |red | |referenceTimer |[timer](#53190-timer) |refTr | +|references |[disseminator](#53101-disseminator) |refes | |relativeHumidity |[relativeHumidity](#53172-relativehumidity) |relHy | |reliability |[features](#5391-features) |reliy | |remoteControlEnabled |[remoteControlEnable](#53173-remotecontrolenable) |reCEd | +|repetitionCount |[disseminator](#53101-disseminator) |repCt | +|repetitionPeriod |[disseminator](#53101-disseminator) |repPd | |resistance |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |resie | |retryInterval |[periodicalReportConfig](#53163-periodicalreportconfig) |retIl | |retryTimes |[periodicalReportConfig](#53163-periodicalreportconfig) |retTs | @@ -6377,8 +6384,11 @@ In protocol bindings resource attributes names for data points of module classes |secondaryUrl |[dmFirmware](#585-dmfirmware) |secUl | |secondaryVersion |[dmFirmware](#585-dmfirmware) |secVn | |securityModes |[securityMode](#53176-securitymode) |secMs | +|sender |[disseminator](#53101-disseminator) |sendr | |sensitivity |[motionSensor](#53154-motionsensor) |sensy | +|sent |[disseminator](#53101-disseminator) |sent | |serialNumber |[dmDeviceInfo](#583-dmdeviceinfo) |serNr | +|severity |[disseminator](#53101-disseminator) |sevey | |signalECL |[connectivity](#53125-connectivity) |siECL | |significantDigits |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |sigDs | |silentTime |[motionSensor](#53154-motionsensor) |silTe | @@ -6397,7 +6407,7 @@ In protocol bindings resource attributes names for data points of module classes |standardreferenceVoltage |[slcAlarm](#53179-slcalarm) |staVe | |startPause |[operationMode](#53157-operationmode) |staPe | |state |[dmAgent](#582-dmagent), [dmPackage](#588-dmpackage), [dmFirmware](#585-dmfirmware), [binarySwitch](#53112-binaryswitch) |state | -|status |[boiler](#53115-boiler), [dmEventLog](#587-dmeventlog), [electricVehicleConnector](#53131-electricvehicleconnector), [faultDetection](#53134-faultdetection), filterInf, [mediaSelect](#53153-mediaselect) |sus | +|status |[boiler](#53115-boiler), [disseminator](#53101-disseminator), [dmEventLog](#587-dmeventlog), [electricVehicleConnector](#53131-electricvehicleconnector), [faultDetection](#53134-faultdetection), filterInf <mark>editor note: correct reference</mark>, [mediaSelect](#53153-mediaselect) |sus | |steamTreat |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |steTt | |step |[numberValue](#53155-numbervalue) |step | |stepValue |[audioVolume](#5318-audiovolume), [openLevel](#53156-openlevel), [temperature](#53187-temperature) |steVe | @@ -6451,6 +6461,7 @@ In protocol bindings resource attributes names for data points of module classes |underVoltagePercent |[slcAlarm](#53179-slcalarm) |unVPt | |underVoltageThreshold |[slcAlarm](#53179-slcalarm) |unVTd | |unit |[temperature](#53187-temperature), [temperatureAlarm](#53188-temperaturealarm) |unit | +|urgency |[disseminator](#53101-disseminator) |urgey | |urgencyButtonPush |[waterMeterAlarm](#53194-watermeteralarm)|urBPh | |uri |[printQueue](#53167-printqueue) |ur0 | |url |[sessionDescription](#53177-sessiondescription), [dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |url | @@ -6506,6 +6517,7 @@ In protocol bindings resource attributes names for arguments of actions shall be |payload |[writeIO](#584-dmdatamodelio) |payld | |rebootType |[reboot](#582-dmagent) |rebTe | |url |[deployPackage](#582-dmagent), [updateFirmware](#585-dmfirmware), [update](#588-dmpackage) |url | +|warningIdentifier | [disseminator](#53101-disseminator) |warIr | |version |[deployPackage](#582-dmagent), [updateFirmware](#585-dmfirmware), [update](#588-dmpackage) |versn |