diff --git a/docs/devices/devices_template.html b/docs/devices/devices_template.html index fc80b4e0..cc2d486a 100644 --- a/docs/devices/devices_template.html +++ b/docs/devices/devices_template.html @@ -208,10 +208,8 @@

-

Discover the extensive catalog of Bluetooth devices compatible with Theengs ecosystem, including our MQTT gateway, web - parser, - and OpenMQTTGateway. BLE trackers from Tile, Nut, TagIt and iTag will also be recognised and published as device trackers. The table also indicates whether each device has been confirmed to work with our mobile - application.

+

Discover the extensive catalog of Bluetooth devices compatible with Theengs ecosystem, including our MQTT gateway, web parser, + and OpenMQTTGateway. BLE trackers from Tile, Nut, TagIt, iTag and the TicWatch GTH (Pro) will also be recognised and published as device trackers. The table also indicates whether each device has been confirmed to work with our [mobile application](https://app.theengs.io/).

{table_content_to_replace}

Note

All product and company names are trademarks or registered trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by or of them.

diff --git a/src/decoder.h b/src/decoder.h index d142bec2..4842400a 100644 --- a/src/decoder.h +++ b/src/decoder.h @@ -135,6 +135,7 @@ class TheengsDecoder { TILEN, TheengsIB01, TheengsIB02, + TICWATCHGTH, JAALEE, APPLEWATCH, APPLEDEVICE, diff --git a/src/devices.h b/src/devices.h index d40ef12f..668879d3 100644 --- a/src/devices.h +++ b/src/devices.h @@ -201,6 +201,7 @@ const char* _devices[][2] = { {_tracker_json_tilename, _tracker_json_props}, {_tracker_json_theengs01, _tracker_json_props}, {_tracker_json_theengs02, _tracker_json_props}, + {_tracker_json_TICWATCHGTH, _tracker_json_props}, {_JAALEE_json, _JAALEE_json_props}, {_APPLEWATCH_json, _APPLEWATCH_json_props}, {_APPLEDEVICE_json, _APPLEDEVICE_json_props}, diff --git a/src/devices/tracker_json.h b/src/devices/tracker_json.h index 36cf147c..8ffb4c42 100644 --- a/src/devices/tracker_json.h +++ b/src/devices/tracker_json.h @@ -118,6 +118,21 @@ const char* _tracker_json_theengs02 = "{\"brand\":\"Theengs\",\"model\":\"iBeaco } })"""";*/ +const char* _tracker_json_TICWATCHGTH = "{\"brand\":\"Mobvoi\",\"model\":\"TicWatch GTH (Pro)\",\"model_id\":\"TICWATCHGTH\",\"tag\":\"100b\",\"condition\":[\"name\",\"index\",0,\"TicWatch GTH\"],\"properties\":{\"device\":{\"decoder\":[\"static_value\",\"TicWatch GTH (Pro) Tracker\"]}}}"; +/*R""""( +{ + "brand":"Mobvoi", + "model":"TicWatch GTH (Pro)", + "model_id":"TICWATCHGTH", + "tag":"100b", + "condition":["name", "index", 0, "TicWatch GTH"], + "properties":{ + "device":{ + "decoder":["static_value", "TicWatch GTH (Pro) Tracker"] + } + } +})"""";*/ + const char* _tracker_json_props = "{\"properties\":{\"device\":{\"unit\":\"string\",\"name\":\"tracker device\"}}}"; /*R""""( { diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp index 8876b8f8..e5fed00f 100644 --- a/tests/BLE/test_ble.cpp +++ b/tests/BLE/test_ble.cpp @@ -144,6 +144,7 @@ const char* expected_mfg[] = { "{\"brand\":\"Apple\",\"model\":\"Apple iPhone/iPad\",\"model_id\":\"APPLEDEVICE\",\"type\":\"TRACK\",\"track\":true,\"prmac\":true,\"unlocked\":true}", "{\"brand\":\"Theengs\",\"model\":\"iBeacon Tracker\",\"model_id\":\"TheengsIB01\",\"type\":\"TRACK\",\"cidc\":false,\"track\":true,\"device\":\"Theengs iBeacon Tracker\"}", "{\"brand\":\"Theengs\",\"model\":\"iBeacon Tracker\",\"model_id\":\"TheengsIB02\",\"type\":\"TRACK\",\"cidc\":false,\"track\":true,\"prmac\":true,\"device\":\"Theengs iBeacon Tracker\"}", + "{\"brand\":\"Mobvoi\",\"model\":\"TicWatch GTH (Pro)\",\"model_id\":\"TICWATCHGTH\",\"type\":\"TRACK\",\"cidc\":false,\"acts\":true,\"track\":true,\"device\":\"TicWatch GTH (Pro) Tracker\"}", }; const char* expected_name_uuid_mfgsvcdata[] = { @@ -538,6 +539,7 @@ const char* test_mfgdata[][3] = { {"Apple", "iPad", "4c0010050b1c93fbf5"}, {"Theengs", "iBeacon Tracker", "4c000215546865656e67732d69426561636f6e31f644000064"}, {"Theengs", "iBeacon Tracker", "4c000215546865656e67732d69426561636f6e32f644000064"}, + {"Mobvoi", "TicWatch GTH Pro", "0000aabbccddeeff"}, }; TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{ @@ -665,6 +667,7 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{ TheengsDecoder::BLE_ID_NUM::APPLEDEVICE, TheengsDecoder::BLE_ID_NUM::TheengsIB01, TheengsDecoder::BLE_ID_NUM::TheengsIB02, + TheengsDecoder::BLE_ID_NUM::TICWATCHGTH, }; // uuid test input [test name] [device name] [uuid] [manufacturer data] [service data]