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

Minor cleanup

Browse Source
This commit is contained in:
Erik Johansson
2018-04-07 20:53:06 +02:00
parent 9e8625002a
commit 2699d63a51
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java
View File

@@ -203,7 +203,7 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser(); final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser();
// We can only use up to 3 characters and have to handle them uppercase // We can only use up to 3 characters and have to handle them uppercase
int maxIdx = selectedUser.getUserName().length() >= 3 ? 3 : selectedUser.getUserName().length(); int maxIdx = Math.min(3, selectedUser.getUserName().length());
byte[] nick = selectedUser.getUserName().toUpperCase().substring(0, maxIdx).getBytes(); byte[] nick = selectedUser.getUserName().toUpperCase().substring(0, maxIdx).getBytes();
byte activity = 2; // activity level: 1 - 5 byte activity = 2; // activity level: 1 - 5
@@ -231,8 +231,6 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
} }
Log.d(TAG, "scaleuserid:" + currentScaleUserId + " registered users: " + countRegisteredScaleUsers + Log.d(TAG, "scaleuserid:" + currentScaleUserId + " registered users: " + countRegisteredScaleUsers +
" extracted users: " + seenUsers.size()); " extracted users: " + seenUsers.size());
break; break;
case 6: case 6:
break; break;
@@ -241,7 +239,6 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
return false; return false;
} }
return true; return true;
} }
@@ -308,8 +305,9 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
countRegisteredScaleUsers = count; countRegisteredScaleUsers = count;
// Check if any scale user is registered // Check if any scale user is registered
if (count == 0) if (count == 0) {
currentScaleUserId = 0; // Unknown user currentScaleUserId = 0; // Unknown user
}
maxRegisteredScaleUser = maxUsers; maxRegisteredScaleUser = maxUsers;
nextMachineStateStep(); nextMachineStateStep();
@@ -388,8 +386,8 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
Log.d(TAG, "BatteryLevel:" + batteryLevel + " weightThreshold: " + weightThreshold + Log.d(TAG, "BatteryLevel:" + batteryLevel + " weightThreshold: " + weightThreshold +
" BodyFatThresh: " + bodyFatThreshold + " Unit: " + unit + " userExists: " + userExists + " BodyFatThresh: " + bodyFatThreshold + " Unit: " + unit + " userExists: " + userExists +
" UserReference Weight Exists:" + userReferWeightExists + " UserMeasurementExists " + userMeasurementExist + " UserReference Weight Exists: " + userReferWeightExists + " UserMeasurementExists: " + userMeasurementExist +
" scaleVersion" + scaleVersion); " scaleVersion: " + scaleVersion);
return; return;
} }