From fe723007900db2197376c773808a54d648dc057c Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 18 Jul 2016 14:17:24 +0200 Subject: [PATCH] typo --- .../nightscout/androidaps/plugins/DanaR/SerialIOThread.java | 2 +- .../androidaps/plugins/DanaR/Services/ExecutionService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/SerialIOThread.java index a82af4997a..3293690f60 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/SerialIOThread.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/SerialIOThread.java @@ -68,7 +68,7 @@ public class SerialIOThread extends Thread { int command = (extractedBuff[5] & 0xFF) | ((extractedBuff[4] << 8) & 0xFF00); MessageBase message; - if (processedMessage != null & processedMessage.getCommand() == command) { + if (processedMessage != null && processedMessage.getCommand() == command) { message = processedMessage; } else { // get it from hash table diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/Services/ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/Services/ExecutionService.java index 4e9c90b3ee..6587b0c3e0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/Services/ExecutionService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/Services/ExecutionService.java @@ -241,9 +241,9 @@ public class ExecutionService extends Service { mSerialIOThread.sendMessage(exStatusMsg); mSerialIOThread.sendMessage(statusMsg); mSerialIOThread.sendMessage(statusBasicMsg); + mSerialIOThread.sendMessage(new MsgSettingShippingInfo()); // TODO: show it somewhere if (danaRPump.isNewPump) { - mSerialIOThread.sendMessage(new MsgSettingShippingInfo()); mSerialIOThread.sendMessage(new MsgCheckValue()); }