Merge pull request #9 from thingsboard/fix_bug_after_control_test

fix bug after control test
thingsboard · Sep 26, 2024 · 2eb65e7 · 2eb65e7
2 parents 008c5c5 + 0a294ee
commit 2eb65e7
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 52 deletions.
diff --git a/VENDORS/Milesight/AM307/ChirpStack/uplink/result.json b/VENDORS/Milesight/AM307/ChirpStack/uplink/result.json
@@ -1,49 +1,49 @@
 {
-  "deviceName": "Device name",
-  "deviceType": "Chirpstack default device profile",
-  "groupName": "9-in-1 IAQ Sensor",
-  "attributes": {
-    "deduplicationId": "57433366-50a6-4dc2-8145-2df1bbc70d9e",
-    "tenantId": "52f14cd4-c6f1-4fbd-8f87-4025e1d49242",
-    "tenantName": "ChirpStack",
-    "applicationId": "ca739e26-7b67-4f14-b69e-d568c22a5a75",
-    "applicationName": "Chirpstack application",
-    "deviceProfileId": "605d08d4-65f5-4d2c-8a5a-3d2457662f79",
-    "deviceProfileName": "Chirpstack default device profile",
-    "devEui": "1000000000000001",
-    "devAddr": "20000001",
-    "fPort": 85,
-    "frequency": 868500000,
-    "bandwidth": 125000,
-    "spreadingFactor": 7,
-    "codeRate": "CR_4_5"
-  },
-  "telemetry": {
-    "ts": 1684741625404,
-    "values": {
-      "hexString": "0175550367EE0004687C05000106CB02077DA803087D2500097366270A7D04000B7D20000C7D3000",
-      "battery": 85,
-      "temperature": 23.8,
-      "humidity": 62,
-      "pir": "trigger",
-      "light_level": 2,
-      "co2": 936,
-      "tvoc": 37,
-      "pressure": 1008.6,
-      "hcho": 0.04,
-      "pm2_5": 32,
-      "pm10": 48,
-      "dr": 5,
-      "fCnt": 4,
-      "confirmed": false,
-      "gatewayId": "6a7e111a10000000",
-      "uplinkId": 24022,
-      "rssi": -35,
-      "snr": 11.5,
-      "channel": 2,
-      "rfChain": 1,
-      "context": "EFwMtA==",
-      "crcStatus": "CRC_OK"
+    "deviceName": "Device name",
+    "deviceType": "Chirpstack default device profile",
+    "groupName": "7-in-1 IAQ Sensor",
+    "attributes": {
+        "deduplicationId": "57433366-50a6-4dc2-8145-2df1bbc70d9e",
+        "tenantId": "52f14cd4-c6f1-4fbd-8f87-4025e1d49242",
+        "tenantName": "ChirpStack",
+        "applicationId": "ca739e26-7b67-4f14-b69e-d568c22a5a75",
+        "applicationName": "Chirpstack application",
+        "deviceProfileId": "605d08d4-65f5-4d2c-8a5a-3d2457662f79",
+        "deviceProfileName": "Chirpstack default device profile",
+        "devEui": "1000000000000001",
+        "devAddr": "20000001",
+        "fPort": 85,
+        "frequency": 868500000,
+        "bandwidth": 125000,
+        "spreadingFactor": 7,
+        "codeRate": "CR_4_5"
+    },
+    "telemetry": {
+        "ts": 1684741625404,
+        "values": {
+            "hexString": "0175550367EE0004687C05000106CB02077DA803087D2500097366270A7D04000B7D20000C7D3000",
+            "battery": 85,
+            "temperature": 23.8,
+            "humidity": 62,
+            "pir": "trigger",
+            "light_level": 2,
+            "co2": 936,
+            "tvoc": 37,
+            "pressure": 1008.6,
+            "hcho": 0.04,
+            "pm2_5": 32,
+            "pm10": 48,
+            "dr": 5,
+            "fCnt": 4,
+            "confirmed": false,
+            "gatewayId": "6a7e111a10000000",
+            "uplinkId": 24022,
+            "rssi": -35,
+            "snr": 11.5,
+            "channel": 2,
+            "rfChain": 1,
+            "context": "EFwMtA==",
+            "crcStatus": "CRC_OK"
+        }
     }
-  }
 }
diff --git a/VENDORS/Milesight/AM308/ChirpStack/uplink/result.json b/VENDORS/Milesight/AM308/ChirpStack/uplink/result.json
@@ -1,7 +1,7 @@
 {
   "deviceName": "Device name",
   "deviceType": "Chirpstack default device profile",
-  "groupName": "9-in-1 IAQ Sensor",
+  "groupName": "8-in-1 IAQ Sensor",
   "attributes": {
     "deduplicationId": "57433366-50a6-4dc2-8145-2df1bbc70d9e",
     "tenantId": "52f14cd4-c6f1-4fbd-8f87-4025e1d49242",

diff --git a/VENDORS/Milesight/WT201/ChirpStack/downlink/payload_20.json b/VENDORS/Milesight/WT201/ChirpStack/downlink/payload_20.json
@@ -1,3 +1,3 @@
 {
-  "report_status": 1
+  "system_on_off": 1
 }
diff --git a/VENDORS/Milesight/WT201/ChirpStack/uplink/converter.json b/VENDORS/Milesight/WT201/ChirpStack/uplink/converter.json
diff --git a/VENDORS/Milesight/WT201/ChirpStack/uplink/payload_08.json b/VENDORS/Milesight/WT201/ChirpStack/uplink/payload_08.json
@@ -18,7 +18,7 @@
   "fCnt": 4,
   "fPort": 85,
   "confirmed": false,
-  "data": "A2cRAQiOAQloSgpuAA==",
+  "data": "A2cRAQiOAQloSgpucg==",
   "rxInfo": [{
     "gatewayId": "6a7e111a10000000",
     "uplinkId": 24022,

diff --git a/VENDORS/Milesight/WT201/ChirpStack/uplink/result.json b/VENDORS/Milesight/WT201/ChirpStack/uplink/result.json
@@ -30,6 +30,18 @@
       "fan_status": "high speed",
       "plan_event": "not executed",
       "temperature_alarm": "temperature threshold alarm",
+      "history": [{
+        "timestamp": 1695172444,
+        "fan_mode": "auto",
+        "fan_status": "standby",
+        "system_status": "on",
+        "temperature": 27.0,
+        "temperature_ctl_mode": "heat",
+        "temperature_ctl_status": "standby",
+        "temperature_target": 16.6
+      }],
+      "temperature_control_mode_enable": ["auto", "cool", "heat"],
+      "temperature_control_status_enable": ["stage-1 heat", "aux heat", "stage-1 cool"],
       "wires": ["y1", "g", "ob", "aux"],
       "ob_mode": "heat",
       "plan_schedule": [{

diff --git a/VENDORS/Milesight/WT201/ChirpStack/uplink/result_04.json b/VENDORS/Milesight/WT201/ChirpStack/uplink/result_04.json
@@ -22,7 +22,7 @@
     "ts": 1684741625404,
     "values": {
       "hexString": "FFCB0D1101FFCA158004",
-      "temperature_control_mode_enable": ["heat", "cool", "auto"],
+      "temperature_control_mode_enable": ["auto", "cool", "heat"],
       "temperature_control_status_enable": ["stage-1 heat", "aux heat", "stage-1 cool"],
       "wires": ["y1", "g", "ob", "aux"],
       "ob_mode": "heat",