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
+
+
+
+
+
+
+
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
+
+
+
+
+
+
diff --git a/DDF.xml b/DDF.xml
index bf50586a5..4f94bfb3b 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,14 +477,14 @@ 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
+ 1
0