From f4a76a1e24377dc5a8f966a6795fda234cc4ce53 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Wed, 31 Mar 2021 20:35:37 +0200 Subject: [PATCH 1/2] Document PumpInterface.deliverTreatment contract. --- .../info/nightscout/androidaps/interfaces/PumpInterface.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.kt index a57003433a..602acf6bba 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.kt @@ -38,6 +38,12 @@ interface PumpInterface { val reservoirLevel: Double val batteryLevel: Int // in percent as integer + /** + * Request a bolus to be delivered, carbs to be stored on pump or both. + * + * @param detailedBolusInfo it's the caller's responsibility to ensure the request can be satisfied by the pump, + * e.g. DBI will not contain carbs if the pump can't store carbs. + */ fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult fun stopBolusDelivering() fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult From edcdc4c785673051a7f479dd75032a69caa9148a Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Wed, 31 Mar 2021 20:40:29 +0200 Subject: [PATCH 2/2] Revert incorrect Lint suggestion. --- .../info/nightscout/androidaps/db/DatabaseHelperProvider.java | 4 ++-- .../androidaps/interfaces/DatabaseHelperInterface.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java index 6587fb6371..3b3b275506 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java @@ -1,10 +1,10 @@ package info.nightscout.androidaps.db; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.j256.ormlite.dao.CloseableIterator; -import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import java.sql.SQLException; @@ -78,7 +78,7 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface { return MainApp.Companion.getDbHelper().createOrUpdate(tempBasal); } - @NonNull @Override public TemporaryBasal findTempBasalByPumpId(long id) { + @Nullable @Override public TemporaryBasal findTempBasalByPumpId(long id) { return MainApp.Companion.getDbHelper().findTempBasalByPumpId(id); } diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt index 5864bd3754..0b2415260e 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt @@ -30,7 +30,7 @@ interface DatabaseHelperInterface { fun roundDateToSec(date: Long): Long fun createOrUpdateTDD(record: TDD) fun createOrUpdate(tempBasal: TemporaryBasal): Boolean - fun findTempBasalByPumpId(id: Long): TemporaryBasal + fun findTempBasalByPumpId(id: Long): TemporaryBasal? fun getTemporaryBasalsDataFromTime(mills: Long, ascending: Boolean): List fun getExtendedBolusDataFromTime(mills: Long, ascending: Boolean): List fun getProfileSwitchEventsFromTime(from: Long, to: Long, ascending: Boolean): List