diff --git a/VENDORS/Milesight/AM308/ChirpStack/uplink/converter.json b/VENDORS/Milesight/AM308/ChirpStack/uplink/converter.json
index 234498b..3a70bdc 100644
--- a/VENDORS/Milesight/AM308/ChirpStack/uplink/converter.json
+++ b/VENDORS/Milesight/AM308/ChirpStack/uplink/converter.json
@@ -5,7 +5,7 @@
   "configuration": {
     "scriptLang": "TBEL",
     "decoder": null,
-    "tbelDecoder": "var data = decodeToJson(payload);\nvar deviceName = \"AM308 \" + data.deviceInfo.deviceName;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":                      {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodePayload(input) {\n    var output = {\n        attributes: {},\n        telemetry: []\n    };\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2;) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if (channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i];\n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i,\n                2, false) / 10;\n            i += 2;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            // i +=2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = input[i] / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" :\n                \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xCB) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7D) {\n            decoded.co2 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7D) {\n            decoded.tvoc = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2,\n                false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0A && channel_type === 0x7D) {\n            decoded.hcho = parseBytesToInt(input, i, 2,\n                false) / 100;\n            i += 2;\n        }\n        // PM2.5\n        if (channel_id === 0x0B && channel_type === 0x7D) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // PM10\n        if (channel_id === 0x0C && channel_type === 0x7D) {\n            decoded.pm10 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0D && channel_type === 0x7D) {\n            decoded.o3 = parseBytesToInt(input, i, 2,\n                false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0E && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA (AM308)\n        if (channel_id === 0x20 && channel_type === 0xCE) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n\n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n    \n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.time;\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Passing incoming bytes to decodePayload function, to get custom decoding\nvar customDecoding = decodePayload(base64ToBytes(data\n.data));\n\n\nattributes.eui = data.deviceInfo.devEui;\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nattributes.eui = data.deviceInfo.?devEui;\nattributes.devAddr = data.devAddr;\nattributes.fPort = data.fPort;\nattributes.applicationId = data.deviceInfo.?applicationId;\nattributes.applicationName = data.deviceInfo.?applicationName;\nattributes.tenantId = data.deviceInfo.?tenantId;\nattributes.tenantName = data.deviceInfo.?tenantName;\nattributes.deviceProfileId = data.deviceInfo.?deviceProfileId;\nattributes.deviceProfileName = data.deviceInfo.?deviceProfileName;\nattributes.frequency = data.txInfo.?frequency;\nattributes.bandwidth = data.txInfo.?modulation.?lora.?bandwidth;\nattributes.spreadingFactor = data.txInfo.?modulation.?lora.?spreadingFactor;\nattributes.codeRate = data.txInfo.?modulation.?lora.?codeRate;\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel;\naddDataToTelemetry.rfChain = gatewayInfo.rfChain;\naddDataToTelemetry.fCnt = data.fCnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n    //  assetName: assetName,\n    //  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf(\n                '.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf(\n                '+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf(\n                    'Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf(\n                    '-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex +\n                    3) {\n                    dateString = dateString.substring(0,\n                        secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0,\n                        secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex,\n                        dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n    // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.rxInfo;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
+    "tbelDecoder": "var data = decodeToJson(payload);\nvar deviceName = \"AM308 \" + data.deviceInfo.deviceName;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":                      {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodePayload(input) {\n    var output = {\n        attributes: {},\n        telemetry: []\n    };\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2;) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if (channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i];\n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i,\n                2, false) / 10;\n            i += 2;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            // i +=2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = parseBytesToInt(input, i, 1, false) / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" :\n                \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xCB) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7D) {\n            decoded.co2 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7D) {\n            decoded.tvoc = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2,\n                false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0A && channel_type === 0x7D) {\n            decoded.hcho = parseBytesToInt(input, i, 2,\n                false) / 100;\n            i += 2;\n        }\n        // PM2.5\n        if (channel_id === 0x0B && channel_type === 0x7D) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // PM10\n        if (channel_id === 0x0C && channel_type === 0x7D) {\n            decoded.pm10 = parseBytesToInt(input, i, 2,\n                false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0D && channel_type === 0x7D) {\n            decoded.o3 = parseBytesToInt(input, i, 2,\n                false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0E && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA (AM308)\n        if (channel_id === 0x20 && channel_type === 0xCE) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n\n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n    \n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.time;\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Passing incoming bytes to decodePayload function, to get custom decoding\nvar customDecoding = decodePayload(base64ToBytes(data\n.data));\n\n\nattributes.eui = data.deviceInfo.devEui;\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nattributes.eui = data.deviceInfo.?devEui;\nattributes.devAddr = data.devAddr;\nattributes.fPort = data.fPort;\nattributes.applicationId = data.deviceInfo.?applicationId;\nattributes.applicationName = data.deviceInfo.?applicationName;\nattributes.tenantId = data.deviceInfo.?tenantId;\nattributes.tenantName = data.deviceInfo.?tenantName;\nattributes.deviceProfileId = data.deviceInfo.?deviceProfileId;\nattributes.deviceProfileName = data.deviceInfo.?deviceProfileName;\nattributes.frequency = data.txInfo.?frequency;\nattributes.bandwidth = data.txInfo.?modulation.?lora.?bandwidth;\nattributes.spreadingFactor = data.txInfo.?modulation.?lora.?spreadingFactor;\nattributes.codeRate = data.txInfo.?modulation.?lora.?codeRate;\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel;\naddDataToTelemetry.rfChain = gatewayInfo.rfChain;\naddDataToTelemetry.fCnt = data.fCnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n    //  assetName: assetName,\n    //  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf(\n                '.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf(\n                '+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf(\n                    'Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf(\n                    '-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex +\n                    3) {\n                    dateString = dateString.substring(0,\n                        secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0,\n                        secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex,\n                        dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n    // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.rxInfo;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
     "encoder": null,
     "tbelEncoder": null,
     "updateOnlyKeys": [
diff --git a/VENDORS/Milesight/AM308/ChirpStack/uplink/result_1.json b/VENDORS/Milesight/AM308/ChirpStack/uplink/result_1.json
index 64a99d7..fb828cd 100644
--- a/VENDORS/Milesight/AM308/ChirpStack/uplink/result_1.json
+++ b/VENDORS/Milesight/AM308/ChirpStack/uplink/result_1.json
@@ -21,7 +21,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/ChirpStack/uplink/result_2.json b/VENDORS/Milesight/AM308/ChirpStack/uplink/result_2.json
index 0d567b0..07ab8e3 100644
--- a/VENDORS/Milesight/AM308/ChirpStack/uplink/result_2.json
+++ b/VENDORS/Milesight/AM308/ChirpStack/uplink/result_2.json
@@ -21,7 +21,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/Loriot/uplink/converter.json b/VENDORS/Milesight/AM308/Loriot/uplink/converter.json
index a64b8fe..ffc5589 100644
--- a/VENDORS/Milesight/AM308/Loriot/uplink/converter.json
+++ b/VENDORS/Milesight/AM308/Loriot/uplink/converter.json
@@ -5,7 +5,7 @@
   "configuration": {
     "scriptLang": "TBEL",
     "decoder": "// Decode an uplink message from a buffer\n// payload - array of bytes\n// metadata - key/value object\n\n/** Decoder **/\n\n// decode payload to string\nvar payloadStr = decodeToString(payload);\n\n// decode payload to JSON\n// var data = decodeToJson(payload);\n\nvar deviceName = 'Device A';\nvar deviceType = 'thermostat';\nvar customerName = 'Customer C';\nvar groupName = 'thermostat devices';\nvar manufacturer = 'Example corporation';\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// Result object with device/asset attributes/telemetry data\nvar result = {\n// Use deviceName and deviceType or assetName and assetType, but not both.\n   deviceName: deviceName,\n   deviceType: deviceType,\n// assetName: assetName,\n// assetType: assetType,\n// customerName: customerName,\n   groupName: groupName,\n   attributes: {\n       model: 'Model A',\n       serialNumber: 'SN111',\n       integrationName: metadata['integrationName'],\n       manufacturer: manufacturer\n   },\n   telemetry: {\n       temperature: 42,\n       humidity: 80,\n       rawData: payloadStr\n   }\n};\n\n/** Helper functions **/\n\nfunction decodeToString(payload) {\n   return String.fromCharCode.apply(String, payload);\n}\n\nfunction decodeToJson(payload) {\n   // covert payload to string.\n   var str = decodeToString(payload);\n\n   // parse string to JSON\n   var data = JSON.parse(str);\n   return data;\n}\n\nreturn result;",
-    "tbelDecoder": "var data = decodeToJson(payload);\nvar deviceName = \"AM308 \" + data.EUI;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": {\"telemetryKey\": \"telemetryValue\"}\n//  }\n\nfunction decodePayload(input) {\n    var output = { attributes: {}, telemetry: []};\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if(channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i]; \n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            i += 2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = input[i] / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2_5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        else if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA\n        if (channel_id === 0x20 && channel_type === 0xce) {\n           var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n\n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\ntimestamp = data.ts;\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found.\n\nvar uplinkDataList = [];\n\n// Passing incoming bytes to decodePayload function, to get custom decoding\nvar customDecoding = decodePayload(hexToBytes(data.data));\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nattributes.eui = data.EUI;\nattributes.fPort = data.port;\nattributes.frequency = data.freq;\n\nvar addDataToTelemetry = {};\naddDataToTelemetry.rssi = data.rssi;\naddDataToTelemetry.seqno = data.seqno;\naddDataToTelemetry.snr = data.snr;\naddDataToTelemetry.ack = data.ack;\naddDataToTelemetry.toa = data.toa;\naddDataToTelemetry.fCnt = data.fcnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar deviceInfo = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n//  assetName: assetName,\n//  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry, \n};\n\naddAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName);\n\nuplinkDataList.add(deviceInfo);\n\nvar includeGatewayInfo = [\"ts\", \"gweui\", \"rssi\"];\n\nvar gatewayDeviceNamePrefix = \"Gateway \";\nvar gatewayDeviceType = \"Lora gateway\";\nvar gatewayGroupName = null; // If gatewayGroupName is not null - created device will be added to the entity group with such name.\n\nif (data.cmd == \"gw\") {\n    foreach( gatewayInfo : data.gws ) {\n        var gatewayInfoMsg = {\n            deviceName: gatewayDeviceNamePrefix + gatewayInfo.gweui,\n            deviceType: gatewayDeviceType,\n            telemetry: [{\n                \"ts\": parseDateToTimestamp(gatewayInfo.ts),\n                \"values\": getDataList(gatewayInfo, includeGatewayInfo)\n            }],\n            attributes: {\n                eui: gatewayInfo.gweui\n            }\n        };\n        addAdditionalInfoForDeviceMsg(gatewayInfoMsg, customerName, gatewayGroupName);\n        uplinkDataList.add(gatewayInfoMsg);\n    }\n}\n\nreturn uplinkDataList;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = -1;\n    if (dateString != null) {\n        \n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            \n            timestamp = new Date(dateString).getTime();\n        }\n    }\n    // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
+    "tbelDecoder": "var data = decodeToJson(payload);\nvar deviceName = \"AM308 \" + data.EUI;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": {\"telemetryKey\": \"telemetryValue\"}\n//  }\n\nfunction decodePayload(input) {\n    var output = { attributes: {}, telemetry: []};\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if(channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i]; \n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            i += 2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = parseBytesToInt(input, i, 1, false) / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2_5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        else if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA\n        if (channel_id === 0x20 && channel_type === 0xce) {\n           var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n\n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\ntimestamp = data.ts;\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found.\n\nvar uplinkDataList = [];\n\n// Passing incoming bytes to decodePayload function, to get custom decoding\nvar customDecoding = decodePayload(hexToBytes(data.data));\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nattributes.eui = data.EUI;\nattributes.fPort = data.port;\nattributes.frequency = data.freq;\n\nvar addDataToTelemetry = {};\naddDataToTelemetry.rssi = data.rssi;\naddDataToTelemetry.seqno = data.seqno;\naddDataToTelemetry.snr = data.snr;\naddDataToTelemetry.ack = data.ack;\naddDataToTelemetry.toa = data.toa;\naddDataToTelemetry.fCnt = data.fcnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar deviceInfo = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n//  assetName: assetName,\n//  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry, \n};\n\naddAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName);\n\nuplinkDataList.add(deviceInfo);\n\nvar includeGatewayInfo = [\"ts\", \"gweui\", \"rssi\"];\n\nvar gatewayDeviceNamePrefix = \"Gateway \";\nvar gatewayDeviceType = \"Lora gateway\";\nvar gatewayGroupName = null; // If gatewayGroupName is not null - created device will be added to the entity group with such name.\n\nif (data.cmd == \"gw\") {\n    foreach( gatewayInfo : data.gws ) {\n        var gatewayInfoMsg = {\n            deviceName: gatewayDeviceNamePrefix + gatewayInfo.gweui,\n            deviceType: gatewayDeviceType,\n            telemetry: [{\n                \"ts\": parseDateToTimestamp(gatewayInfo.ts),\n                \"values\": getDataList(gatewayInfo, includeGatewayInfo)\n            }],\n            attributes: {\n                eui: gatewayInfo.gweui\n            }\n        };\n        addAdditionalInfoForDeviceMsg(gatewayInfoMsg, customerName, gatewayGroupName);\n        uplinkDataList.add(gatewayInfoMsg);\n    }\n}\n\nreturn uplinkDataList;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = -1;\n    if (dateString != null) {\n        \n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            \n            timestamp = new Date(dateString).getTime();\n        }\n    }\n    // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
     "encoder": null,
     "tbelEncoder": null,
     "updateOnlyKeys": [
diff --git a/VENDORS/Milesight/AM308/Loriot/uplink/result_1.json b/VENDORS/Milesight/AM308/Loriot/uplink/result_1.json
index c8b70ca..e2a0a83 100644
--- a/VENDORS/Milesight/AM308/Loriot/uplink/result_1.json
+++ b/VENDORS/Milesight/AM308/Loriot/uplink/result_1.json
@@ -11,7 +11,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/Loriot/uplink/result_2.json b/VENDORS/Milesight/AM308/Loriot/uplink/result_2.json
index 182bc72..12bb6c4 100644
--- a/VENDORS/Milesight/AM308/Loriot/uplink/result_2.json
+++ b/VENDORS/Milesight/AM308/Loriot/uplink/result_2.json
@@ -11,7 +11,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/converter.json b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/converter.json
index beae680..7ae06da 100644
--- a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/converter.json
+++ b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/converter.json
@@ -5,7 +5,7 @@
   "configuration": {
     "scriptLang": "TBEL",
     "decoder": null,
-    "tbelDecoder": "var data = decodeToJson(payload);\n\nvar deviceName = \"AM308 \" + data.end_device_ids.device_id;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":              {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodeFrmPayload(input) {\n    var output = {\n        attributes: {}, telemetry: {}\n    };\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if (channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i];\n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            // i +=2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = input[i] / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2.5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n\n        }\n        \n        // HISTORY DATA\n        if (channel_id === 0x20  && channel_type === 0xce) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n    \n    // --- Decoding code --- //\n    return output;\n}\n\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.uplink_message.received_at;\n// If data is simulated or device doesn't send his own date string - we will use date from upcoming message, set by network server\nif ((data.simulated != null && data.simulated) || dateString == null) {\n    dateString = data.received_at;\n}\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found, e.g. receive_at from uplink_message will be written receive_at in the root.\n\n// Passing incoming bytes to decodeFrmPayload function, to get custom decoding\nvar customDecoding = {};\nif (data.uplink_message.get(\"frm_payload\") != null) {\n    customDecoding = decodeFrmPayload(base64ToBytes(data.uplink_message.frm_payload));\n}\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nvar applicationId = data.end_device_ids.?application_ids.?application_id;\nvar devAddr = data.end_device_ids.?dev_addr;\nvar spreadingFactor = data.uplink_message.?settings.?data_rate.?lora.?spreading_factor;\nvar codeRate = data.uplink_message.?settings.?data_rate.?lora.?coding_rate;\nvar tenantId = data.uplink_message.?network_ids.?tenant_id;\nattributes.eui = data.end_device_ids.dev_eui;\nattributes.fPort = data.uplink_message.f_port;\nattributes.applicationId = applicationId;\nattributes.devAddr = devAddr;\nattributes.spreadingFactor = spreadingFactor;\nattributes.codeRate = codeRate;\nattributes.tenantId = tenantId;\nattributes.device_id = data.end_device_ids.?device_id;\nattributes.join_eui = data.end_device_ids.?join_eui;\nattributes.net_id = data.uplink_message.?network_ids.?net_id;\nattributes.cluster_id = data.uplink_message.?network_ids.?cluster_id;\nattributes.cluster_adress = data.uplink_message.?network_ids.?cluster_address;\nattributes.bandwidth = data.uplink_message.?settings.?data_rate.?lora.?bandwidth;\nattributes.frequency = data.uplink_message.?settings.?frequency;\n\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel_index;\naddDataToTelemetry.consumed_airtime = data.uplink_message.?consumed_airtime;\naddDataToTelemetry.fCnt = data.uplink_message.?f_cnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n//  assetName: assetName,\n//  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = new Date(dateString).getTime();\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n        // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.uplink_message.?rx_metadata;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
+    "tbelDecoder": "var data = decodeToJson(payload);\n\nvar deviceName = \"AM308 \" + data.end_device_ids.device_id;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":              {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodeFrmPayload(input) {\n    var output = {\n        attributes: {}, telemetry: {}\n    };\n    \n    // --- Decoding code --- //\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if (channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i];\n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            // i +=2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = parseBytesToInt(input, i, 1, false) / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2.5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n\n        }\n        \n        // HISTORY DATA\n        if (channel_id === 0x20  && channel_type === 0xce) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n    \n    // --- Decoding code --- //\n    return output;\n}\n\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.uplink_message.received_at;\n// If data is simulated or device doesn't send his own date string - we will use date from upcoming message, set by network server\nif ((data.simulated != null && data.simulated) || dateString == null) {\n    dateString = data.received_at;\n}\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found, e.g. receive_at from uplink_message will be written receive_at in the root.\n\n// Passing incoming bytes to decodeFrmPayload function, to get custom decoding\nvar customDecoding = {};\nif (data.uplink_message.get(\"frm_payload\") != null) {\n    customDecoding = decodeFrmPayload(base64ToBytes(data.uplink_message.frm_payload));\n}\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nvar applicationId = data.end_device_ids.?application_ids.?application_id;\nvar devAddr = data.end_device_ids.?dev_addr;\nvar spreadingFactor = data.uplink_message.?settings.?data_rate.?lora.?spreading_factor;\nvar codeRate = data.uplink_message.?settings.?data_rate.?lora.?coding_rate;\nvar tenantId = data.uplink_message.?network_ids.?tenant_id;\nattributes.eui = data.end_device_ids.dev_eui;\nattributes.fPort = data.uplink_message.f_port;\nattributes.applicationId = applicationId;\nattributes.devAddr = devAddr;\nattributes.spreadingFactor = spreadingFactor;\nattributes.codeRate = codeRate;\nattributes.tenantId = tenantId;\nattributes.device_id = data.end_device_ids.?device_id;\nattributes.join_eui = data.end_device_ids.?join_eui;\nattributes.net_id = data.uplink_message.?network_ids.?net_id;\nattributes.cluster_id = data.uplink_message.?network_ids.?cluster_id;\nattributes.cluster_adress = data.uplink_message.?network_ids.?cluster_address;\nattributes.bandwidth = data.uplink_message.?settings.?data_rate.?lora.?bandwidth;\nattributes.frequency = data.uplink_message.?settings.?frequency;\n\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel_index;\naddDataToTelemetry.consumed_airtime = data.uplink_message.?consumed_airtime;\naddDataToTelemetry.fCnt = data.uplink_message.?f_cnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n//  assetName: assetName,\n//  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = new Date(dateString).getTime();\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n        // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.uplink_message.?rx_metadata;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
     "encoder": null,
     "tbelEncoder": null,
     "updateOnlyKeys": [
diff --git a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_1.json b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_1.json
index 25e53c8..c64c305 100644
--- a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_1.json
+++ b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_1.json
@@ -22,7 +22,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_2.json b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_2.json
index 4646023..d7bc224 100644
--- a/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_2.json
+++ b/VENDORS/Milesight/AM308/ThingsStackCommunity/uplink/result_2.json
@@ -22,7 +22,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/converter.json b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/converter.json
index 7c8b407..592c47a 100644
--- a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/converter.json
+++ b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/converter.json
@@ -5,7 +5,7 @@
   "configuration": {
     "scriptLang": "TBEL",
     "decoder": null,
-    "tbelDecoder": "var data = decodeToJson(payload);\n\nvar deviceName = \"AM308 \" + data.end_device_ids.device_id;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":                      {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodeFrmPayload(input) {\n    var output = { attributes: {}, telemetry: []};\n    \n    // --- Timestamp parsing\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if(channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i]; \n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            i += 2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = input[i] / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2_5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        else if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA (AM308)\n        if (channel_id === 0x20 && channel_type === 0xce) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n\n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.uplink_message.received_at;\n\nif ((data.simulated != null && data.simulated) || dateString == null) {\n    dateString = data.received_at;\n}\n\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found, e.g. receive_at from uplink_message will be written receive_at in the root.\n\n// Passing incoming bytes to decodeFrmPayload function, to get custom decoding\nvar customDecoding = {};\nif (data.uplink_message.get(\"frm_payload\") != null) {\n    customDecoding = decodeFrmPayload(base64ToBytes(data.uplink_message.frm_payload));\n}\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nvar applicationId = data.end_device_ids.?application_ids.?application_id;\nvar devAddr = data.end_device_ids.?dev_addr;\nvar spreadingFactor = data.uplink_message.?settings.?data_rate.?lora.?spreading_factor;\nvar codeRate = data.uplink_message.?settings.?data_rate.?lora.?coding_rate;\nvar tenantId = data.uplink_message.?network_ids.?tenant_id;\nattributes.eui = data.end_device_ids.dev_eui;\nattributes.fPort = data.uplink_message.f_port;\nattributes.applicationId = applicationId;\nattributes.devAddr = devAddr;\nattributes.spreadingFactor = spreadingFactor;\nattributes.codeRate = codeRate;\nattributes.tenantId = tenantId;\nattributes.device_id = data.end_device_ids.?device_id;\nattributes.join_eui = data.end_device_ids.?join_eui;\nattributes.net_id = data.uplink_message.?network_ids.?net_id;\nattributes.cluster_id = data.uplink_message.?network_ids.?cluster_id;\nattributes.cluster_adress = data.uplink_message.?network_ids.?cluster_address;\nattributes.bandwidth = data.uplink_message.?settings.?data_rate.?lora.?bandwidth;\nattributes.frequency = data.uplink_message.?settings.?frequency;\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel_index;\naddDataToTelemetry.consumed_airtime = data.uplink_message.?consumed_airtime;\naddDataToTelemetry.fCnt = data.uplink_message.?f_cnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n    //  assetName: assetName,\n    //  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = new Date(dateString).getTime();\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n        // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.uplink_message.?rx_metadata;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
+    "tbelDecoder": "var data = decodeToJson(payload);\n\nvar deviceName = \"AM308 \" + data.end_device_ids.device_id;\nvar deviceType = \"AM308\";\nvar groupName = null; // If groupName is not null - created device will be added to the entity group with such name.\nvar customerName = null; // If customerName is not null - created devices will be assigned to customer with such name. \n\n// use assetName and assetType instead of deviceName and deviceType\n// to automatically create assets instead of devices.\n// var assetName = 'Asset A';\n// var assetType = 'building';\n\n// If you want to parse incoming data somehow, you can add your code to this function.\n// input: bytes\n// expected output:\n//  {\n//    \"attributes\": {\"attributeKey\": \"attributeValue\"},\n//    \"telemetry\": [{\"ts\": 1...1, \"values\": {\"telemetryKey\":\"telemetryValue\"}, {\"ts\": 1...2, \"values\":                      {\"telemetryKey\":\"telemetryValue\"}}]\n//  }\n\nfunction decodeFrmPayload(input) {\n    var output = { attributes: {}, telemetry: []};\n    \n    // --- Timestamp parsing\n    var decoded = {};\n    var historyData = {};\n    for (var i = 0; i < input.length - 2; ) {\n        var channel_id = input[i++] & 0xff;\n        var channel_type = input[i++] & 0xff;\n        // BATTERY\n        if(channel_id === 0x01 && channel_type === 0x75) {\n            decoded.battery = input[i]; \n            i += 1;\n        }\n        // TEMPERATURE\n        if (channel_id === 0x03 && channel_type === 0x67) {\n            // ℃\n            decoded.temperature = parseBytesToInt(input, i, 2, false) / 10;\n            // ℉\n            // decoded.temperature = parseBytesToInt(input, i, 2, false) / 10 * 1.8 + 32;\n            i += 2;\n        }\n        // HUMIDITY\n        if (channel_id === 0x04 && channel_type === 0x68) {\n            decoded.humidity = parseBytesToInt(input, i, 1, false) / 2;\n            i += 1;\n        }\n        // PIR\n        if (channel_id === 0x05 && channel_type === 0x00) {\n            decoded.pir = input[i] === 1 ? \"trigger\" : \"idle\";\n            i += 1;\n        }\n        // LIGHT\n        if (channel_id === 0x06 && channel_type === 0xcb) {\n            decoded.light_level = input[i];\n            i += 1;\n        }\n        // CO2\n        if (channel_id === 0x07 && channel_type === 0x7d) {\n            decoded.co2 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // TVOC\n        if (channel_id === 0x08 && channel_type === 0x7d) {\n            decoded.tvoc = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PRESSURE\n        if (channel_id === 0x09 && channel_type === 0x73) {\n            decoded.pressure = parseBytesToInt(input, i, 2, false) / 10;\n            i += 2;\n        }\n        // HCHO\n        if (channel_id === 0x0a && channel_type === 0x7d) {\n            decoded.hcho = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // PM2_5\n        if (channel_id === 0x0b && channel_type === 0x7d) {\n            decoded.pm2_5 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // PM10\n        else if (channel_id === 0x0c && channel_type === 0x7d) {\n            decoded.pm10 = parseBytesToInt(input, i, 2, false);\n            i += 2;\n        }\n        // O3\n        if (channel_id === 0x0d && channel_type === 0x7d) {\n            decoded.o3 = parseBytesToInt(input, i, 2, false) / 100;\n            i += 2;\n        }\n        // BEEP\n        if (channel_id === 0x0e && channel_type === 0x01) {\n            decoded.beep = input[i] === 1 ? \"yes\" : \"no\";\n            i += 1;\n        }\n        // HISTORY DATA (AM308)\n        if (channel_id === 0x20 && channel_type === 0xce) {\n            var historyData = {\n                ts: parseBytesToInt(input, i, 4, false),\n                values: {\n                    temperature: parseBytesToInt(input, i + 4, 2, false) / 10,\n                    humidity: parseBytesToInt(input, i + 6, 2, false) / 2,\n                    pir: input[i + 8] === 1 ? \"trigger\" : \"idle\",\n                    light_level: input[i + 9],\n                    co2: parseBytesToInt(input, i + 10, 2, false),\n                    tvoc: parseBytesToInt(input, i + 12, 2, false),\n                    pressure: parseBytesToInt(input, i + 14, 2, false) / 10,\n                    pm2_5: parseBytesToInt(input, i + 16, 2, false),\n                    pm10: parseBytesToInt(input, i + 18, 2, false)\n                }\n            };\n            \n            i += 20;\n        }\n    }\n    \n    output.telemetry = [{\n        ts: timestamp,\n        values: decoded\n    }, historyData];\n\n    // --- Decoding code --- //\n    return output;\n}\n\n// --- attributes and telemetry objects ---\nvar telemetry = [];\nvar attributes = {};\n// --- attributes and telemetry objects ---\n\n// --- Timestamp parsing\nvar dateString = data.uplink_message.received_at;\n\nif ((data.simulated != null && data.simulated) || dateString == null) {\n    dateString = data.received_at;\n}\n\ntimestamp = parseDateToTimestamp(dateString);\n// --- Timestamp parsing\n\n// Message parsing\n// To avoid paths in the decoded objects we passing false value to function as \"pathInKey\" argument.\n// Warning: pathInKey can cause already found fields to be overwritten with the last value found, e.g. receive_at from uplink_message will be written receive_at in the root.\n\n// Passing incoming bytes to decodeFrmPayload function, to get custom decoding\nvar customDecoding = {};\nif (data.uplink_message.get(\"frm_payload\") != null) {\n    customDecoding = decodeFrmPayload(base64ToBytes(data.uplink_message.frm_payload));\n}\n\n// Collecting data to result\nif (customDecoding.?telemetry.size() > 0) {\n    if (customDecoding.telemetry instanceof java.util.ArrayList) {\n        foreach(telemetryObj: customDecoding.telemetry) {\n            if (telemetryObj.ts != null && telemetryObj.values != null) {\n                telemetry.add(telemetryObj);\n            }\n        }\n    } else {\n        telemetry.putAll(customDecoding.telemetry);\n    }\n}\n\nif (customDecoding.?attributes.size() > 0) {\n    attributes.putAll(customDecoding.attributes);\n}\n\n// You can add some keys manually to attributes or telemetry\nvar applicationId = data.end_device_ids.?application_ids.?application_id;\nvar devAddr = data.end_device_ids.?dev_addr;\nvar spreadingFactor = data.uplink_message.?settings.?data_rate.?lora.?spreading_factor;\nvar codeRate = data.uplink_message.?settings.?data_rate.?lora.?coding_rate;\nvar tenantId = data.uplink_message.?network_ids.?tenant_id;\nattributes.eui = data.end_device_ids.dev_eui;\nattributes.fPort = data.uplink_message.f_port;\nattributes.applicationId = applicationId;\nattributes.devAddr = devAddr;\nattributes.spreadingFactor = spreadingFactor;\nattributes.codeRate = codeRate;\nattributes.tenantId = tenantId;\nattributes.device_id = data.end_device_ids.?device_id;\nattributes.join_eui = data.end_device_ids.?join_eui;\nattributes.net_id = data.uplink_message.?network_ids.?net_id;\nattributes.cluster_id = data.uplink_message.?network_ids.?cluster_id;\nattributes.cluster_adress = data.uplink_message.?network_ids.?cluster_address;\nattributes.bandwidth = data.uplink_message.?settings.?data_rate.?lora.?bandwidth;\nattributes.frequency = data.uplink_message.?settings.?frequency;\n\nvar gatewayInfo = getGatewayInfo();\nvar addDataToTelemetry = {};\naddDataToTelemetry.snr = gatewayInfo.snr;\naddDataToTelemetry.rssi = gatewayInfo.rssi;\naddDataToTelemetry.channel = gatewayInfo.channel_index;\naddDataToTelemetry.consumed_airtime = data.uplink_message.?consumed_airtime;\naddDataToTelemetry.fCnt = data.uplink_message.?f_cnt;\n\nvar isIncludeGatewayInfo = metadata[\"includeGatewayInfo\"];\nif(isIncludeGatewayInfo == true) {\n   telemetry = processTelemetryData(telemetry, addDataToTelemetry);\n}\n\nvar result = {\n    deviceName: deviceName,\n    deviceType: deviceType,\n    //  assetName: assetName,\n    //  assetType: assetType,\n    attributes: attributes,\n    telemetry: telemetry\n};\n\naddAdditionalInfoForDeviceMsg(result, customerName, groupName);\n\nreturn result;\n\nfunction addAdditionalInfoForDeviceMsg(deviceInfo, customerName, groupName) {\n    if (customerName != null) {\n        deviceInfo.customerName = customerName;\n    }\n    if (groupName != null) {\n        deviceInfo.groupName = groupName;\n    }\n}\n\nfunction parseDateToTimestamp(dateString) {\n    var timestamp = new Date(dateString).getTime();\n    var timestamp = -1;\n    if (dateString != null) {\n        timestamp = new Date(dateString).getTime();\n        if (timestamp == -1) {\n            var secondsSeparatorIndex = dateString.lastIndexOf('.') + 1;\n            var millisecondsEndIndex = dateString.lastIndexOf('+');\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('Z');\n            }\n            if (millisecondsEndIndex == -1) {\n                millisecondsEndIndex = dateString.lastIndexOf('-');\n            }\n            if (millisecondsEndIndex == -1) {\n                if (dateString.length >= secondsSeparatorIndex + 3) {\n                    dateString = dateString.substring(0, secondsSeparatorIndex + 3);\n                }\n            } else {\n                dateString = dateString.substring(0, secondsSeparatorIndex + 3) +\n                    dateString.substring(millisecondsEndIndex, dateString.length);\n            }\n            timestamp = new Date(dateString).getTime();\n        }\n    }\n        // If we cannot parse timestamp - we will use the current timestamp\n    if (timestamp == -1) {\n        timestamp = Date.now();\n    }\n    \n    return timestamp;\n}\n\nfunction getGatewayInfo() {\n    var gatewayList = data.uplink_message.?rx_metadata;\n    var maxRssi = Integer. MIN_VALUE;\n    var gatewayInfo = {};\n    \n    foreach (gateway : gatewayList) {\n        if(gateway.rssi > maxRssi) {\n            maxRssi = gateway.rssi;\n            gatewayInfo = gateway;\n        }\n    }\n    \n    return gatewayInfo;\n}\n\nfunction processTelemetryData(telemetry, addDataToTelemetry) {\n    if (telemetry.size > 1) {\n        telemetry = addDataToMultipleTelemetries(telemetry, addDataToTelemetry);\n    }\n    else if (telemetry.size == 1) {\n        telemetry = addDataToSingleTelemetry(telemetry, addDataToTelemetry);\n    }\n    else {\n        telemetry.add(addDataToTelemetry);\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToMultipleTelemetries(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n        if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n            telemetry[0][\"values\"][element.key] = element.value;\n        }\n        if (!telemetry[1][\"values\"].keys.contains(element.key)) {\n            telemetry[1][\"values\"][element.key] = element.value;\n        }\n    }\n    \n    return telemetry;\n}\n\nfunction addDataToSingleTelemetry(telemetry, addDataToTelemetry) {\n    foreach(element : addDataToTelemetry.entrySet()) {\n            if(!telemetry[0][\"values\"].keys.contains(element.key)) {\n                telemetry[0][\"values\"][element.key] = element.value;\n            }\n    }\n    \n    return telemetry;\n}",
     "encoder": null,
     "tbelEncoder": null,
     "updateOnlyKeys": [
diff --git a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_1.json b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_1.json
index 723f48b..1f39967 100644
--- a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_1.json
+++ b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_1.json
@@ -22,7 +22,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,
diff --git a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_2.json b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_2.json
index d6df4e9..499b6c2 100644
--- a/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_2.json
+++ b/VENDORS/Milesight/AM308/ThingsStackIndustries/uplink/result_2.json
@@ -22,7 +22,7 @@
     "values": {
       "battery": 85,
       "temperature": 23.8,
-      "humidity": 62,
+      "humidity": 62.0,
       "pir": "trigger",
       "light_level": 2,
       "co2": 936,