mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-22 08:13:43 +02:00
Code Issues Releases Wiki Activity

Update 1byone handling as detailed in #159

Browse Source
This commit is contained in:
Erik Johansson
2018-04-18 22:33:37 +02:00
parent c7056c880c
commit e71a4258ba
1 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java
View File

@@ -21,9 +21,11 @@ import android.bluetooth.BluetoothGattCharacteristic;
import android.content.Context; import android.content.Context;
import android.widget.Toast; import android.widget.Toast;
import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters;
import java.util.Date;
import java.util.UUID; import java.util.UUID;
public class BluetoothOneByone extends BluetoothCommunication { public class BluetoothOneByone extends BluetoothCommunication {
@@ -41,7 +43,7 @@ public class BluetoothOneByone extends BluetoothCommunication {
@Override @Override
public String driverName() { public String driverName() {
return "1byone scale"; return "1byone";
} }
@Override @Override
@@ -54,11 +56,35 @@ public class BluetoothOneByone extends BluetoothCommunication {
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CUSTOM_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG); setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CUSTOM_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 2: case 2:
byte[] magicBytes = {(byte)0xfd,(byte)0x37,(byte)0x01,(byte)0x01,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0xca}; byte[] magicBytes = {(byte)0xfd,(byte)0x37,(byte)0x01,(byte)0x01,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00};
magicBytes[magicBytes.length - 1] =
xorChecksum(magicBytes, 0, magicBytes.length - 1);
writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, magicBytes); writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, magicBytes);
break; break;
case 3: case 3:
byte[] magicBytes2 = {(byte)0xfe, (byte)0x01, (byte)0x01, (byte)0x00, (byte)0xaa, (byte)0x2d, (byte)0x02, (byte)0x85}; final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser();
byte userId = (byte) 0x01;
byte sex = selectedUser.getGender().isMale() ? (byte) 0x01 : (byte) 0x00;
// 0x00 = ordinary, 0x01 = amateur, 0x02 = professional
byte exerciseLevel = (byte) 0x00;
byte height = (byte) selectedUser.getBodyHeight();
byte age = (byte) selectedUser.getAge();
byte unit = 0x01; // kg
switch (selectedUser.getScaleUnit()) {
case LB:
unit = 0x02;
break;
case ST:
unit = 0x04;
break;
}
byte[] magicBytes2 = {(byte) 0xfe, userId, sex, exerciseLevel, height, age, unit, (byte) 0x00};
magicBytes2[magicBytes2.length - 1] =
xorChecksum(magicBytes2, 1, magicBytes2.length - 2);
writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, magicBytes2); writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, magicBytes2);
break; break;
default: default:
@@ -84,22 +110,20 @@ public class BluetoothOneByone extends BluetoothCommunication {
Toast.makeText(context, "Log Data: " + byteInHex(data), Toast.LENGTH_LONG).show(); Toast.makeText(context, "Log Data: " + byteInHex(data), Toast.LENGTH_LONG).show();
if (data != null && data.length > 0) {
// if data is valid data // if data is valid data
if (data.length == 16) { if (data != null && data.length == 16) {
parseBytes(data); parseBytes(data);
} }
} }
}
private void parseBytes(byte[] weightBytes) { private void parseBytes(byte[] weightBytes) {
float weight = (float) (((weightBytes[4] & 0xFF) << 8) | (weightBytes[5] & 0xFF)) / 10.0f; // kg float weight = Converters.fromUnsignedInt16Be(weightBytes, 4) / 10.0f; // kg
float fat = (float)(((weightBytes[6] & 0xFF) << 8) | (weightBytes[7] & 0xFF)) / 10.0f; // % float fat = Converters.fromUnsignedInt16Be(weightBytes, 6) / 10.0f; // %
float bone = (float)(((weightBytes[8] & 0xFF) & 0xFF)) / 10.0f; // % float bone = weightBytes[8] & 0xFF; // %
float muscle = (float)(((weightBytes[9] & 0xFF) << 8) | (weightBytes[10] & 0xFF)) / 10.0f; // % float muscle = Converters.fromUnsignedInt16Be(weightBytes, 9) / 10.0f; // %
float visfat = (float)(((weightBytes[11] & 0xFF) & 0xFF)) / 10.0f; // % float visceralFat = weightBytes[11] & 0xFF; // %
float water = (float)(((weightBytes[12] & 0xFF) << 8) | (weightBytes[13] & 0xFF)) / 10.0f; // % float water = Converters.fromUnsignedInt16Be(weightBytes, 12) / 10.0f; // %
float bmr = (float)(((weightBytes[14] & 0xFF) << 8) | (weightBytes[15] & 0xFF)); // kcal float bmr = Converters.fromUnsignedInt16Be(weightBytes, 14); // kCal
ScaleMeasurement scaleBtData = new ScaleMeasurement(); ScaleMeasurement scaleBtData = new ScaleMeasurement();
@@ -108,7 +132,6 @@ public class BluetoothOneByone extends BluetoothCommunication {
scaleBtData.setMuscle(muscle); scaleBtData.setMuscle(muscle);
scaleBtData.setWater(water); scaleBtData.setWater(water);
scaleBtData.setBone(bone); scaleBtData.setBone(bone);
scaleBtData.setDateTime(new Date());
addScaleData(scaleBtData); addScaleData(scaleBtData);
} }