From 07a1ebe6fee5d8ef4796d2dbc529923c60ad072f Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sun, 29 Apr 2018 23:38:32 +0200
Subject: [PATCH] Wait for scale to ack unit set command before continuing

Otherwise it seems like it doesn't take effect.
---
 .../core/bluetooth/BluetoothBeurerSanitas.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java
index 8ee52b33..f6458f72 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java
@@ -177,10 +177,13 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
                 setUnitCommand();
                 break;
             case 5:
+                // Wait for "unit" ack from scale
+                break;
+            case 6:
                 // Request general user information
                 writeBytes(new byte[]{(byte) startByte, (byte) 0x33});
                 break;
-            case 6:
+            case 7:
                 // Wait for ack of all users
                 if (seenUsers.size() < countRegisteredScaleUsers || (countRegisteredScaleUsers == -1)) {
                     // Request this state again
@@ -233,7 +236,7 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
                 Timber.d("scaleuserid: %d, registered users: %d, extracted users: %d",
                         currentScaleUserId, countRegisteredScaleUsers, seenUsers.size());
                 break;
-            case 7:
+            case 8:
                 break;
             default:
                 // Finish init if everything is done
@@ -288,8 +291,9 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
     @Override
     public void onBluetoothDataChange(BluetoothGatt bluetoothGatt, BluetoothGattCharacteristic gattCharacteristic) {
         byte[] data = gattCharacteristic.getValue();
-        if (data.length == 0)
+        if (data.length == 0) {
             return;
+        }
 
         if ((data[0] & 0xFF) == getAlternativeStartByte(6) && (data[1] & 0xFF) == 0x00) {
             Timber.d("ACK Scale is ready");
@@ -297,6 +301,12 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
             return;
         }
 
+        if ((data[0] & 0xFF) == startByte && (data[1] & 0xFF) == 0xf0 && data[2] == 0x4d) {
+            Timber.d("ACK Unit set");
+            nextMachineStateStep();
+            return;
+        }
+
         if ((data[0] & 0xFF) == startByte && (data[1] & 0xFF) == 0xf0 && data[2] == 0x33) {
             Timber.d("ACK Got general user information");