Implement getBatteryLevel() in PumpInterface and for all pump plugins

app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java

@@ -35,6 +35,8 @@ public interface PumpInterface {
 
     double getReservoirLevel();
 
+    int getBatteryLevel();  // in percent as integer
+
     PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo);
     void stopBolusDelivering();
     PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew);

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java

@@ -428,6 +428,18 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return pump.reservoirLevel;
     }
 
+    @Override
+    public int getBatteryLevel() {
+        switch (pump.state.batteryState) {
+            case PumpState.EMPTY:
+                return 0;
+            case PumpState.LOW:
+                return 25;
+            default:
+                return 100;
+        }
+    }
+
     private static BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
         EventOverviewBolusProgress event = EventOverviewBolusProgress.getInstance();
         switch (state) {

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

@@ -153,6 +153,9 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     @Override
     public double getReservoirLevel() { return pump.reservoirRemainingUnits; }
 
+    @Override
+    public int getBatteryLevel() { return pump.batteryRemaining; }
+
     @Override
     public void stopBolusDelivering() {
         if (sExecutionService == null) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -357,6 +357,9 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         return pump.reservoirRemainingUnits;
     }
 
+    @Override
+    public int getBatteryLevel() { return pump.batteryRemaining; }
+
     @Override
     public synchronized PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPlugin.java

@@ -388,6 +388,9 @@ public class InsightPlugin extends PluginBase implements PumpInterface, Constrai
     @Override
     public double getReservoirLevel() { return reservoirInUnits; }
 
+    @Override
+    public int getBatteryLevel() { return batteryPercent; }
+
     public String getBaseBasalRateString() {
         final DecimalFormat df = new DecimalFormat("#.##");
         return df.format(basalRate);

app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java

@@ -132,6 +132,9 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     @Override
     public double getReservoirLevel() { return -1; }
 
+    @Override
+    public int getBatteryLevel() { return -1; }
+
     @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         PumpEnactResult result = new PumpEnactResult();

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -200,6 +200,9 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
     @Override
     public double getReservoirLevel() { return reservoirInUnits; }
 
+    @Override
+    public int getBatteryLevel() { return batteryPercent; }
+
     @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         PumpEnactResult result = new PumpEnactResult();