|
|
@@ -22,7 +22,7 @@ var targetDevPreNameArr = [
|
|
|
'CL831', //小飞龙心率带 OK
|
|
|
'CL880', //带屏心率带 OK
|
|
|
'CL820', //CL820W 心率胸带 OK
|
|
|
- // 'CL837', //扁平化心率带
|
|
|
+ 'CL837', //扁平化心率带
|
|
|
];
|
|
|
|
|
|
export function getBleDiscovery() {
|
|
|
@@ -201,7 +201,9 @@ export function listenerDeviceFound() {
|
|
|
VendorID = parseInt(new Uint16Array(devices[i].advertisData, 0, 2));
|
|
|
DevType = parseInt(new Uint8Array(devices[i].advertisData, 2, 1));
|
|
|
|
|
|
- if (VendorID == 0xff04 && DevType == 0xa1) { // [新版] CL831 中性版本 RSP 广播
|
|
|
+ // DevType == 0xa1 [新版] CL831 中性版本 RSP 广播
|
|
|
+ // DevType == 0xa2 [新版] CL837 中性版本 RSP 广播
|
|
|
+ if (VendorID == 0xff04 && (DevType == 0xa1 || DevType == 0xa2)) {
|
|
|
Power = parseInt(new Uint8Array(devices[i].advertisData, 8, 1));
|
|
|
HeartRate = parseInt(new Uint8Array(devices[i].advertisData, 7, 1));
|
|
|
Sn = parseInt(devices[i].localName.substr(6, devices[i].localName.length));
|
|
|
@@ -233,9 +235,9 @@ export function listenerDeviceFound() {
|
|
|
dataRcvArr.push(data);
|
|
|
}
|
|
|
}
|
|
|
- /* else {
|
|
|
- console.log(i+': '+JSON.stringify(devices[i]));
|
|
|
- } */
|
|
|
+ // else {
|
|
|
+ // console.log(i+': '+JSON.stringify(devices[i]));
|
|
|
+ // }
|
|
|
}
|
|
|
});
|
|
|
}
|