caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- final changes to pumpSync integration

Browse source 
- removed commented code that is not used
This commit is contained in:
Andy Rozman 2021-05-08 15:43:19 +01:00
parent f285b59b44
commit 2b43ee186f
4 changed files with 37 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
View file

@ -4,11 +4,9 @@ import com.google.gson.Gson
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import info.nightscout.androidaps.data.DetailedBolusInfo import info.nightscout.androidaps.data.DetailedBolusInfo
import info.nightscout.androidaps.db.TemporaryBasal
import info.nightscout.androidaps.interfaces.PumpSync import info.nightscout.androidaps.interfaces.PumpSync
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.androidaps.utils.sharedPreferences.SP import info.nightscout.androidaps.utils.sharedPreferences.SP
import java.lang.reflect.Type import java.lang.reflect.Type
import java.util.* import java.util.*
@ -84,6 +82,7 @@ class PumpSyncStorage @Inject constructor(
return pumpSyncStorage[BOLUS]!!; return pumpSyncStorage[BOLUS]!!;
} }
fun getTBRs() : MutableList<PumpDbEntry> { fun getTBRs() : MutableList<PumpDbEntry> {
return pumpSyncStorage[TBR]!!; return pumpSyncStorage[TBR]!!;
} }
@ -130,7 +129,7 @@ class PumpSyncStorage @Inject constructor(
carbsDto.date, carbsDto.carbs, carbsDto.serialNumber, result)) carbsDto.date, carbsDto.carbs, carbsDto.serialNumber, result))
} }
// TODO
fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator) : Boolean { fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator) : Boolean {
val timenow : Long = System.currentTimeMillis() val timenow : Long = System.currentTimeMillis()
val temporaryId = creator.generateTempId(timenow) val temporaryId = creator.generateTempId(timenow)
@ -157,19 +156,20 @@ class PumpSyncStorage @Inject constructor(
} }
fun removeBolusWithTemporaryId(temporaryId: Long) { fun removeBolusWithTemporaryId(temporaryId: Long) {
val bolusList = removeTemporaryId(temporaryId, pumpSyncStorage[BOLUS]!!) val bolusList = removeTemporaryId(temporaryId, pumpSyncStorage[BOLUS]!!)
pumpSyncStorage[BOLUS] = bolusList pumpSyncStorage[BOLUS] = bolusList
saveStorage() saveStorage()
} }
fun removeTemporaryBasalWithTemporaryId(temporaryId: Long) { fun removeTemporaryBasalWithTemporaryId(temporaryId: Long) {
val tbrList = removeTemporaryId(temporaryId, pumpSyncStorage[TBR]!!) val tbrList = removeTemporaryId(temporaryId, pumpSyncStorage[TBR]!!)
pumpSyncStorage[TBR] = tbrList pumpSyncStorage[TBR] = tbrList
saveStorage() saveStorage()
} }
private fun removeTemporaryId(temporaryId: Long, list: MutableList<PumpDbEntry>): MutableList<PumpDbEntry> { private fun removeTemporaryId(temporaryId: Long, list: MutableList<PumpDbEntry>): MutableList<PumpDbEntry> {
var dbEntry: PumpDbEntry? = null var dbEntry: PumpDbEntry? = null

4
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
View file

@ -9,7 +9,6 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.core.R import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.data.DetailedBolusInfo import info.nightscout.androidaps.data.DetailedBolusInfo
import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.data.PumpEnactResult
import info.nightscout.androidaps.db.TemporaryBasal
import info.nightscout.androidaps.events.EventAppExit import info.nightscout.androidaps.events.EventAppExit
import info.nightscout.androidaps.events.EventCustomActionsChanged import info.nightscout.androidaps.events.EventCustomActionsChanged
import info.nightscout.androidaps.extensions.convertedToAbsolute import info.nightscout.androidaps.extensions.convertedToAbsolute
@ -28,7 +27,6 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs
import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator
import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.DateUtil
import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
@ -39,7 +37,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import java.util.*
/** /**
* Created by andy on 23.04.18. * Created by andy on 23.04.18.

11
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
View file

@ -11,7 +11,6 @@ import info.nightscout.androidaps.activities.ErrorHelperActivity.Companion.runAl
import info.nightscout.androidaps.data.DetailedBolusInfo import info.nightscout.androidaps.data.DetailedBolusInfo
import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.data.PumpEnactResult
import info.nightscout.androidaps.db.Source import info.nightscout.androidaps.db.Source
import info.nightscout.androidaps.db.TemporaryBasal
import info.nightscout.androidaps.events.EventRefreshOverview import info.nightscout.androidaps.events.EventRefreshOverview
import info.nightscout.androidaps.interfaces.* import info.nightscout.androidaps.interfaces.*
import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
@ -828,7 +827,6 @@ class MedtronicPumpPlugin @Inject constructor(
} }
medtronicHistoryData.processNewHistoryData() medtronicHistoryData.processNewHistoryData()
medtronicHistoryData.finalizeNewHistoryRecords() medtronicHistoryData.finalizeNewHistoryRecords()
// this.medtronicHistoryData.setLastHistoryRecordTime(this.lastPumpHistoryEntry.atechDateTime);
} }
private fun readPumpHistoryLogic() { private fun readPumpHistoryLogic() {
@ -1004,15 +1002,6 @@ class MedtronicPumpPlugin @Inject constructor(
finishAction("TBR") finishAction("TBR")
return if (response!!) { return if (response!!) {
aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - Cancel TBR successful.") aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - Cancel TBR successful.")
// val tempBasal = TemporaryBasal(injector) //
// .date(System.currentTimeMillis()) //
// .duration(0) //
// .source(Source.USER)
//
// activePlugin.activeTreatments.addToHistoryTempBasal(tempBasal)
// TODO need to find solution for this !?
//val tempData = PumpDbEntryTBR(0.0, true, 0, TemporaryBasalType.NORMAL)
val runningTBR = medtronicPumpStatus.runningTBR val runningTBR = medtronicPumpStatus.runningTBR

271
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
View file

@ -12,7 +12,9 @@ import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry
import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryBolus
import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs
import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
@ -644,8 +646,6 @@ class MedtronicHistoryData @Inject constructor(
val tbrEntry = tempBasalProcessDTO.itemOne!!.getDecodedDataEntry("Object") as TempBasalPair val tbrEntry = tempBasalProcessDTO.itemOne!!.getDecodedDataEntry("Object") as TempBasalPair
//removeCancelTBRTemporaryRecord(tempBasalProcessDTO, tbrRecords)
if (entryWithTempId!=null) { if (entryWithTempId!=null) {
val result = pumpSync.syncTemporaryBasalWithTempId( val result = pumpSync.syncTemporaryBasalWithTempId(
tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime), tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
@ -688,124 +688,43 @@ class MedtronicHistoryData @Inject constructor(
tempBasalProcessDTO.atechDateTime, tempBasalProcessDTO.pumpId, tempBasalProcessDTO.atechDateTime, tempBasalProcessDTO.pumpId,
tbrEntry.insulinRate, (if (tbrEntry.isPercent) "%" else "U"), tempBasalProcessDTO.duration, tbrEntry.insulinRate, (if (tbrEntry.isPercent) "%" else "U"), tempBasalProcessDTO.duration,
medtronicPumpStatus.serialNumber!!, result)) medtronicPumpStatus.serialNumber!!, result))
if (medtronicPumpStatus.runningTBR!=null) {
if (!isTBRActive(medtronicPumpStatus.runningTBR!!)) {
medtronicPumpStatus.runningTBR = null
}
}
if (isTBRActive(tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime), tempBasalProcessDTO.duration)) {
if (medtronicPumpStatus.runningTBR == null) {
medtronicPumpStatus.runningTBR = PumpDbEntry(0L,
tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
medtronicPumpStatus.pumpType,
medtronicPumpStatus.serialNumber!!,
null,
PumpDbEntryTBR(tbrEntry.insulinRate, !tbrEntry.isPercent, tempBasalProcessDTO.duration, PumpSync.TemporaryBasalType.NORMAL),
tempBasalProcessDTO.pumpId)
}
}
} }
} // for } // for
} // collection } // collection
} }
private fun removeCancelTBRTemporaryRecord(tempBasalProcessDTO: TempBasalProcessDTO, tbrRecords: MutableList<PumpDbEntry>) {
if (tempBasalProcessDTO.cancelPresent) {
//val dateTime : Long = DateTimeUtil.getMillisFromATDWithAddedMinutes(tempBasalProcessDTO.atechDateTime, tempBasalProcessDTO.duration)
val dbEntry = findDbEntry(tempBasalProcessDTO.itemTwo!!, tbrRecords)
if (dbEntry!=null) {
if (dbEntry.tbrData!!.durationInMinutes == 0) {
pumpSync.invalidateTemporaryBasalWithTempId(dbEntry.temporaryId)
pumpSyncStorage.removeTemporaryBasalWithTemporaryId(dbEntry.temporaryId)
tbrRecords.remove(dbEntry)
}
}
}
}
fun isTBRActive(dbEntry: PumpDbEntry) : Boolean { fun isTBRActive(dbEntry: PumpDbEntry) : Boolean {
val endDate = dbEntry.date + (dbEntry.tbrData!!.durationInMinutes * 60 * 1000) return isTBRActive(dbEntry.date, dbEntry.tbrData!!.durationInMinutes)
}
fun isTBRActive(startTimestamp: Long, durationMin: Int) : Boolean {
val endDate = startTimestamp + (durationMin * 60 * 1000)
return (endDate > System.currentTimeMillis()) return (endDate > System.currentTimeMillis())
} }
// private fun processTBREntries_Old(entryList: MutableList<PumpHistoryEntry>) {
// Collections.reverse(entryList)
// val tbr = entryList[0].getDecodedDataEntry("Object") as TempBasalPair?
// var readOldItem = false
// if (tbr!!.isCancelTBR) {
// val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.TempBasalCombined)
// if (oneMoreEntryFromHistory != null) {
// entryList.add(0, oneMoreEntryFromHistory)
// readOldItem = true
// } else {
// entryList.removeAt(0)
// }
// }
// val oldestTimestamp = getOldestTimestamp(entryList)
// val entriesFromHistory = getDatabaseEntriesByLastTimestamp(oldestTimestamp, ProcessHistoryRecord.TBR)
// aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, ProcessHistoryRecord.TBR.description + " List (before filter): %s, FromDb=%s", gson.toJson(entryList),
// gson.toJson(entriesFromHistory)))
// var processDTO: TempBasalProcessDTO? = null
// val processList: MutableList<TempBasalProcessDTO> = ArrayList()
// for (treatment in entryList) {
// val tbr2 = treatment.getDecodedDataEntry("Object") as TempBasalPair?
// if (tbr2!!.isCancelTBR) {
// if (processDTO != null) {
// processDTO.itemTwo = treatment
// if (readOldItem) {
// processDTO.processOperation = TempBasalProcessDTO.Operation.Edit
// readOldItem = false
// }
// } else {
// aapsLogger.error("processDTO was null - shouldn't happen. ItemTwo=$treatment")
// }
// } else {
// if (processDTO != null) {
// processList.add(processDTO)
// }
// processDTO = TempBasalProcessDTO()
// processDTO.itemOne = treatment
// processDTO.processOperation = TempBasalProcessDTO.Operation.Add
// }
// }
// if (processDTO != null) {
// processList.add(processDTO)
// }
// if (isCollectionNotEmpty(processList)) {
// for (tempBasalProcessDTO in processList) {
// if (tempBasalProcessDTO.processOperation === TempBasalProcessDTO.Operation.Edit) {
// // edit
// val tempBasal = findTempBasalWithPumpId(tempBasalProcessDTO.itemOne!!.pumpId!!, entriesFromHistory)
// if (tempBasal != null) {
// tempBasal.durationInMinutes = tempBasalProcessDTO.duration
// // pumpSync - createOrUpdate(tempBasal)
// databaseHelper.createOrUpdate(tempBasal)
// aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Edit " + ProcessHistoryRecord.TBR.description + " - (entryFromDb=%s) ", tempBasal))
// } else {
// aapsLogger.error(LTag.PUMP, "TempBasal not found. Item: " + tempBasalProcessDTO.itemOne)
// }
// } else {
// // add
// val treatment = tempBasalProcessDTO.itemOne
// val tbr2 = treatment!!.decodedData!!["Object"] as TempBasalPair?
// tbr2!!.durationMinutes = tempBasalProcessDTO.duration
// val tempBasal = findTempBasalWithPumpId(tempBasalProcessDTO.itemOne!!.pumpId!!, entriesFromHistory)
// if (tempBasal == null) {
// val treatmentDb = findDbEntry_Old(treatment, entriesFromHistory)
// aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Add " + ProcessHistoryRecord.TBR.description + " %s - (entryFromDb=%s) ", treatment, treatmentDb))
// addTBR(treatment, treatmentDb as TemporaryBasal?)
// } else {
// // this shouldn't happen
// if (tempBasal.durationInMinutes != tempBasalProcessDTO.duration) {
// aapsLogger.debug(LTag.PUMP, "Found entry with wrong duration (shouldn't happen)... updating")
// tempBasal.durationInMinutes = tempBasalProcessDTO.duration
// }
// }
// } // if
// } // for
// } // collection
// }
private fun findTempBasalWithPumpId(pumpId: Long, entriesFromHistory: List<DbObjectBase>): TemporaryBasal? {
for (dbObjectBase in entriesFromHistory) {
val tbr = dbObjectBase as TemporaryBasal
if (tbr.pumpId == pumpId) {
return tbr
}
}
// TODO pumpSync - findTempBasalByPumpId
return databaseHelper.findTempBasalByPumpId(pumpId)
}
/** /**
* findDbEntry - finds Db entries in database, while theoretically this should have same dateTime they * findDbEntry - finds Db entries in database, while theoretically this should have same dateTime they
@ -816,56 +735,6 @@ class MedtronicHistoryData @Inject constructor(
* @param entriesFromHistory entries from history * @param entriesFromHistory entries from history
* @return DbObject from AAPS (if found) * @return DbObject from AAPS (if found)
*/ */
private fun findDbEntry_Old(treatment: PumpHistoryEntry?, entriesFromHistory: List<DbObjectBase>): DbObjectBase? {
val proposedTime = DateTimeUtil.toMillisFromATD(treatment!!.atechDateTime!!)
//proposedTime += (this.pumpTime.timeDifference * 1000);
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=%s", treatment, gson.toJson(entriesFromHistory)))
if (entriesFromHistory.size == 0) {
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=null", treatment))
return null
} else if (entriesFromHistory.size == 1) {
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=%s. Type=SingleEntry", treatment, entriesFromHistory[0]))
// if difference is bigger than 2 minutes we discard entry
val maxMillisAllowed = DateTimeUtil.getMillisFromATDWithAddedMinutes(treatment.atechDateTime!!, 2)
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry maxMillisAllowed=%d, AtechDateTime=%d (add 2 minutes). ", maxMillisAllowed, treatment.atechDateTime))
if (entriesFromHistory[0].getDate() > maxMillisAllowed) {
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry entry filtered out, returning null. ")
return null
}
return entriesFromHistory[0]
}
var min = 0
while (min < 2) {
var sec = 0
while (sec <= 50) {
if (min == 1 && sec == 50) {
sec = 59
}
val diff = sec * 1000
val outList: MutableList<DbObjectBase> = ArrayList()
for (treatment1 in entriesFromHistory) {
if (treatment1.getDate() > proposedTime - diff && treatment1.getDate() < proposedTime + diff) {
outList.add(treatment1)
}
}
if (outList.size == 1) {
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=EntrySelected, AtTimeMin={}, AtTimeSec={}", treatment, entriesFromHistory[0], min, sec))
return outList[0]
}
if (min == 0 && sec == 10 && outList.size > 1) {
aapsLogger.error(String.format(Locale.ENGLISH, "Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
min, sec, outList.size, gson.toJson(outList)))
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Error - Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
min, sec, outList.size, gson.toJson(outList)))
}
sec += 10
}
min += 1
}
return null
}
/** /**
* Looks at all boluses that have temporaryId and find one that is correct for us (if such entry exists) * Looks at all boluses that have temporaryId and find one that is correct for us (if such entry exists)
@ -926,54 +795,6 @@ class MedtronicHistoryData @Inject constructor(
} }
private fun getDatabaseEntriesByLastTimestamp(startTimestamp: Long, processHistoryRecord: ProcessHistoryRecord): MutableList<DbObjectBase> {
var outList: MutableList<DbObjectBase> = mutableListOf()
if (processHistoryRecord == ProcessHistoryRecord.Bolus) {
outList.addAll(activePlugin.activeTreatments.getTreatmentsFromHistoryAfterTimestamp(startTimestamp))
} else {
// TODO pumpSync - databaseHelper.getTemporaryBasalsDataFromTime(startTimestamp, true)
outList.addAll(databaseHelper.getTemporaryBasalsDataFromTime(startTimestamp, true))
}
return outList
}
private fun addCarbsFromEstimate(detailedBolusInfo: DetailedBolusInfo, bolus: PumpHistoryEntry?) {
if (bolus!!.containsDecodedData("Estimate")) {
val bolusWizard = bolus.decodedData!!["Estimate"] as BolusWizardDTO?
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: addCarbsFromEstimate: Bolus=%s, BolusWizardDTO=%s", bolus, bolusWizard))
detailedBolusInfo.carbs = bolusWizard!!.carbs.toDouble()
}
}
private fun addTBR(treatment: PumpHistoryEntry?, temporaryBasalDbInput: TemporaryBasal?) {
val tbr = treatment!!.decodedData!!["Object"] as TempBasalPair?
var temporaryBasalDb = temporaryBasalDbInput
var operation = "editTBR"
if (temporaryBasalDb == null) {
temporaryBasalDb = TemporaryBasal(injector)
temporaryBasalDb.date = tryToGetByLocalTime(treatment.atechDateTime!!)
operation = "addTBR"
}
temporaryBasalDb.source = Source.PUMP
temporaryBasalDb.pumpId = treatment.pumpId!!
temporaryBasalDb.durationInMinutes = tbr!!.durationMinutes
temporaryBasalDb.absoluteRate = tbr.insulinRate
temporaryBasalDb.isAbsolute = !tbr.isPercent
treatment.linkedObject = temporaryBasalDb
// TODO pumpSync - databaseHelper.createOrUpdate(tbr)
databaseHelper.createOrUpdate(temporaryBasalDb)
aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "$operation - [date=%d,pumpId=%d, rate=%s %s, duration=%d]", //
temporaryBasalDb.getDate(), //
temporaryBasalDb.getPumpId(), //
if (temporaryBasalDb.isAbsolute) String.format(Locale.ENGLISH, "%.2f", temporaryBasalDb.absoluteRate) else String.format(Locale.ENGLISH, "%d", temporaryBasalDb.percentRate), //
if (temporaryBasalDb.isAbsolute) "U/h" else "%", //
temporaryBasalDb.durationInMinutes))
}
private fun processSuspends(tempBasalProcessList: List<TempBasalProcessDTO>) { private fun processSuspends(tempBasalProcessList: List<TempBasalProcessDTO>) {
for (tempBasalProcess in tempBasalProcessList) { for (tempBasalProcess in tempBasalProcessList) {
@ -1148,27 +969,6 @@ class MedtronicHistoryData @Inject constructor(
return DateTimeUtil.toMillisFromATD(atechDateTime) return DateTimeUtil.toMillisFromATD(atechDateTime)
} }
private fun getOldestTimestamp(treatments: List<PumpHistoryEntry?>): Long {
var dt = Long.MAX_VALUE
var currentTreatment: PumpHistoryEntry? = null
for (treatment in treatments) {
if (treatment!!.atechDateTime!! < dt) {
dt = treatment.atechDateTime!!
currentTreatment = treatment
}
}
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. Oldest entry found: time=%d, object=%s", dt, currentTreatment))
return try {
val oldestEntryTime = DateTimeUtil.toGregorianCalendar(dt)
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime: %s", DateTimeUtil.toString(oldestEntryTime)))
oldestEntryTime.add(Calendar.MINUTE, -2)
if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime (-2m): %s, timeInMillis=%d", DateTimeUtil.toString(oldestEntryTime), oldestEntryTime.timeInMillis))
oldestEntryTime.timeInMillis
} catch (ex: Exception) {
aapsLogger.error("Problem decoding date from last record: $currentTreatment")
8 // default return of 6 minutes
}
}
private fun getTDDType(): PumpHistoryEntryType { private fun getTDDType(): PumpHistoryEntryType {
return if (medtronicUtil.medtronicPumpModel == null) { return if (medtronicUtil.medtronicPumpModel == null) {
@ -1187,12 +987,14 @@ class MedtronicHistoryData @Inject constructor(
} }
} }
fun hasBasalProfileChanged(): Boolean { fun hasBasalProfileChanged(): Boolean {
val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile) val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile)
aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson.toJson(filteredItems)) aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson.toJson(filteredItems))
return filteredItems.size > 0 return filteredItems.size > 0
} }
fun processLastBasalProfileChange(pumpType: PumpType?, mdtPumpStatus: MedtronicPumpStatus) { fun processLastBasalProfileChange(pumpType: PumpType?, mdtPumpStatus: MedtronicPumpStatus) {
val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile) val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile)
aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. Items: $filteredItems") aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. Items: $filteredItems")
@ -1271,33 +1073,26 @@ class MedtronicHistoryData @Inject constructor(
} }
private fun getFilteredItems(inList: MutableList<PumpHistoryEntry>?, entryTypes: Set<PumpHistoryEntryType>?): MutableList<PumpHistoryEntry> { private fun getFilteredItems(inList: MutableList<PumpHistoryEntry>?, entryTypes: Set<PumpHistoryEntryType>?): MutableList<PumpHistoryEntry> {
// aapsLogger.debug(LTag.PUMP, "InList: " + inList.size());
val outList: MutableList<PumpHistoryEntry> = mutableListOf() val outList: MutableList<PumpHistoryEntry> = mutableListOf()
if (inList != null && inList.size > 0) { if (!inList.isNullOrEmpty()) {
for (pumpHistoryEntry in inList) { for (pumpHistoryEntry in inList) {
if (!isEmpty(entryTypes)) { if (entryTypes.isNullOrEmpty()) {
if (entryTypes!!.contains(pumpHistoryEntry.entryType)) {
outList.add(pumpHistoryEntry) outList.add(pumpHistoryEntry)
}
} else { } else {
if (entryTypes.contains(pumpHistoryEntry.entryType)) {
outList.add(pumpHistoryEntry) outList.add(pumpHistoryEntry)
} }
} }
} }
}
// aapsLogger.debug(LTag.PUMP, "OutList: " + outList.size());
return outList return outList
} }
private fun isEmpty(entryTypes: Set<PumpHistoryEntryType>?): Boolean {
return entryTypes.isNullOrEmpty()
//return entryTypes == null || entryTypes.size == 1 && entryTypes[0] == null
}
private val logPrefix: String private val logPrefix: String
get() = "MedtronicHistoryData::" get() = "MedtronicHistoryData::"
companion object { companion object {
/** /**
* Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses * Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses