Unifyed noise and sound into sound

J2thatsme · J2thatsme · commit 1a5c6b4d040b · 2025-01-08T16:17:23.000+01:00
diff --git a/data-models/environment/schema.json b/data-models/environment/schema.json
@@ -165,4 +165,4 @@
       }
     }
   }
-}
+}
diff --git a/types/browan/TBSound/meta.json b/types/browan/TBSound/meta.json
@@ -7,8 +7,14 @@
   "author": "Akenza AG",
   "firmwareVersion": "V1.0.0",
   "loraDeviceClass": "A",
-  "availableSensors": ["Temperature", "Noise"],
-  "outputTopics": ["default", "lifecycle"],
+  "availableSensors": [
+    "Temperature",
+    "Sound"
+  ],
+  "outputTopics": [
+    "default",
+    "lifecycle"
+  ],
   "encoding": "HEX",
   "connectivity": "LORA"
-}
+}
diff --git a/types/elsys/eiaqd10/uplink.js b/types/elsys/eiaqd10/uplink.js
@@ -482,7 +482,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/elt-2-ultrasonic/uplink.js b/types/elsys/elt-2-ultrasonic/uplink.js
@@ -559,7 +559,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/elt-2/uplink.js b/types/elsys/elt-2/uplink.js
@@ -511,7 +511,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/elt-lite/uplink.js b/types/elsys/elt-lite/uplink.js
@@ -511,7 +511,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ems-desk/uplink.js b/types/elsys/ems-desk/uplink.js
@@ -478,7 +478,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ems-door/uplink.js b/types/elsys/ems-door/uplink.js
@@ -516,7 +516,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ems-lite/uplink.js b/types/elsys/ems-lite/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ems/uplink.js b/types/elsys/ems/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-co2-lite/uplink.js b/types/elsys/ers-co2-lite/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-co2/uplink.js b/types/elsys/ers-co2/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-desk/uplink.js b/types/elsys/ers-desk/uplink.js
@@ -478,7 +478,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-eco-co2/uplink.js b/types/elsys/ers-eco-co2/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-eco/uplink.js b/types/elsys/ers-eco/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-eye/uplink.js b/types/elsys/ers-eye/uplink.js
@@ -478,7 +478,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-lite/uplink.js b/types/elsys/ers-lite/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-sound/meta.json b/types/elsys/ers-sound/meta.json
@@ -7,14 +7,20 @@
   "author": "Akenza AG",
   "firmwareVersion": "V2.3.5",
   "loraDeviceClass": "A",
-  "availableSensors": ["Motion", "Light", "Humidity", "Temperature", "Noise"],
+  "availableSensors": [
+    "Motion",
+    "Light",
+    "Humidity",
+    "Temperature",
+    "Sound"
+  ],
   "outputTopics": [
     "default",
     "occupancy",
-    "noise",
+    "sound",
     "lifecycle",
     "configuration"
   ],
   "encoding": "HEX",
   "connectivity": "LORA"
-}
+}
diff --git a/types/elsys/ers-sound/noise.schema.json b/types/elsys/ers-sound/noise.schema.json
diff --git a/types/elsys/ers-sound/sound.schema.json b/types/elsys/ers-sound/sound.schema.json
@@ -0,0 +1,28 @@
+{
+  "$id": "https://akenza.io/elsys/ers-sound/sound.schema.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "processingType": "uplink_decoder",
+  "topic": "sound",
+  "title": "Sound",
+  "properties": {
+    "soundPeak": {
+      "$ref": "https://raw.githubusercontent.com/akenza-io/device-type-library/main/data-models/environment/schema.json#/$defs/soundLevel/dba",
+      "title": "Sound Peak",
+      "description": "Peak value in dBspl",
+      "minimum": 20,
+      "maximum": 120
+    },
+    "soundAvg": {
+      "$ref": "https://raw.githubusercontent.com/akenza-io/device-type-library/main/data-models/environment/schema.json#/$defs/soundLevel/dba",
+      "title": "Sound Average",
+      "description": "Average value in dBspl",
+      "minimum": 20,
+      "maximum": 120
+    }
+  },
+  "required": [
+    "soundPeak",
+    "soundAvg"
+  ]
+}
diff --git a/types/elsys/ers-sound/uplink.js b/types/elsys/ers-sound/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers-sound/uplink.spec.js b/types/elsys/ers-sound/uplink.spec.js
@@ -6,13 +6,13 @@ const utils = require("test-utils");
 const { assert } = chai;
 
 describe("Elsys Sound uplink", () => {
-  let noiseSchema = null;
+  let soundSchema = null;
   let consume = null;
   before((done) => {
     const script = rewire("./uplink.js");
     consume = utils.init(script);
-    utils.loadSchema(`${__dirname}/noise.schema.json`).then((parsedSchema) => {
-      noiseSchema = parsedSchema;
+    utils.loadSchema(`${__dirname}/sound.schema.json`).then((parsedSchema) => {
+      soundSchema = parsedSchema;
       done();
     });
   });
@@ -76,11 +76,11 @@ describe("Elsys Sound uplink", () => {
         assert.isNotNull(value);
         assert.typeOf(value.data, "object");
 
-        assert.equal(value.topic, "noise");
+        assert.equal(value.topic, "sound");
         assert.equal(value.data.soundPeak, 64);
         assert.equal(value.data.soundAvg, 44);
 
-        utils.validateSchema(value.data, noiseSchema, { throwError: true });
+        utils.validateSchema(value.data, soundSchema, { throwError: true });
       });
 
       consume(data);
diff --git a/types/elsys/ers-voc/uplink.js b/types/elsys/ers-voc/uplink.js
@@ -482,7 +482,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ers/uplink.js b/types/elsys/ers/uplink.js
@@ -476,7 +476,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/elsys/ethd10/uplink.js b/types/elsys/ethd10/uplink.js
@@ -482,7 +482,7 @@ function consume(event) {
     }
 
     if (deleteUnusedKeys(noise)) {
-      emit("sample", { data: noise, topic: "noise" });
+      emit("sample", { data: noise, topic: "sound" });
     }
   } else if (payload[0] === SETTINGS_HEADER) {
     const res = DecodeElsysSettings(payload);
diff --git a/types/internal/deviceSimulator/default.schema.json b/types/internal/deviceSimulator/default.schema.json
@@ -15,11 +15,10 @@
     "co2": {
       "$ref": "https://raw.githubusercontent.com/akenza-io/device-type-library/main/data-models/environment/schema.json#/$defs/co2/ppm"
     },
-    "noise": {
-      "title": "Noise",
-      "unit": "dBA",
+    "sound": {
+      "$ref": "https://raw.githubusercontent.com/akenza-io/device-type-library/main/data-models/environment/schema.json#/$defs/soundLevel/dba",
+      "title": "Sound",
       "description": "Average value of the sound pressure level in decibel",
-      "type": "number",
       "minimum": 20,
       "maximum": 120
     },
@@ -42,4 +41,4 @@
     "illuminance",
     "occupied"
   ]
-}
+}
diff --git a/types/internal/deviceSimulator/meta.json b/types/internal/deviceSimulator/meta.json
@@ -10,11 +10,13 @@
     "Temperature",
     "Humidity",
     "CO2",
-    "Noise",
+    "Sound",
     "Light",
     "Occupancy"
   ],
-  "outputTopics": ["default"],
+  "outputTopics": [
+    "default"
+  ],
   "encoding": "JSON",
   "connectivity": "HTTP"
-}
+}
diff --git a/types/milesight/WS302/meta.json b/types/milesight/WS302/meta.json
@@ -7,8 +7,13 @@
   "author": "Akenza AG",
   "firmwareVersion": "V1.0.0",
   "loraDeviceClass": "A",
-  "availableSensors": ["Noise"],
-  "outputTopics": ["default", "lifecycle"],
+  "availableSensors": [
+    "Sound"
+  ],
+  "outputTopics": [
+    "default",
+    "lifecycle"
+  ],
   "encoding": "HEX",
   "connectivity": "LORA"
-}
+}
diff --git a/types/yanzi/comfort/meta.json b/types/yanzi/comfort/meta.json
@@ -11,7 +11,7 @@
     "Temperature",
     "Humidity",
     "Pressure",
-    "Noise",
+    "Sound",
     "CO2"
   ],
   "outputTopics": [
@@ -24,4 +24,4 @@
   ],
   "encoding": "JSON",
   "connectivity": "HTTP"
-}
+}
diff --git a/types/yanzi/comfort/sound.schema.json b/types/yanzi/comfort/sound.schema.json

Original file line number	Diff line number	Diff line change
`@@ -165,4 +165,4 @@`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`}`
`168`		`-}`
	`168`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ function consume(event) {`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`if (deleteUnusedKeys(noise)) {`
`485`		`- emit("sample", { data: noise, topic: "noise" });`
	`485`	`+ emit("sample", { data: noise, topic: "sound" });`
`486`	`486`	`}`
`487`	`487`	`} else if (payload[0] === SETTINGS_HEADER) {`
`488`	`488`	`const res = DecodeElsysSettings(payload);`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ function consume(event) {`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`if (deleteUnusedKeys(noise)) {`
`562`		`- emit("sample", { data: noise, topic: "noise" });`
	`562`	`+ emit("sample", { data: noise, topic: "sound" });`
`563`	`563`	`}`
`564`	`564`	`} else if (payload[0] === SETTINGS_HEADER) {`
`565`	`565`	`const res = DecodeElsysSettings(payload);`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ function consume(event) {`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`if (deleteUnusedKeys(noise)) {`
`514`		`- emit("sample", { data: noise, topic: "noise" });`
	`514`	`+ emit("sample", { data: noise, topic: "sound" });`
`515`	`515`	`}`
`516`	`516`	`} else if (payload[0] === SETTINGS_HEADER) {`
`517`	`517`	`const res = DecodeElsysSettings(payload);`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ function consume(event) {`
`478`	`478`	`}`
`479`	`479`
`480`	`480`	`if (deleteUnusedKeys(noise)) {`
`481`		`- emit("sample", { data: noise, topic: "noise" });`
	`481`	`+ emit("sample", { data: noise, topic: "sound" });`
`482`	`482`	`}`
`483`	`483`	`} else if (payload[0] === SETTINGS_HEADER) {`
`484`	`484`	`const res = DecodeElsysSettings(payload);`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ function consume(event) {`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`if (deleteUnusedKeys(noise)) {`
`519`		`- emit("sample", { data: noise, topic: "noise" });`
	`519`	`+ emit("sample", { data: noise, topic: "sound" });`
`520`	`520`	`}`
`521`	`521`	`} else if (payload[0] === SETTINGS_HEADER) {`
`522`	`522`	`const res = DecodeElsysSettings(payload);`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ function consume(event) {`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`if (deleteUnusedKeys(noise)) {`
`479`		`- emit("sample", { data: noise, topic: "noise" });`
	`479`	`+ emit("sample", { data: noise, topic: "sound" });`
`480`	`480`	`}`
`481`	`481`	`} else if (payload[0] === SETTINGS_HEADER) {`
`482`	`482`	`const res = DecodeElsysSettings(payload);`