From a3c6b1c00c459cdbd876e912198dcd5e52466c31 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 12 Sep 2024 20:15:14 +0200 Subject: [PATCH] Update device JSON configurations and properties - Modify `SBBT_004CEU_json.h` to update the model name from "SBBT-004CEU" to "SBBT-EU". - Modify `SBBT_004CUS_json.h` to update the model name from "SBBT-US76d2" to "SBBT-US". - Modify `SBBT_004CEU_ENCR_json.h` to update the model name from "SBBT-004CEU" to "SBBT-EU". - Modify `SBBT_004CUS_ENCR_json.h` to update the model name from "SBBT-US76d2" to "SBBT-US". - Ensure consistency in JSON property definitions across all device headers. --- src/devices/SBBT_004CEU_ENCR_json.h | 4 +- src/devices/SBBT_004CEU_json.h | 4 +- src/devices/SBBT_004CUS_ENCR_json.h | 4 +- src/devices/SBBT_004CUS_json.h | 4 +- tests/BLE/test_ble.cpp | 140 ++++++++++++++++++++++------ 5 files changed, 117 insertions(+), 39 deletions(-) diff --git a/src/devices/SBBT_004CEU_ENCR_json.h b/src/devices/SBBT_004CEU_ENCR_json.h index ae418b85..ef852a54 100644 --- a/src/devices/SBBT_004CEU_ENCR_json.h +++ b/src/devices/SBBT_004CEU_ENCR_json.h @@ -1,11 +1,11 @@ -const char* _SBBT_004CEU_ENCR_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Wall Switch4 encrypted\",\"model_id\":\"SBBT_004CEU_ENCR\",\"tag\":\"110602\",\"condition\":[\"servicedata\",\"index\",0,\"41\",\"|\",\"servicedata\",\"index\",0,\"45\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-004CEU\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,12]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",14,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",22,8]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",30],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; +const char* _SBBT_004CEU_ENCR_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Wall Switch4 encrypted\",\"model_id\":\"SBBT_004CEU_ENCR\",\"tag\":\"110602\",\"condition\":[\"servicedata\",\"index\",0,\"41\",\"|\",\"servicedata\",\"index\",0,\"45\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-EU\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,12]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",14,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",22,8]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",30],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; /*R""""( { "brand":"Shelly", "model":"ShellyBLU Wall Switch4 encrypted", "model_id":"SBBT_004CEU_ENCR", "tag":"110602", - "condition":["servicedata", "index", 0, "41", "|", "servicedata", "index", 0, "45", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-004CEU"], + "condition":["servicedata", "index", 0, "41", "|", "servicedata", "index", 0, "45", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-EU"], "properties":{ "cipher":{ "decoder":["string_from_hex_data", "servicedata", 2, 12] diff --git a/src/devices/SBBT_004CEU_json.h b/src/devices/SBBT_004CEU_json.h index 70ffc952..6fe56283 100644 --- a/src/devices/SBBT_004CEU_json.h +++ b/src/devices/SBBT_004CEU_json.h @@ -1,11 +1,11 @@ -const char* _SBBT_004CEU_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Wall Switch4\",\"model_id\":\"SBBT-004CEU\",\"tag\":\"1106\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"40\",\"|\",\"servicedata\",\"=\",26,\"index\",0,\"44\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-004CEU\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"button1\":{\"condition\":[\"servicedata\",10,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",12,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button2\":{\"condition\":[\"servicedata\",14,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",16,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button3\":{\"condition\":[\"servicedata\",18,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button4\":{\"condition\":[\"servicedata\",22,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",24,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",\"d2\"],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; +const char* _SBBT_004CEU_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Wall Switch4\",\"model_id\":\"SBBT-004CEU\",\"tag\":\"1106\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"40\",\"|\",\"servicedata\",\"=\",26,\"index\",0,\"44\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-EU\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"button1\":{\"condition\":[\"servicedata\",10,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",12,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button2\":{\"condition\":[\"servicedata\",14,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",16,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button3\":{\"condition\":[\"servicedata\",18,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button4\":{\"condition\":[\"servicedata\",22,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",24,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",\"d2\"],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; /*R""""( { "brand":"Shelly", "model":"ShellyBLU Wall Switch4", "model_id":"SBBT-004CEU", "tag":"1106", - "condition":["servicedata", "=", 26, "index", 0, "40", "|", "servicedata", "=", 26, "index", 0, "44", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-004CEU"], + "condition":["servicedata", "=", 26, "index", 0, "40", "|", "servicedata", "=", 26, "index", 0, "44", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-EU"], "properties":{ "packet":{ "condition":["servicedata", 2, "00"], diff --git a/src/devices/SBBT_004CUS_ENCR_json.h b/src/devices/SBBT_004CUS_ENCR_json.h index d49b2515..edb85454 100644 --- a/src/devices/SBBT_004CUS_ENCR_json.h +++ b/src/devices/SBBT_004CUS_ENCR_json.h @@ -1,11 +1,11 @@ -const char* _SBBT_004CUS_ENCR_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4 encrypted\",\"model_id\":\"SBBT_004CUS_ENCR\",\"tag\":\"110602\",\"condition\":[\"servicedata\",\"index\",0,\"41\",\"|\",\"servicedata\",\"index\",0,\"45\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-US76d2\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,12]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",14,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",22,8]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",30],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; +const char* _SBBT_004CUS_ENCR_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4 encrypted\",\"model_id\":\"SBBT_004CUS_ENCR\",\"tag\":\"110602\",\"condition\":[\"servicedata\",\"index\",0,\"41\",\"|\",\"servicedata\",\"index\",0,\"45\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-US\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,12]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",14,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",22,8]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",30],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; /*R""""( { "brand":"Shelly", "model":"ShellyBLU RC Button4 encrypted", "model_id":"SBBT_004CUS_ENCR", "tag":"110602", - "condition":["servicedata", "index", 0, "41", "|", "servicedata", "index", 0, "45", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-US76d2"], + "condition":["servicedata", "index", 0, "41", "|", "servicedata", "index", 0, "45", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-US"], "properties":{ "cipher":{ "decoder":["string_from_hex_data", "servicedata", 2, 12] diff --git a/src/devices/SBBT_004CUS_json.h b/src/devices/SBBT_004CUS_json.h index 3e8dd947..2349fc1f 100644 --- a/src/devices/SBBT_004CUS_json.h +++ b/src/devices/SBBT_004CUS_json.h @@ -1,11 +1,11 @@ -const char* _SBBT_004CUS_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"tag\":\"1106\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"40\",\"|\",\"servicedata\",\"=\",26,\"index\",0,\"44\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-US76d2\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"button1\":{\"condition\":[\"servicedata\",10,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",12,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button2\":{\"condition\":[\"servicedata\",14,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",16,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button3\":{\"condition\":[\"servicedata\",18,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button4\":{\"condition\":[\"servicedata\",22,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",24,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",\"d2\"],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; +const char* _SBBT_004CUS_json = "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"tag\":\"1106\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"40\",\"|\",\"servicedata\",\"=\",26,\"index\",0,\"44\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"SBBT-US\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"button1\":{\"condition\":[\"servicedata\",10,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",12,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button2\":{\"condition\":[\"servicedata\",14,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",16,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button3\":{\"condition\":[\"servicedata\",18,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"button4\":{\"condition\":[\"servicedata\",22,\"3a\"],\"decoder\":[\"string_from_hex_data\",\"servicedata\",24,2],\"lookup\":[\"00\",0,\"01\",1,\"02\",2,\"03\",3,\"04\",9,\"fe\",11]},\"mac\":{\"condition\":[\"manufacturerdata\",\"=\",\"d2\"],\"decoder\":[\"revmac_from_hex_data\",\"manufacturerdata\",18]}}}"; /*R""""( { "brand":"Shelly", "model":"ShellyBLU RC Button4", "model_id":"SBBT-004CUS", "tag":"1106", - "condition":["servicedata", "=", 26, "index", 0, "40", "|", "servicedata", "=", 26, "index", 0, "44", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-US76d2"], + "condition":["servicedata", "=", 26, "index", 0, "40", "|", "servicedata", "=", 26, "index", 0, "44", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "SBBT-US"], "properties":{ "packet":{ "condition":["servicedata", 2, "00"], diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp index 75172dff..f4e7ec34 100644 --- a/tests/BLE/test_ble.cpp +++ b/tests/BLE/test_ble.cpp @@ -203,6 +203,7 @@ const char* expected_name_mac_uuid_mfgsvcdata[] = { "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Button1\",\"model_id\":\"SBBT-002C\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button\":1,\"mac\":\"BC:02:6E:AA:BB:CC\"}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Button1 encrypted\",\"model_id\":\"SBBT_002C_ENCR\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"encr\":2,\"cipher\":\"62511158bd25\",\"ctr\":\"b8f09364\",\"mic\":\"5b573115\",\"mac\":\"BC:02:6E:AA:BB:CC\"}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":0\",\"button4\":0,mac\":\"38:39:8F:71:76:D2\"}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Wall Switch4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":0\",\"button4\":0,mac\":\"38:39:8F:71:77:D2\"}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Door/Window\",\"model_id\":\"SBDW-002C\",\"type\":\"CTMO\",\"acts\":true,\"cont\":true,\"packet\":93,\"batt\":100,\"lux\":87,\"open\":true,\"rot\":40.6,\"mac\":\"3C:2E:F5:AA:BB:CC\"}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Door/Window\",\"model_id\":\"SBDW-002C\",\"type\":\"CTMO\",\"acts\":true,\"cont\":true,\"packet\":86,\"batt\":100,\"lux\":673,\"open\":false,\"rot\":0,\"mac\":\"3C:2E:F5:AA:BB:CC\"}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU Door/Window encrypted\",\"model_id\":\"SBDW_002C_ENCR\",\"type\":\"CTMO\",\"acts\":true,\"cont\":true,\"encr\":2,\"cipher\":\"38efaf00d122b4979064e971a7\",\"ctr\":\"ed16c164\",\"mic\":\"4dc481fd\",\"mac\":\"3C:2E:F5:AA:BB:CC\"}", @@ -250,27 +251,52 @@ const char* expected_uuid_name_svcdata[] = { "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":2,\"button2\":0,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":3,\"button2\":0,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":9,\"button2\":0,\"button3\":0,\"button4\":0}", - "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":11,\"button2\":0,\"button3\":0,\"button4\":0}" + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":11,\"button2\":0,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":1,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":2,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":3,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":9,\"button3\":0,\"button4\":0}", - "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":11,\"button3\":0,\"button4\":0}" + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":11,\"button3\":0,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":1,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":2,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":3,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":9,\"button4\":0}", - "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":11,\"button4\":0}" + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":11,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":1}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":2}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":3}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":9}", - "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":11}" + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":11}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":1,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":2,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":3,\"button4\":0}", "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":9,\"button4\":0}", - "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":11,\"button4\":0}" + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CUS\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":11,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":2,\"button2\":0,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":3,\"button2\":0,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":9,\"button2\":0,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":11,\"button2\":0,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":1,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":2,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":3,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":9,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":11,\"button3\":0,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":1,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":2,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":3,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":9,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":11,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":1}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":2}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":3}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":9}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":0,\"button2\":0,\"button3\":0,\"button4\":11}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":29,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":1,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":30,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":2,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":31,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":3,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":32,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":9,\"button4\":0}", + "{\"brand\":\"Shelly\",\"model\":\"ShellyBLU RC Button4\",\"model_id\":\"SBBT-004CEU\",\"type\":\"BTN\",\"acts\":true,\"cont\":true,\"packet\":171,\"batt\":100,\"button1\":1,\"button2\":0,\"button3\":11,\"button4\":0}", "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_ENCR\",\"type\":\"THB\",\"encr\":1,\"cipher\":\"ef56583dd420\",\"ctr\":\"23\",\"mic\":\"50fe8e4d\"}", "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_DECR\",\"type\":\"THB\",\"tempc\":24.60,\"tempf\":76.28,\"hum\":43.54,\"batt\":100}", "{\"brand\":\"April Brother\",\"model\":\"N07\",\"model_id\":\"ABN07\",\"type\":\"THB\",\"acts\":true,\"track\":true,\"batt\":100,\"tempc\":24.51,\"tempf\":76.118,\"hum\":47.42,\"packet\":16}", @@ -857,7 +883,8 @@ TheengsDecoder::BLE_ID_NUM test_name_uuid_mfgsvcdata_id_num[]{ const char* test_name_mac_uuid_mfgsvcdata[][6] = { {"SBBT-002C", "BC:02:6E:AA:BB:CC", "SBBT-002C", "0xfcd2", "a90b0109000b01000accbbaa6e02bc", "40001d01643a01"}, {"SBBT-002C encrypted", "BC:02:6E:AA:BB:CC", "SBBT-002C", "0xfcd2", "a90b0109000b01000accbbaa6e02bc", "4562511158bd25b8f093645b573115"}, - {"SBBT-004CUS", "38:39:8F:71:76:D2", "SBBT-US76d2", "0xfcd2", "a90b0101000b07000ad276718f3938", "44001d01643a013a003a003a00"}, + {"SBBT-004CUS", "38:39:8F:71:76:D2", "SBBT-US", "0xfcd2", "a90b0101000b07000ad276718f3938", "44001d01643a013a003a003a00"}, + {"SBBT-004CEU", "38:39:8F:71:77:D2", "SBBT-EU", "0xfcd2", "a90b0101000b07000ad277718f3938", "44001d01643a013a003a003a00"}, {"SBDW-002C", "3C:2E:F5:AA:BB:CC", "SBDW-002C", "0xfcd2", "a90b0101000b02000accbbaaf52e3c", "44005d016405fc21002d013f9601"}, {"SBDW-002C", "3C:2E:F5:AA:BB:CC", "SBDW-002C", "0xfcd2", "a90b0101000b02000accbbaaf52e3c", "440056016405e406012d003f0000"}, {"SBDW-002C encrypted", "3C:2E:F5:AA:BB:CC", "SBDW-002C", "0xfcd2", "a90b0101000b02000accbbaaf52e3c", "4538efaf00d122b4979064e971a7ed16c1644dc481fd"}, @@ -877,6 +904,7 @@ TheengsDecoder::BLE_ID_NUM test_name_mac_uuid_mfgsvcdata_id_num[]{ TheengsDecoder::BLE_ID_NUM::SBBT_002C, TheengsDecoder::BLE_ID_NUM::SBBT_002C_ENCR, TheengsDecoder::BLE_ID_NUM::SBBT_004CUS, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, TheengsDecoder::BLE_ID_NUM::SBDW_002C, TheengsDecoder::BLE_ID_NUM::SBDW_002C, TheengsDecoder::BLE_ID_NUM::SBDW_002C_ENCR, @@ -921,31 +949,56 @@ const char* test_uuid_name_svcdata[][4] = { {"SBBT-002C press", "0xfcd2", "SBBT-002C", "4400ab01643a01"}, {"SBBT-002C hold", "0xfcd2", "SBBT-002C", "4400ac01643afe"}, {"SBBT-002C encrypted", "0xfcd2", "SBBT-002C", "4562511158bd25b8f093645b573115"}, - {"SBBT-004CUS button1 press", "0xfcd2", "SBBT-US76d2", "44001d01643a013a003a003a00"}, - {"SBBT-004CUS button1 double press", "0xfcd2", "SBBT-US76d2", "44001e01643a023a003a003a00"}, - {"SBBT-004CUS button1 triple press", "0xfcd2", "SBBT-US76d2", "44001f01643a033a003a003a00"}, - {"SBBT-004CUS button1 long press", "0xfcd2", "SBBT-US76d2", "44002001643a043a003a003a00"}, - {"SBBT-004CUS button1 hold", "0xfcd2", "SBBT-US76d2", "4400ab01643afe3a003a003a00"}, - {"SBBT-004CUS button2 press", "0xfcd2", "SBBT-US76d2", "44001d01643a003a013a003a00"}, - {"SBBT-004CUS button2 double press", "0xfcd2", "SBBT-US76d2", "44001e01643a003a023a003a00"}, - {"SBBT-004CUS button2 triple press", "0xfcd2", "SBBT-US76d2", "44001f01643a003a033a003a00"}, - {"SBBT-004CUS button2 long press", "0xfcd2", "SBBT-US76d2", "44002001643a003a043a003a00"}, - {"SBBT-004CUS button2 hold", "0xfcd2", "SBBT-US76d2", "4400ab01643a003afe3a003a00"}, - {"SBBT-004CUS button3 press", "0xfcd2", "SBBT-US76d2", "44001d01643a003a003a013a00"}, - {"SBBT-004CUS button3 double press", "0xfcd2", "SBBT-US76d2", "44001e01643a003a003a023a00"}, - {"SBBT-004CUS button3 triple press", "0xfcd2", "SBBT-US76d2", "44001f01643a003a003a033a00"}, - {"SBBT-004CUS button3 long press", "0xfcd2", "SBBT-US76d2", "44002001643a003a003a043a00"}, - {"SBBT-004CUS button3 hold", "0xfcd2", "SBBT-US76d2", "4400ab01643a003a003afe3a00"}, - {"SBBT-004CUS button4 press", "0xfcd2", "SBBT-US76d2", "44001d01643a003a003a003a01"}, - {"SBBT-004CUS button4 double press", "0xfcd2", "SBBT-US76d2", "44001e01643a003a003a003a02"}, - {"SBBT-004CUS button4 triple press", "0xfcd2", "SBBT-US76d2", "44001f01643a003a003a003a03"}, - {"SBBT-004CUS button4 long press", "0xfcd2", "SBBT-US76d2", "44002001643a003a003a003a04"}, - {"SBBT-004CUS button4 hold", "0xfcd2", "SBBT-US76d2", "4400ab01643a003a003a003afe"}, - {"SBBT-004CUS button1 press button3 press", "0xfcd2", "SBBT-US76d2", "44001d01643a013a003a013a00"}, - {"SBBT-004CUS button1 press button3 double press", "0xfcd2", "SBBT-US76d2", "44001e01643a013a003a023a00"}, - {"SBBT-004CUS button1 press button3 triple press", "0xfcd2", "SBBT-US76d2", "44001f01643a013a003a033a00"}, - {"SBBT-004CUS button1 press button3 long press", "0xfcd2", "SBBT-US76d2", "44002001643a013a003a043a00"}, - {"SBBT-004CUS button1 press button3 hold", "0xfcd2", "SBBT-US76d2", "4400ab01643a013a003afe3a00"}, + {"SBBT-004CUS button1 press", "0xfcd2", "SBBT-US", "44001d01643a013a003a003a00"}, + {"SBBT-004CUS button1 double press", "0xfcd2", "SBBT-US", "44001e01643a023a003a003a00"}, + {"SBBT-004CUS button1 triple press", "0xfcd2", "SBBT-US", "44001f01643a033a003a003a00"}, + {"SBBT-004CUS button1 long press", "0xfcd2", "SBBT-US", "44002001643a043a003a003a00"}, + {"SBBT-004CUS button1 hold", "0xfcd2", "SBBT-US", "4400ab01643afe3a003a003a00"}, + {"SBBT-004CUS button2 press", "0xfcd2", "SBBT-US", "44001d01643a003a013a003a00"}, + {"SBBT-004CUS button2 double press", "0xfcd2", "SBBT-US", "44001e01643a003a023a003a00"}, + {"SBBT-004CUS button2 triple press", "0xfcd2", "SBBT-US", "44001f01643a003a033a003a00"}, + {"SBBT-004CUS button2 long press", "0xfcd2", "SBBT-US", "44002001643a003a043a003a00"}, + {"SBBT-004CUS button2 hold", "0xfcd2", "SBBT-US", "4400ab01643a003afe3a003a00"}, + {"SBBT-004CUS button3 press", "0xfcd2", "SBBT-US", "44001d01643a003a003a013a00"}, + {"SBBT-004CUS button3 double press", "0xfcd2", "SBBT-US", "44001e01643a003a003a023a00"}, + {"SBBT-004CUS button3 triple press", "0xfcd2", "SBBT-US", "44001f01643a003a003a033a00"}, + {"SBBT-004CUS button3 long press", "0xfcd2", "SBBT-US", "44002001643a003a003a043a00"}, + {"SBBT-004CUS button3 hold", "0xfcd2", "SBBT-US", "4400ab01643a003a003afe3a00"}, + {"SBBT-004CUS button4 press", "0xfcd2", "SBBT-US", "44001d01643a003a003a003a01"}, + {"SBBT-004CUS button4 double press", "0xfcd2", "SBBT-US", "44001e01643a003a003a003a02"}, + {"SBBT-004CUS button4 triple press", "0xfcd2", "SBBT-US", "44001f01643a003a003a003a03"}, + {"SBBT-004CUS button4 long press", "0xfcd2", "SBBT-US", "44002001643a003a003a003a04"}, + {"SBBT-004CUS button4 hold", "0xfcd2", "SBBT-US", "4400ab01643a003a003a003afe"}, + {"SBBT-004CUS button1 press button3 press", "0xfcd2", "SBBT-US", "44001d01643a013a003a013a00"}, + {"SBBT-004CUS button1 press button3 double press", "0xfcd2", "SBBT-US", "44001e01643a013a003a023a00"}, + {"SBBT-004CUS button1 press button3 triple press", "0xfcd2", "SBBT-US", "44001f01643a013a003a033a00"}, + {"SBBT-004CUS button1 press button3 long press", "0xfcd2", "SBBT-US", "44002001643a013a003a043a00"}, + {"SBBT-004CUS button1 press button3 hold", "0xfcd2", "SBBT-US", "4400ab01643a013a003afe3a00"}, + {"SBBT-004CEU button1 press", "0xfcd2", "SBBT-EU", "44001d01643a013a003a003a00"}, + {"SBBT-004CEU button1 double press", "0xfcd2", "SBBT-EU", "44001e01643a023a003a003a00"}, + {"SBBT-004CEU button1 triple press", "0xfcd2", "SBBT-EU", "44001f01643a033a003a003a00"}, + {"SBBT-004CEU button1 long press", "0xfcd2", "SBBT-EU", "44002001643a043a003a003a00"}, + {"SBBT-004CEU button1 hold", "0xfcd2", "SBBT-EU", "4400ab01643afe3a003a003a00"}, + {"SBBT-004CEU button2 press", "0xfcd2", "SBBT-EU", "44001d01643a003a013a003a00"}, + {"SBBT-004CEU button2 double press", "0xfcd2", "SBBT-EU", "44001e01643a003a023a003a00"}, + {"SBBT-004CEU button2 triple press", "0xfcd2", "SBBT-EU", "44001f01643a003a033a003a00"}, + {"SBBT-004CEU button2 long press", "0xfcd2", "SBBT-EU", "44002001643a003a043a003a00"}, + {"SBBT-004CEU button2 hold", "0xfcd2", "SBBT-EU", "4400ab01643a003afe3a003a00"}, + {"SBBT-004CEU button3 press", "0xfcd2", "SBBT-EU", "44001d01643a003a003a013a00"}, + {"SBBT-004CEU button3 double press", "0xfcd2", "SBBT-EU", "44001e01643a003a003a023a00"}, + {"SBBT-004CEU button3 triple press", "0xfcd2", "SBBT-EU", "44001f01643a003a003a033a00"}, + {"SBBT-004CEU button3 long press", "0xfcd2", "SBBT-EU", "44002001643a003a003a043a00"}, + {"SBBT-004CEU button3 hold", "0xfcd2", "SBBT-EU", "4400ab01643a003a003afe3a00"}, + {"SBBT-004CEU button4 press", "0xfcd2", "SBBT-EU", "44001d01643a003a003a003a01"}, + {"SBBT-004CEU button4 double press", "0xfcd2", "SBBT-EU", "44001e01643a003a003a003a02"}, + {"SBBT-004CEU button4 triple press", "0xfcd2", "SBBT-EU", "44001f01643a003a003a003a03"}, + {"SBBT-004CEU button4 long press", "0xfcd2", "SBBT-EU", "44002001643a003a003a003a04"}, + {"SBBT-004CEU button4 hold", "0xfcd2", "SBBT-EU", "4400ab01643a003a003a003afe"}, + {"SBBT-004CEU button1 press button3 press", "0xfcd2", "SBBT-EU", "44001d01643a013a003a013a00"}, + {"SBBT-004CEU button1 press button3 double press", "0xfcd2", "SBBT-EU", "44001e01643a013a003a023a00"}, + {"SBBT-004CEU button1 press button3 triple press", "0xfcd2", "SBBT-EU", "44001f01643a013a003a033a00"}, + {"SBBT-004CEU button1 press button3 long press", "0xfcd2", "SBBT-EU", "44002001643a013a003a043a00"}, + {"SBBT-004CEU button1 press button3 hold", "0xfcd2", "SBBT-EU", "4400ab01643a013a003afe3a00"}, {"LYWSD03MMC_PVVX_ENCR", "0x181a", "ATC_9C58AB", "23ef56583dd42050fe8e4d"}, {"LYWSD03MMC_PVVX_DECR", "0x181a", "ATC_89DF88", "9c0902116404"}, {"ABN07", "0xfcd2", "asensor_7F7F", "4000100164029309038612"}, @@ -1015,6 +1068,31 @@ TheengsDecoder::BLE_ID_NUM test_uuid_name_svcdata_id_num[]{ TheengsDecoder::BLE_ID_NUM::SBBT_004CUS, TheengsDecoder::BLE_ID_NUM::SBBT_004CUS, TheengsDecoder::BLE_ID_NUM::SBBT_004CUS, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, + TheengsDecoder::BLE_ID_NUM::SBBT_004CEU, TheengsDecoder::BLE_ID_NUM::LYWSD03MMC_PVVX_ENCR, TheengsDecoder::BLE_ID_NUM::LYWSD03MMC_PVVX_DECR, TheengsDecoder::BLE_ID_NUM::ABN07,