From 427db779b0b622d03d8eb14cc20052e364bafd67 Mon Sep 17 00:00:00 2001 From: Sean Mcilroy Date: Sat, 18 Jul 2020 08:30:07 +0100 Subject: [PATCH 1/4] [Admin] Object 502 & 503 details added Object 502 & 503 details added --- DDF.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DDF.xml b/DDF.xml index bf50586a5..9dd47778f 100644 --- a/DDF.xml +++ b/DDF.xml @@ -462,14 +462,14 @@ These LwM2M Object Resources MUST only be changed by a LwM2M Bootstrap-Server or 502 urn:oma:lwm2m:oma:502 - TBC - TBC + CO Detector + This is an alarm that should be raised if the sensor detects a higher than threshold CO level. OMA 0 1.0 - + 502.xml - 0 + 1 0 @@ -477,12 +477,12 @@ These LwM2M Object Resources MUST only be changed by a LwM2M Bootstrap-Server or 503 urn:oma:lwm2m:oma:503 - TBC - TBC + Fire Alarm + This is an alarm that should be raised if the sensor(s) detect fire, based on the values reported from Temperature, Humidity, Smoke (CO2). OMA 0 1.0 - + 503.xml 0 From 091ac89bd06ed7179cf5cdc93f05b5be7d4f9674 Mon Sep 17 00:00:00 2001 From: Sean Mcilroy Date: Sat, 18 Jul 2020 08:35:09 +0100 Subject: [PATCH 2/4] Update DDF.xml --- DDF.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DDF.xml b/DDF.xml index 9dd47778f..4f94bfb3b 100644 --- a/DDF.xml +++ b/DDF.xml @@ -484,7 +484,7 @@ These LwM2M Object Resources MUST only be changed by a LwM2M Bootstrap-Server or 1.0 503.xml - 0 + 1 0 From d66a32d3874c1e0fae72d0dbc331917bda64fc72 Mon Sep 17 00:00:00 2001 From: Sean Mcilroy Date: Sat, 18 Jul 2020 08:53:59 +0100 Subject: [PATCH 3/4] [Admin] Object 502 added --- 502.xml | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 502.xml diff --git a/502.xml b/502.xml new file mode 100644 index 000000000..0b00f2cf9 --- /dev/null +++ b/502.xml @@ -0,0 +1,218 @@ + + + + + + + CO Detector + + 502 + urn:oma:lwm2m:oma:502 + + 1.0 + Multiple + Optional + + + CO Sensor Location Tag + RW + Single + Optional + String + + + + + + CO Detected + R + Single + Mandatory + Boolean + + + + + + Ambient CO Value + RW + Single + Optional + Float + 0..12800 + ppm + + + + CO Value + R + Single + Mandatory + Float + 0..12800 + ppm + + + + Min CO Range Value + R + Single + Optional + Float + 0..12800 + ppm + + + + Max CO Range Value + R + Single + Optional + Float + 0..12800 + ppm + + + + CO Detection Accuracy + R + Single + Optional + Float + 0..12800 + ppm + + + + Minimum Measured CO Value + R + Single + Optional + Float + 0..12800 + ppm + + + + Maximum Measured CO Value + R + Single + Optional + Float + 0..12800 + ppm + + + + Upper CO Threshold + RW + Single + Optional + Float + 0..12800 + ppm + + + + Reset + E + Single + Optional + + + + + + + Alarm loudness + R + Single + Optional + Float + + dB + + + + Latitude + R + Single + Optional + String + + + + + + Longitude + R + Single + Optional + String + + + + + + Altitude + R + Single + Optional + Float + + m + + + + Battery Percentage + R + Single + Optional + Float + 0.00..100.00 + + + + + + + From a16bb6253d8660816e28fe201fed21d4bd4bfb94 Mon Sep 17 00:00:00 2001 From: Sean Mcilroy Date: Sat, 18 Jul 2020 08:58:31 +0100 Subject: [PATCH 4/4] [Admin] Object 503 added Object 503 added --- 503.xml | 438 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 438 insertions(+) create mode 100644 503.xml diff --git a/503.xml b/503.xml new file mode 100644 index 000000000..545774506 --- /dev/null +++ b/503.xml @@ -0,0 +1,438 @@ + + + + + + + Fire Alarm + + 503 + urn:oma:lwm2m:oma:503 + + 1.0 + Multiple + Optional + + + Temperature Sensor Location Tag + RW + Single + Optional + String + + + + + + Temperature Unit + RW + Single + Mandatory + Integer + + + + + + Ambient Temperature + RW + Single + Optional + Float + + + + + + Temperature Value + R + Single + Mandatory + Float + + + + + + Minimum Measured Temperature Value + R + Single + Optional + Float + + + + + + Maximum Measured Temperature Value + R + Single + Optional + Float + + + + + + Min Temperature Range Value + RW + Single + Optional + Float + + + + + + Max Temperature Range Value + RW + Single + Optional + Float + + + + + + Lower Temperature Accuracy + RW + Single + Optional + Float + + + + + + Upper Temperature Accuracy + RW + Single + Optional + Float + + + + + + Temperature Threshold + RW + Single + Optional + Float + + + + + + Temperature Sensor Error + R + Single + Optional + Boolean + + + + + + Reset Temperature + E + Single + Optional + + + + + + + Temperature Alarm Loudness + RW + Single + Optional + Float + + dB + + + + Humidity Sensor Location Tag + RW + Single + Optional + String + + + + + + Ambient Relative Humidity + RW + Single + Optional + Float + 0.0..100.0 + %RH + + + + Humidity Value + R + Single + Mandatory + Float + 0.0..100.0 + /100 + + + + Minimum Measured Humidity Value + R + Single + Optional + Float + 0.0..100.0 + /100 + + + + Maximum Measured Humidity Value + R + Single + Optional + Float + 0.0..100.0 + /100 + + + + Humidity Accuracy + RW + Single + Optional + Float + 0.0..100.0 + /100 + + + + Humidity Threshold + RW + Single + Optional + Float + 0.0..100.0 + /100 + + + + Humidity Sensor Error + R + Single + Optional + Boolean + + + + + + Reset Humidity + E + Single + Optional + + + + + + + Humidity Alarm Loudness + RW + Single + Optional + Float + + dB + + + + Smoke Sensor Location Tag + RW + Single + Optional + String + + + + + + CO2 Alarm State + R + Single + Mandatory + Boolean + + + + + + Ambient CO2 Value + R + Single + Optional + Float + + ppm + + + + CO2 Value + R + Single + Mandatory + Float + + ppm + + + + Minimum Measured CO2 Value + R + Single + Optional + Float + + ppm + + + + Maximum Measured CO2 Value + R + Single + Optional + Float + + ppm + + + + CO2 Threshold + RW + Single + Optional + Float + + ppm + + + + Smoke Sensor Error + R + Single + Optional + Boolean + + + + + + Reset Smoke Detection + E + Single + Optional + + + + + + + Smoke Alarm Loudness + R + Single + Optional + Float + + dB + + + + Battery Percentage + R + Single + Optional + Float + 0.00..100.00 + + + + + Latitude + R + Single + Optional + String + + + + + + Longitude + R + Single + Optional + String + + + + + + Altitude + R + Single + Optional + Float + + m + + + + + +