caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'omnipod_eros_dev' into show_emalinkl_battery_level

Browse source
This commit is contained in:
Bart Sopers 2020-12-19 02:46:22 +01:00
parent ae33f02382 33eacb284f
commit d621c70719
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
View file

@ -738,10 +738,20 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
status.put("timestamp", DateUtil.toISOString(new Date())); status.put("timestamp", DateUtil.toISOString(new Date()));
pump.put("battery", battery); // BS: Leave battery level out for now as we only have a fixed bogus value
// TODO use RL battery level
//pump.put("battery", battery);
pump.put("status", status); pump.put("status", status);
pump.put("extended", extended); pump.put("extended", extended);
pump.put("reservoir", getReservoirLevel());
// If the reservoir level is over 50 units, we don't know the actual value,
// so only include the reservoir level if it's under 50 units
double reservoirLevel = getReservoirLevel();
if (reservoirLevel <= OmnipodConstants.MAX_RESERVOIR_READING) {
pump.put("reservoir", reservoirLevel);
}
pump.put("clock", DateUtil.toISOString(new Date())); pump.put("clock", DateUtil.toISOString(new Date()));
} catch (JSONException e) { } catch (JSONException e) {
aapsLogger.error(LTag.PUMP, "Unhandled exception", e); aapsLogger.error(LTag.PUMP, "Unhandled exception", e);
@ -794,8 +804,12 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
ret += "Extended: " + activeExtendedBolus.toString() + "\n"; ret += "Extended: " + activeExtendedBolus.toString() + "\n";
} }
ret += "Reserv: " + (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+U" : DecimalFormatter.to0Decimal(getReservoirLevel()) + "U") + "\n"; ret += "Reserv: " + (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+U" : DecimalFormatter.to0Decimal(getReservoirLevel()) + "U") + "\n";
ret += "Batt: " + getBatteryLevel();
return ret; // BS leave out for now as we only have a bogus default value
// TODO use RL battery
// ret += "Batt: " + getBatteryLevel();
return ret.trim();
} }
@Override @Override