From b90eb3cb8a6d5a6b6539f27fcef20482c561d889 Mon Sep 17 00:00:00 2001 From: DigiH Date: Sat, 25 Mar 2023 16:51:51 +0100 Subject: [PATCH] Mi Band/Amazfit restriction Mi Band/Amazfit decoder restriction to not catch wrongly decoded devices like the Amazfit Bip S and similar. --- src/devices/Miband_json.h | 4 ++-- tests/BLE/test_ble.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/Miband_json.h b/src/devices/Miband_json.h index 88c406842..69a7dcd1f 100644 --- a/src/devices/Miband_json.h +++ b/src/devices/Miband_json.h @@ -1,11 +1,11 @@ -const char* _Miband_json = "{\"brand\":\"Xiaomi/Amazfit\",\"model\":\"Mi Band/Smart Watch\",\"model_id\":\"MB/SW\",\"tag\":\"0b0a\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"5701\",\"&\",\"manufacturerdata\",\"mac@index\",40],\"conditionnomac\":[\"uuid\",\"contain\",\"fee0\"],\"properties\":{\"steps\":{\"condition\":[\"servicedata\",\"=\",8],\"decoder\":[\"value_from_hex_data\",\"servicedata\",0,4,true,false]},\"act_bpm\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"f\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,2,false,false]},\"device\":{\"decoder\":[\"static_value\",\"Xiaomi/Amazfit Tracker\"]}}}"; +const char* _Miband_json = "{\"brand\":\"Xiaomi/Amazfit\",\"model\":\"Mi Band/Smart Watch\",\"model_id\":\"MB/SW\",\"tag\":\"0b0a\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"570102\",\"&\",\"manufacturerdata\",\"mac@index\",40],\"conditionnomac\":[\"uuid\",\"contain\",\"fee0\"],\"properties\":{\"steps\":{\"condition\":[\"servicedata\",\"=\",8],\"decoder\":[\"value_from_hex_data\",\"servicedata\",0,4,true,false]},\"act_bpm\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"f\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,2,false,false]},\"device\":{\"decoder\":[\"static_value\",\"Xiaomi/Amazfit Tracker\"]}}}"; /*R""""( { "brand":"Xiaomi/Amazfit", "model":"Mi Band/Smart Watch", "model_id":"MB/SW", "tag":"0b0a", - "condition":["manufacturerdata", "=", 52, "index", 0, "5701", "&", "manufacturerdata", "mac@index", 40], + "condition":["manufacturerdata", "=", 52, "index", 0, "570102", "&", "manufacturerdata", "mac@index", 40], "conditionnomac":["uuid", "contain", "fee0"], "properties":{ "steps":{ diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp index 1dff9bb37..aae11c014 100644 --- a/tests/BLE/test_ble.cpp +++ b/tests/BLE/test_ble.cpp @@ -811,7 +811,7 @@ const char* test_mac_mfgsvcdata[][4] = { {"MiBand", "AA:BB:CC:DD:EE:FF", "57010202017dffffffffffffffffffffffffff02aabbccddeeff", "8d230000"}, {"MiBand", "AA:BB:CC:DD:EE:FF", "570102020184ffffffffffffffffffffffffff02aabbccddeeff", ""}, {"MiBand", "AA:BB:CC:DD:EE:FF", "5701020201ffffffffffffffffffffffffffff02aabbccddeeff", "ac1e0000"}, - {"MiBand", "AA:BB:CC:DD:EE:FF", "57010202ffffffffffffffffffffffffffffff02aabbccddeeff", ""}, + {"MiBand", "AA:BB:CC:DD:EE:FF", "570102ffffffffffffffffffffffffffffffff02aabbccddeeff", ""}, }; TheengsDecoder::BLE_ID_NUM test_mac_mfgsvcdata_id_num[]{