[MUE4094RT] Improve decoder

-add processing of service data with a length = 18 -detect mac address -add test cases -reinforce service data condition with uuid check Add MAC property Avoid changing servicedata global length
theengs · Jan 17, 2024 · 328cd0a · 328cd0a
1 parent faed54b
commit 328cd0a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/devices/MUE4094RT_json.h b/src/devices/MUE4094RT_json.h
@@ -1,24 +1,29 @@
-const char* _MUE4094RT_json = "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"tag\":\"0404\",\"condition\":[\"servicedata\",\"index\",0,\"4030dd\"],\"properties\":{\"motion\":{\"decoder\":[\"static_value\",true],\"is_bool\":1},\"darkness\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,true]}}}";
-/*
-R""""(
+const char* _MUE4094RT_json = "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"tag\":\"0404\",\"condition\":[\"servicedata\",\">=\",18,\"index\",2,\"30dd\",\"&\",\"uuid\",\"index\",0,\"fe95\"],\"properties\":{\"motion\":{\"condition\":[\"servicedata\",0,\"40\"],\"decoder\":[\"static_value\",true],\"is_bool\":1},\"darkness\":{\"condition\":[\"servicedata\",0,\"40\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,true]},\"mac\":{\"condition\":[\"servicedata\",0,\"30\"],\"decoder\":[\"revmac_from_hex_data\",\"servicedata\",10]}}}";
+/*R""""(
 {
    "brand":"Xiaomi",
    "model":"MiLamp",
    "model_id":"MUE4094RT",
    "tag":"0404",
-   "condition":["servicedata", "index", 0, "4030dd"],
+   "condition":["servicedata", ">=", 18, "index", 2, "30dd", "&", "uuid", "index", 0, "fe95"],
    "properties":{
       "motion":{
+         "condition":["servicedata", 0, "40"],
          "decoder":["static_value", true],
          "is_bool":1
       },
       "darkness":{
+         "condition":["servicedata", 0, "40"],
          "decoder":["value_from_hex_data", "servicedata", 8, 2, true]
+      },
+      "mac":{
+         "condition":["servicedata", 0, "30"],
+         "decoder":["revmac_from_hex_data", "servicedata", 10]
       }
    }
 })"""";*/
 
-const char* _MUE4094RT_json_props = "{\"properties\":{\"motion\":{\"unit\":\"status\",\"name\":\"motion\"},\"darkness\":{\"unit\":\"lx\",\"name\":\"illuminance\"}}}";
+const char* _MUE4094RT_json_props = "{\"properties\":{\"motion\":{\"unit\":\"status\",\"name\":\"motion\"},\"darkness\":{\"unit\":\"lx\",\"name\":\"illuminance\"},\"mac\":{\"unit\":\"string\",\"name\":\"MAC address\"}}}";
 /*R""""(
 {
    "properties":{
@@ -29,6 +34,10 @@ const char* _MUE4094RT_json_props = "{\"properties\":{\"motion\":{\"unit\":\"sta
       "darkness":{
          "unit":"lx",
          "name":"illuminance"
+      },
+      "mac":{
+         "unit":"string",
+         "name":"MAC address"
       }
    }
 })"""";*/
diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp
@@ -16,7 +16,6 @@ const char* expected_servicedata[] = {
     "{\"brand\":\"Xiaomi\",\"model\":\"Formaldehyde detector\",\"model_id\":\"JQJCY01YM\",\"type\":\"AIR\",\"tempc\":19.6,\"tempf\":67.28,\"mac\":\"AA:BB:CC:DD:EE:FF\"}",
     "{\"brand\":\"Xiaomi\",\"model\":\"RoPot\",\"model_id\":\"HHCCPOT002\",\"type\":\"PLANT\",\"moi\":3,\"mac\":\"C4:7C:8D:6D:0C:D2\"}",
     "{\"brand\":\"Xiaomi\",\"model\":\"RoPot\",\"model_id\":\"HHCCPOT002\",\"type\":\"PLANT\",\"fer\":1,\"mac\":\"AA:BB:CC:DD:EE:FF\"}",
-    "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"type\":\"CTMO\",\"cont\":true,\"motion\":true,\"darkness\":29}",
     "{\"brand\":\"April Brother\",\"model\":\"N03\",\"model_id\":\"ABN03\",\"type\":\"THBX\",\"track\":true,\"tempc\":-2.625,\"tempf\":27.275,\"hum\":63.5,\"lux\":350,\"batt\":100,\"mac\":\"AA:BB:CC:DD:EE:FF\"}",
 };
 
@@ -337,6 +336,9 @@ const char* expected_uuid[] = {
     "{\"brand\":\"SwitchBot\",\"model\":\"Curtain (2/3)\",\"model_id\":\"W070160X\",\"type\":\"WCVR\",\"acts\":true,\"moving\":false,\"position\":0,\"calibrated\":false,\"lightlevel\":1,\"batt\":77}",
     "{\"brand\":\"SwitchBot\",\"model\":\"Curtain (2/3)\",\"model_id\":\"W070160X\",\"type\":\"WCVR\",\"acts\":true,\"moving\":true,\"position\":100,\"calibrated\":true,\"lightlevel\":1,\"batt\":87}",
     "{\"brand\":\"SwitchBot\",\"model\":\"Curtain (2/3)\",\"model_id\":\"W070160X\",\"type\":\"WCVR\",\"acts\":true,\"moving\":false,\"position\":57,\"calibrated\":true,\"lightlevel\":1,\"batt\":79}",
+    "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"type\":\"CTMO\",\"cont\":true,\"motion\":true,\"darkness\":29}",
+    "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"type\":\"CTMO\",\"cont\":true,\"motion\":true,\"darkness\":2}",
+    "{\"brand\":\"Xiaomi\",\"model\":\"MiLamp\",\"model_id\":\"MUE4094RT\",\"type\":\"CTMO\",\"cont\":true,\"mac\":\"AA:BB:CC:DD:EE:FF\"}",
 };
 
 const char* expected_mac_mfg[] = {
@@ -389,7 +391,6 @@ const char* test_servicedata[][2] = {
     {"Formaldehyde detector", "5120df023effeeddccbbaa041002c400"},
     {"RoPot", "71205d0183d20c6d8d7cc40d08100103"},
     {"RoPot", "71205d0188ffeeddccbbaa0d0910020100"},
-    {"MiLamp", "4030dd031d0300010100"},
     {"AprilBrother N03", "ab03aabbccddeeff64ebff7f005e01"},
 };
 
@@ -405,7 +406,6 @@ TheengsDecoder::BLE_ID_NUM test_svcdata_id_num[]{
     TheengsDecoder::BLE_ID_NUM::JQJCY01YM,
     TheengsDecoder::BLE_ID_NUM::HHCCPOT002,
     TheengsDecoder::BLE_ID_NUM::HHCCPOT002,
-    TheengsDecoder::BLE_ID_NUM::MUE4094RT,
     TheengsDecoder::BLE_ID_NUM::ABN03,
 };
 
@@ -925,6 +925,9 @@ const char* test_uuid[][4] = {
     {"Switchbot_Curtain 3", "0xfd3d", "servicedata", "7b804d001204"},
     {"Switchbot_Curtain 3", "0xfd3d", "servicedata", "7b4057e41106"},
     {"Switchbot_Curtain 3", "0xfd3d", "servicedata", "7bc04f391204"},
+    {"MiLamp", "0xfe95",  "servicedata", "4030dd031d0300010100"},
+    {"MiLamp", "0xfe95",  "servicedata", "4030dd030203000101"},
+    {"MiLamp", "0xfe95",  "servicedata", "3030dd0301ffeeddccbbaa0d"},
 };
 
 TheengsDecoder::BLE_ID_NUM test_uuid_id_num[]{
@@ -1050,6 +1053,9 @@ TheengsDecoder::BLE_ID_NUM test_uuid_id_num[]{
     TheengsDecoder::BLE_ID_NUM::SBCU,
     TheengsDecoder::BLE_ID_NUM::SBCU,
     TheengsDecoder::BLE_ID_NUM::SBCU,
+    TheengsDecoder::BLE_ID_NUM::MUE4094RT,
+    TheengsDecoder::BLE_ID_NUM::MUE4094RT,
+    TheengsDecoder::BLE_ID_NUM::MUE4094RT,
 };
 
 // MAC manufacturer data test input [test name] [mac] [data]