caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

danaR changes

Browse source
This commit is contained in:
PoweRGbg 2018-06-13 11:04:32 +03:00
parent 5634aabd9f
commit 71c474ef5f
4 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
View file

@ -59,6 +59,7 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
.pluginName(R.string.danarspump) .pluginName(R.string.danarspump)
.shortName(R.string.danarpump_shortname) .shortName(R.string.danarpump_shortname)
.preferencesId(R.xml.pref_danars) .preferencesId(R.xml.pref_danars)
.description(R.string.description_pump_dana_r)
); );
} }

29
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
View file

@ -162,19 +162,24 @@ public class DanaRFragment extends SubscriberFragment {
activity.runOnUiThread( activity.runOnUiThread(
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
if (c.sStatus == EventPumpStatusChanged.CONNECTING) synchronized(DanaRFragment.this){
btConnectionView.setText("{fa-bluetooth-b spin} " + c.sSecondsElapsed + "s");
else if (c.sStatus == EventPumpStatusChanged.CONNECTED)
btConnectionView.setText("{fa-bluetooth}");
else if (c.sStatus == EventPumpStatusChanged.DISCONNECTED)
btConnectionView.setText("{fa-bluetooth-b}");
if (!status.equals("")) { if(btConnectionView == null || pumpStatusView == null || pumpStatusLayout == null ) return;
pumpStatusView.setText(status);
pumpStatusLayout.setVisibility(View.VISIBLE); if (c.sStatus == EventPumpStatusChanged.CONNECTING)
} else { btConnectionView.setText("{fa-bluetooth-b spin} " + c.sSecondsElapsed + "s");
pumpStatusLayout.setVisibility(View.GONE); else if (c.sStatus == EventPumpStatusChanged.CONNECTED)
btConnectionView.setText("{fa-bluetooth}");
else if (c.sStatus == EventPumpStatusChanged.DISCONNECTED)
btConnectionView.setText("{fa-bluetooth-b}");
if (!status.equals("")) {
pumpStatusView.setText(status);
pumpStatusLayout.setVisibility(View.VISIBLE);
} else {
pumpStatusLayout.setVisibility(View.GONE);
}
} }
} }
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
View file

@ -382,6 +382,6 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
@Override @Override
public PumpEnactResult setUserOptions() { public PumpEnactResult setUserOptions() {
return null; return sExecutionService.setUserOptions();
} }
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
View file

@ -161,7 +161,7 @@ public class DanaRPump {
public int lowReservoirRate; public int lowReservoirRate;
public int cannulaVolume; public int cannulaVolume;
public int refillAmount; public int refillAmount;
public byte[] userOptionsFrompump;
public double initialBolusAmount; public double initialBolusAmount;
// Bolus settings // Bolus settings
public int bolusCalculationOption; public int bolusCalculationOption;