Skip to content

Commit eb0ad2e

Browse files
DigiHjgbreezer
andauthored
TicWatch GTH (Pro) added as tracker (#512)
Co-authored-by: John <[email protected]>
1 parent 608e00e commit eb0ad2e

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

docs/devices/devices_template.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,8 @@ <h4>
208208
</div>
209209
</header>
210210
<div class="container">
211-
<p>Discover the extensive catalog of Bluetooth devices compatible with Theengs ecosystem, including our MQTT gateway, web
212-
parser,
213-
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
214-
application.</p>
211+
<p>Discover the extensive catalog of Bluetooth devices compatible with Theengs ecosystem, including our MQTT gateway, web parser,
212+
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/).</p>
215213
{table_content_to_replace}
216214
<div class="custom-block warning"><p class="custom-block-title">Note</p> <p>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.</p></div>
217215
</div>

src/decoder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class TheengsDecoder {
135135
TILEN,
136136
TheengsIB01,
137137
TheengsIB02,
138+
TICWATCHGTH,
138139
JAALEE,
139140
APPLEWATCH,
140141
APPLEDEVICE,

src/devices.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ const char* _devices[][2] = {
201201
{_tracker_json_tilename, _tracker_json_props},
202202
{_tracker_json_theengs01, _tracker_json_props},
203203
{_tracker_json_theengs02, _tracker_json_props},
204+
{_tracker_json_TICWATCHGTH, _tracker_json_props},
204205
{_JAALEE_json, _JAALEE_json_props},
205206
{_APPLEWATCH_json, _APPLEWATCH_json_props},
206207
{_APPLEDEVICE_json, _APPLEDEVICE_json_props},

src/devices/tracker_json.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,21 @@ const char* _tracker_json_theengs02 = "{\"brand\":\"Theengs\",\"model\":\"iBeaco
118118
}
119119
})"""";*/
120120

121+
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\"]}}}";
122+
/*R""""(
123+
{
124+
"brand":"Mobvoi",
125+
"model":"TicWatch GTH (Pro)",
126+
"model_id":"TICWATCHGTH",
127+
"tag":"100b",
128+
"condition":["name", "index", 0, "TicWatch GTH"],
129+
"properties":{
130+
"device":{
131+
"decoder":["static_value", "TicWatch GTH (Pro) Tracker"]
132+
}
133+
}
134+
})"""";*/
135+
121136
const char* _tracker_json_props = "{\"properties\":{\"device\":{\"unit\":\"string\",\"name\":\"tracker device\"}}}";
122137
/*R""""(
123138
{

tests/BLE/test_ble.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ const char* expected_mfg[] = {
144144
"{\"brand\":\"Apple\",\"model\":\"Apple iPhone/iPad\",\"model_id\":\"APPLEDEVICE\",\"type\":\"TRACK\",\"track\":true,\"prmac\":true,\"unlocked\":true}",
145145
"{\"brand\":\"Theengs\",\"model\":\"iBeacon Tracker\",\"model_id\":\"TheengsIB01\",\"type\":\"TRACK\",\"cidc\":false,\"track\":true,\"device\":\"Theengs iBeacon Tracker\"}",
146146
"{\"brand\":\"Theengs\",\"model\":\"iBeacon Tracker\",\"model_id\":\"TheengsIB02\",\"type\":\"TRACK\",\"cidc\":false,\"track\":true,\"prmac\":true,\"device\":\"Theengs iBeacon Tracker\"}",
147+
"{\"brand\":\"Mobvoi\",\"model\":\"TicWatch GTH (Pro)\",\"model_id\":\"TICWATCHGTH\",\"type\":\"TRACK\",\"cidc\":false,\"acts\":true,\"track\":true,\"device\":\"TicWatch GTH (Pro) Tracker\"}",
147148
};
148149

149150
const char* expected_name_uuid_mfgsvcdata[] = {
@@ -538,6 +539,7 @@ const char* test_mfgdata[][3] = {
538539
{"Apple", "iPad", "4c0010050b1c93fbf5"},
539540
{"Theengs", "iBeacon Tracker", "4c000215546865656e67732d69426561636f6e31f644000064"},
540541
{"Theengs", "iBeacon Tracker", "4c000215546865656e67732d69426561636f6e32f644000064"},
542+
{"Mobvoi", "TicWatch GTH Pro", "0000aabbccddeeff"},
541543
};
542544

543545
TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
@@ -665,6 +667,7 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
665667
TheengsDecoder::BLE_ID_NUM::APPLEDEVICE,
666668
TheengsDecoder::BLE_ID_NUM::TheengsIB01,
667669
TheengsDecoder::BLE_ID_NUM::TheengsIB02,
670+
TheengsDecoder::BLE_ID_NUM::TICWATCHGTH,
668671
};
669672

670673
// uuid test input [test name] [device name] [uuid] [manufacturer data] [service data]

0 commit comments

Comments
 (0)