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

fix gender sending/send on every value we get

Browse Source
This commit is contained in:
Marco Gittler
2018-11-26 20:13:03 +01:00
parent d21ebe2d10
commit 92c2ef6d25
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java
View File

@@ -51,7 +51,7 @@ public class BluetoothSenssun extends BluetoothCommunication {
private void sendUserData(){ private void sendUserData(){
final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser(); final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser();
byte gender = selectedUser.getGender().isMale() ? (byte)0x01 : (byte)0xf1; byte gender = selectedUser.getGender().isMale() ? (byte)0xf1 : (byte)0x01;
byte height = (byte) selectedUser.getBodyHeight(); // cm byte height = (byte) selectedUser.getBodyHeight(); // cm
byte age = (byte) selectedUser.getAge(); byte age = (byte) selectedUser.getAge();
@@ -76,9 +76,6 @@ public class BluetoothSenssun extends BluetoothCommunication {
sendUserData(); sendUserData();
gotData = 0; gotData = 0;
break; break;
case 1:
//wait for answer
break;
default: default:
// Finish init if everything is done // Finish init if everything is done
return false; return false;
@@ -88,20 +85,8 @@ public class BluetoothSenssun extends BluetoothCommunication {
@Override @Override
protected boolean nextBluetoothCmd(int stateNr) { protected boolean nextBluetoothCmd(int stateNr) {
switch (stateNr) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
sendUserData();
break;
default:
return false; return false;
} }
return true;
}
@Override @Override
protected boolean nextCleanUpCmd(int stateNr) { protected boolean nextCleanUpCmd(int stateNr) {
@@ -121,7 +106,6 @@ public class BluetoothSenssun extends BluetoothCommunication {
Timber.d("meas: %s", measurement); Timber.d("meas: %s", measurement);
addScaleData(measurement); addScaleData(measurement);
gotData = 1; gotData = 1;
nextMachineStateStep();
} }
if (measurement != null && measurement.getWeight() != 0.0 && FatMus == 0x03 && gotData != 2) { if (measurement != null && measurement.getWeight() != 0.0 && FatMus == 0x03 && gotData != 2) {
Timber.d("meas: %s", measurement); Timber.d("meas: %s", measurement);
@@ -138,9 +122,13 @@ public class BluetoothSenssun extends BluetoothCommunication {
int type = weightBytes[6] & 0xff; int type = weightBytes[6] & 0xff;
Timber.d("type %02X", type); Timber.d("type %02X", type);
switch (type) { switch (type) {
case 0xa0:
sendUserData();
break;
case 0xaa: case 0xaa:
float weight = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // kg float weight = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // kg
measurement.setWeight(weight); measurement.setWeight(weight);
sendUserData();
break; break;
case 0xb0: case 0xb0:
float fat = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // % float fat = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // %