caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

the same for korean danar

Browse source
This commit is contained in:
Milos Kozak 2017-01-28 21:17:27 +01:00
parent 538e8fd2fa
commit 926a26a724
9 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/SerialIOThread.java
View file

@ -77,10 +77,6 @@ public class SerialIOThread extends Thread {
if (Config.logDanaMessageDetail) if (Config.logDanaMessageDetail)
log.debug("<<<<< " + message.getMessageName() + " " + message.toHexString(extractedBuff)); log.debug("<<<<< " + message.getMessageName() + " " + message.toHexString(extractedBuff));
if (message.getCommand() == 0xF0F1) {
DanaRPlugin.getDanaRPump().isNewPump = true;
log.debug("New firmware confirmed");
}
// process the message content // process the message content
message.received = true; message.received = true;

1
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/Services/ExecutionService.java
View file

@ -279,7 +279,6 @@ public class ExecutionService extends Service {
MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(); MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
MsgCheckValue checkValue = new MsgCheckValue(); MsgCheckValue checkValue = new MsgCheckValue();
if (danaRPump.isNewPump) { if (danaRPump.isNewPump) {
mSerialIOThread.sendMessage(checkValue); mSerialIOThread.sendMessage(checkValue);
if (!checkValue.received) { if (!checkValue.received) {

3
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgCheckValue.java
View file

@ -24,6 +24,9 @@ public class MsgCheckValue extends MessageBase {
public void handleMessage(byte[] bytes) { public void handleMessage(byte[] bytes) {
DanaRPump pump = DanaRPlugin.getDanaRPump(); DanaRPump pump = DanaRPlugin.getDanaRPump();
DanaRPlugin.getDanaRPump().isNewPump = true;
log.debug("New firmware confirmed");
pump.model = intFromBuff(bytes, 0, 1); pump.model = intFromBuff(bytes, 0, 1);
pump.protocol = intFromBuff(bytes, 1, 1); pump.protocol = intFromBuff(bytes, 1, 1);
pump.productCode = intFromBuff(bytes, 2, 1); pump.productCode = intFromBuff(bytes, 2, 1);

37
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java
View file

@ -60,6 +60,7 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase {
TextView batteryView; TextView batteryView;
TextView reservoirView; TextView reservoirView;
TextView iobView; TextView iobView;
TextView firmwareView;
Button viewProfileButton; Button viewProfileButton;
Button historyButton; Button historyButton;
@ -100,6 +101,7 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase {
batteryView = (TextView) view.findViewById(R.id.danar_battery); batteryView = (TextView) view.findViewById(R.id.danar_battery);
reservoirView = (TextView) view.findViewById(R.id.danar_reservoir); reservoirView = (TextView) view.findViewById(R.id.danar_reservoir);
iobView = (TextView) view.findViewById(R.id.danar_iob); iobView = (TextView) view.findViewById(R.id.danar_iob);
firmwareView = (TextView) view.findViewById(R.id.danar_firmware);
viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile); viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
historyButton = (Button) view.findViewById(R.id.danar_history); historyButton = (Button) view.findViewById(R.id.danar_history);
@ -192,24 +194,24 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase {
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@Override @Override
public void run() { public void run() {
DanaRKoreanPump pump = DanaRKoreanPlugin.getDanaRPump();
if (DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime() != 0) { if (pump.lastConnection.getTime() != 0) {
Long agoMsec = new Date().getTime() - DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime(); Long agoMsec = new Date().getTime() - pump.lastConnection.getTime();
int agoMin = (int) (agoMsec / 60d / 1000d); int agoMin = (int) (agoMsec / 60d / 1000d);
lastConnectionView.setText(DateUtil.timeString(DanaRKoreanPlugin.getDanaRPump().lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")"); lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")");
SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
} }
// if (DanaRKoreanPlugin.getDanaRPump().lastBolusTime.getTime() != 0) { // if (pump.lastBolusTime.getTime() != 0) {
// Long agoMsec = new Date().getTime() - DanaRKoreanPlugin.getDanaRPump().lastBolusTime.getTime(); // Long agoMsec = new Date().getTime() - pump.lastBolusTime.getTime();
// double agoHours = agoMsec / 60d / 60d / 1000d; // double agoHours = agoMsec / 60d / 60d / 1000d;
// if (agoHours < 6) // max 6h back // if (agoHours < 6) // max 6h back
// lastBolusView.setText(formatTime.format(DanaRKoreanPlugin.getDanaRPump().lastBolusTime) + " (" + DecimalFormatter.to1Decimal(agoHours) + " " + getString(R.string.hoursago) + ") " + DecimalFormatter.to2Decimal(danaRKoreanPlugin.getDanaRPump().lastBolusAmount) + " U"); // lastBolusView.setText(formatTime.format(pump.lastBolusTime) + " (" + DecimalFormatter.to1Decimal(agoHours) + " " + getString(R.string.hoursago) + ") " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + " U");
// else lastBolusView.setText(""); // else lastBolusView.setText("");
// } // }
dailyUnitsView.setText(DecimalFormatter.to0Decimal(DanaRKoreanPlugin.getDanaRPump().dailyTotalUnits) + " / " + DanaRKoreanPlugin.getDanaRPump().maxDailyTotalUnits + " U"); dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
SetWarnColor.setColor(dailyUnitsView, DanaRKoreanPlugin.getDanaRPump().dailyTotalUnits, DanaRKoreanPlugin.getDanaRPump().maxDailyTotalUnits * 0.75d, DanaRKoreanPlugin.getDanaRPump().maxDailyTotalUnits * 0.9d); SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
basaBasalRateView.setText("( " + (DanaRKoreanPlugin.getDanaRPump().activeProfile + 1) + " ) " + DecimalFormatter.to2Decimal(danaRKoreanPlugin.getBaseBasalRate()) + " U/h"); basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " ) " + DecimalFormatter.to2Decimal(danaRKoreanPlugin.getBaseBasalRate()) + " U/h");
if (danaRKoreanPlugin.isRealTempBasalInProgress()) { if (danaRKoreanPlugin.isRealTempBasalInProgress()) {
tempBasalView.setText(danaRKoreanPlugin.getRealTempBasal().toString()); tempBasalView.setText(danaRKoreanPlugin.getRealTempBasal().toString());
} else { } else {
@ -220,11 +222,16 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase {
} else { } else {
extendedBolusView.setText(""); extendedBolusView.setText("");
} }
reservoirView.setText(DecimalFormatter.to0Decimal(DanaRKoreanPlugin.getDanaRPump().reservoirRemainingUnits) + " / 300 U"); reservoirView.setText(DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + " / 300 U");
SetWarnColor.setColorInverse(reservoirView, DanaRKoreanPlugin.getDanaRPump().reservoirRemainingUnits, 50d, 20d); SetWarnColor.setColorInverse(reservoirView, pump.reservoirRemainingUnits, 50d, 20d);
batteryView.setText("{fa-battery-" + (DanaRKoreanPlugin.getDanaRPump().batteryRemaining / 25) + "}"); batteryView.setText("{fa-battery-" + (pump.batteryRemaining / 25) + "}");
SetWarnColor.setColorInverse(batteryView, DanaRKoreanPlugin.getDanaRPump().batteryRemaining, 51d, 26d); SetWarnColor.setColorInverse(batteryView, pump.batteryRemaining, 51d, 26d);
iobView.setText(DanaRKoreanPlugin.getDanaRPump().iob + " U"); iobView.setText(pump.iob + " U");
if (pump.isNewPump) {
firmwareView.setText(String.format(getString(R.string.danar_model), pump.model, pump.protocol, pump.productCode));
} else {
firmwareView.setText("OLD");
}
} }
}); });

2
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java
View file

@ -36,7 +36,7 @@ public class DanaRKoreanPump {
public String serialNumber = ""; public String serialNumber = "";
public Date shippingDate = new Date(0); public Date shippingDate = new Date(0);
public String shippingCountry = ""; public String shippingCountry = "";
public boolean isNewPump = false; public boolean isNewPump = true;
public int password = -1; public int password = -1;
public Date pumpTime = new Date(0); public Date pumpTime = new Date(0);

4
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/SerialIOThread.java
View file

@ -176,6 +176,10 @@ public class SerialIOThread extends Thread {
} }
if (!message.received) { if (!message.received) {
log.warn("Reply not received " + message.getMessageName()); log.warn("Reply not received " + message.getMessageName());
if (message.getCommand() == 0xF0F1) {
DanaRKoreanPlugin.getDanaRPump().isNewPump = false;
log.debug("Old firmware detected");
}
} }
scheduleDisconnection(); scheduleDisconnection();
} }

10
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/Services/ExecutionService.java
View file

@ -222,6 +222,7 @@ public class ExecutionService extends Service {
if (!getPumpStatus()) { if (!getPumpStatus()) {
mSerialIOThread.disconnect("getPumpStatus failed"); mSerialIOThread.disconnect("getPumpStatus failed");
waitMsec(3000); waitMsec(3000);
getBTSocketForSelectedPump();
} }
} }
} }
@ -272,7 +273,14 @@ public class ExecutionService extends Service {
MsgStatusBasic statusBasicMsg = new MsgStatusBasic(); MsgStatusBasic statusBasicMsg = new MsgStatusBasic();
MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(); MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal();
MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(); MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
MsgCheckValue checkValue = new MsgCheckValue();
if (danaRKoreanPump.isNewPump) {
mSerialIOThread.sendMessage(checkValue);
if (!checkValue.received) {
return false;
}
}
mSerialIOThread.sendMessage(new MsgSettingShippingInfo()); // TODO: show it somewhere mSerialIOThread.sendMessage(new MsgSettingShippingInfo()); // TODO: show it somewhere
mSerialIOThread.sendMessage(tempStatusMsg); // do this before statusBasic because here is temp duration mSerialIOThread.sendMessage(tempStatusMsg); // do this before statusBasic because here is temp duration
@ -280,8 +288,6 @@ public class ExecutionService extends Service {
//mSerialIOThread.sendMessage(statusMsg); //mSerialIOThread.sendMessage(statusMsg);
mSerialIOThread.sendMessage(statusBasicMsg); mSerialIOThread.sendMessage(statusBasicMsg);
mSerialIOThread.sendMessage(new MsgCheckValue());
// if (!statusMsg.received) { // if (!statusMsg.received) {
// mSerialIOThread.sendMessage(statusMsg); // mSerialIOThread.sendMessage(statusMsg);
// } // }

3
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/comm/MsgCheckValue.java
View file

@ -25,6 +25,9 @@ public class MsgCheckValue extends MessageBase {
public void handleMessage(byte[] bytes) { public void handleMessage(byte[] bytes) {
DanaRKoreanPump pump = DanaRKoreanPlugin.getDanaRPump(); DanaRKoreanPump pump = DanaRKoreanPlugin.getDanaRPump();
DanaRKoreanPlugin.getDanaRPump().isNewPump = true;
log.debug("New firmware confirmed");
pump.model = intFromBuff(bytes, 0, 1); pump.model = intFromBuff(bytes, 0, 1);
pump.protocol = intFromBuff(bytes, 1, 1); pump.protocol = intFromBuff(bytes, 1, 1);
pump.productCode = intFromBuff(bytes, 2, 1); pump.productCode = intFromBuff(bytes, 2, 1);

4
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/comm/MsgSettingShippingInfo.java
View file

@ -25,10 +25,6 @@ public class MsgSettingShippingInfo extends MessageBase {
pump.serialNumber = stringFromBuff(bytes, 0, 10); pump.serialNumber = stringFromBuff(bytes, 0, 10);
pump.shippingDate = dateFromBuff(bytes, 10); pump.shippingDate = dateFromBuff(bytes, 10);
pump.shippingCountry = asciiStringFromBuff(bytes, 13, 3); pump.shippingCountry = asciiStringFromBuff(bytes, 13, 3);
if (pump.shippingDate.getTime() > new Date(116, 4, 1).getTime()) {
pump.isNewPump = true;
} else
pump.isNewPump = false;
if (Config.logDanaMessageDetail) { if (Config.logDanaMessageDetail) {
log.debug("Serial number: " + pump.serialNumber); log.debug("Serial number: " + pump.serialNumber);
log.debug("Shipping date: " + pump.shippingDate); log.debug("Shipping date: " + pump.shippingDate);