mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 07:21:40 +02:00
Code Issues Releases Wiki Activity

Move xorChecksum method to base class

Browse Source
This commit is contained in:
Erik Johansson
2018-04-18 22:18:29 +02:00
parent 6978c488e1
commit c7056c880c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -312,6 +312,14 @@ public abstract class BluetoothCommunication {
return stringBuilder.toString();
}
protected byte xorChecksum(byte[] data, int offset, int length) {
byte checksum = 0;
for (int i = offset; i < offset + length; ++i) {
checksum ^= data[i];
}
return checksum;
}
/**
* Test in a byte if a bit is set (1) or not (0)
*

16
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java
View File

@@ -66,7 +66,8 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication {
userId[0], userId[1], (byte) selectedUser.getBodyHeight(), sex,
(byte) selectedUser.getAge(), (byte) 0x55, (byte) 0x5a, (byte) 0x00,
(byte)0x00, display_unit, (byte) 0x03, (byte) 0x00};
user_add_or_query[17] = xor_checksum(user_add_or_query);
user_add_or_query[user_add_or_query.length - 1] =
xorChecksum(user_add_or_query, 0, user_add_or_query.length - 1);
writeBytes(WEIGHT_CMD_SERVICE, WEIGHT_CMD_CHARACTERISTIC, user_add_or_query);
break;
case 1:
@@ -75,8 +76,9 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication {
byte[] set_time = new byte[]{(byte)0x0d, (byte) 0x0d, (byte) 0x11,
unixTime[0], unixTime[1], unixTime[2], unixTime[3],
(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00};
set_time[set_time.length - 1] =
xorChecksum(set_time, 0, set_time.length - 1);
set_time[12] = xor_checksum(set_time);
writeBytes(WEIGHT_CMD_SERVICE, WEIGHT_CMD_CHARACTERISTIC, set_time);
break;
case 2:
@@ -153,14 +155,4 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication {
return uniqueNumber + userId;
}
private byte xor_checksum(byte[] data) {
byte checksum = 0x00;
for (int i=0; i<data.length-1; i++) {
checksum ^= data[i];
}
return checksum;
}
}