From fedba23405bfd122fcf42c635c747a47c570d8e5 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 1 Jun 2021 22:51:16 +0200 Subject: [PATCH] code cleanup --- .../database/entities/TherapyEvent.kt | 2 +- .../insight/di/InsightCommModule.kt | 3 +- .../pump/medtronic/MedtronicFragment.kt | 2 +- .../pump/medtronic/comm/MedtronicConverter.kt | 2 +- .../comm/history/MedtronicHistoryDecoder.kt | 2 +- .../comm/history/MedtronicHistoryEntry.kt | 8 ---- .../comm/history/pump/PumpHistoryEntry.kt | 21 ---------- .../comm/history/pump/PumpHistoryEntryType.kt | 1 - .../GetHistoryPageCarelinkMessageBody.kt | 4 -- .../medtronic/data/MedtronicHistoryData.kt | 2 +- .../pump/medtronic/data/dto/BasalProfile.kt | 2 +- .../medtronic/data/dto/BasalProfileEntry.kt | 7 ---- .../pump/medtronic/data/dto/TempBasalPair.kt | 2 +- .../defs/MedtronicNotificationType.kt | 2 +- .../pump/medtronic/di/MedtronicModule.kt | 2 +- .../dialog/MedtronicHistoryActivity.kt | 18 ++++----- .../omnipod/dash/dagger/OmnipodDashModule.kt | 3 +- .../BolusShortInsulinProgramElement.java | 2 +- .../dash/driver/pod/definition/AlarmType.java | 2 +- .../pod/definition/AlertConfiguration.java | 16 ++++---- .../dash/driver/pod/definition/AlertSlot.java | 2 +- .../pod/definition/BeepRepetitionType.java | 2 +- .../dash/driver/pod/definition/BeepType.java | 2 +- .../driver/pod/definition/DeliveryStatus.java | 2 +- .../driver/pod/definition/NakErrorType.java | 2 +- .../dash/driver/pod/definition/PodStatus.java | 2 +- .../driver/pod/response/ResponseType.java | 6 +-- .../pod/response/SetUniqueIdResponse.java | 38 +++++++++---------- 28 files changed, 56 insertions(+), 103 deletions(-) diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt index 8a701e1e21..f930be4645 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt @@ -48,7 +48,7 @@ data class TherapyEvent( enum class GlucoseUnit { MGDL, MMOL; - companion object { } + companion object } enum class MeterType(val text: String) { diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt index 7073ad14ae..4359b8d9fa 100644 --- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt +++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt @@ -4,5 +4,4 @@ import dagger.Module @Module @Suppress("unused") -abstract class InsightCommModule { -} \ No newline at end of file +abstract class InsightCommModule \ No newline at end of file diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt index 95274476fa..57630d6248 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt @@ -322,7 +322,7 @@ class MedtronicFragment : DaggerFragment() { val tbrRemainingTime: Int? = medtronicPumpStatus.tbrRemainingTime if (tbrRemainingTime != null) { - tbrStr = resourceHelper.gs(R.string.mdt_tbr_remaining, medtronicPumpStatus.tempBasalAmount, tbrRemainingTime); + tbrStr = resourceHelper.gs(R.string.mdt_tbr_remaining, medtronicPumpStatus.tempBasalAmount, tbrRemainingTime) } binding.tempBasal.text = tbrStr diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt index 07da3aceaa..86c04e3e90 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt @@ -109,7 +109,7 @@ class MedtronicConverter @Inject constructor( } } - public fun decodeSettingsLoop(rd: ByteArray): Map { + fun decodeSettingsLoop(rd: ByteArray): Map { val map: MutableMap = HashMap() addSettingToMap("PCFG_MAX_BOLUS", "" + decodeMaxBolus(rd), PumpConfigurationGroup.Bolus, map) addSettingToMap( diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt index c834e92711..57a6b175ab 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt @@ -92,7 +92,7 @@ abstract class MedtronicHistoryDecoder(var aapsLogge StringUtil.appendToStringBuilder(sb, key1, ", ") } val spaces = StringUtils.repeat(" ", 14 - key.name.length) - aapsLogger.info(LTag.PUMPCOMM, " ${key.name}$spaces - ${value.size}. Elements: ${sb.toString()}") + aapsLogger.info(LTag.PUMPCOMM, " ${key.name}$spaces - ${value.size}. Elements: $sb") } else { aapsLogger.info(LTag.PUMPCOMM, " ${key.name} - ${value.size}") } diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt index d9baa82acc..dc38b62601 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt @@ -17,24 +17,18 @@ abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface { lateinit var rawData: List protected var sizes = IntArray(3) - get() = field lateinit var head: ByteArray lateinit var datetime: ByteArray lateinit var body: ByteArray var id: Long = 0 - set(value) { - field = value - } @Expose var DT: String? = null - get() = field @Expose var atechDateTime: Long = 0L - get() = field set(value) { field = value DT = DateTimeUtil.toString(value) @@ -43,7 +37,6 @@ abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface { @Expose var decodedData: MutableMap = mutableMapOf() - get() = field /** * Pump id that will be used with AAPS object (time * 1000 + historyType (max is FF = 255) @@ -61,7 +54,6 @@ abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface { * Linked object, see linked */ var linkedObject: Any? = null - get() = field set(value) { linked = true field = value diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt index ea6d521e74..0bc1e8106e 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt @@ -24,16 +24,9 @@ class PumpHistoryEntry : MedtronicHistoryEntry() { override var opCode: Byte? = null // this is set only when we have unknown entry... get() = if (field == null) entryType.code else field - set(value) { - field = value - } var offset = 0 var displayableValue = "" - get() = field - set(value) { - field = value - } fun setEntryType(medtronicDeviceType: MedtronicDeviceType, entryType: PumpHistoryEntryType, opCode: Byte? = null) { this.entryType = entryType @@ -57,17 +50,6 @@ class PumpHistoryEntry : MedtronicHistoryEntry() { + StringUtil.getStringInLength("" + opCode, 3) + ", 0x" + ByteUtil.shortHexString(opCode!!) + "]") - override fun toString(): String { - return super.toString() - // Object object = this.getDecodedDataEntry("Object"); -// -// if (object == null) { -// return super.toString(); -// } else { -// return super.toString() + "PumpHistoryEntry [type=" + StringUtil.getStringInLength(entryType.name(), 20) + ", DT: " + DT + ", Object=" + object.toString() + "]"; -// } - } - override val entryTypeName: String get() = entryType.name @@ -117,9 +99,6 @@ class PumpHistoryEntry : MedtronicHistoryEntry() { } return field } - set(pumpId) { - field = pumpId - } fun hasBolusChanged(entry: PumpHistoryEntry): Boolean { if (entryType == PumpHistoryEntryType.Bolus) { diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt index 1fc9645f18..1c2dc301f2 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt @@ -205,7 +205,6 @@ constructor(var code: Byte, private var specialRulesHead: MutableList? = null private var specialRulesBody: MutableList? = null private var hasSpecialRules = false - get() = field fun getTotalLength(medtronicDeviceType: MedtronicDeviceType): Int { return if (hasSpecialRules) { diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt index 1f86c1446a..574bbacc9f 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt @@ -22,10 +22,6 @@ class GetHistoryPageCarelinkMessageBody : CarelinkLongMessageBody { override val length: Int get() = data!!.size - override fun init(rxData: ByteArray?) { - super.init(rxData) - } - fun init(pageNum: Int) { val numArgs: Byte = 1 super.init(byteArrayOf(numArgs, pageNum.toByte())) diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt index 180b5f9d1f..843ebf7df8 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt @@ -91,7 +91,7 @@ class MedtronicHistoryData @Inject constructor( .filter { f -> f.pumpId == pumpId } .findFirst() - return if (findFirst.isPresent()) findFirst.get() else null + return if (findFirst.isPresent) findFirst.get() else null } private fun showLogs(header: String?, data: String) { diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt index a3d373c5cf..f893c1b2a0 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt @@ -314,7 +314,7 @@ class BasalProfile { fun isBasalProfileByHourUndefined(basalByHour: DoubleArray): Boolean { for (i in 0..23) { if (basalByHour[i] > 0.0) { - return false; + return false } } return true diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt index 6ffbefcf2d..a8d188e3df 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt @@ -15,16 +15,9 @@ class BasalProfileEntry { var rate_raw: ByteArray var rate = 0.0 - set(value) { - field = value - } var startTime_raw: Byte var startTime : LocalTime? = null // Just a "time of day" - set(value) { - field = value - } - constructor() { rate = -9.999E6 diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt index 1cd5f8dab7..fcc7e71996 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt @@ -62,7 +62,7 @@ class TempBasalPair : TempBasalPair { aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "TempBasalPair (with %d byte response): %s", response.size, toString())) } - constructor(insulinRate: Double, isPercent: Boolean, durationMinutes: Int) : super(insulinRate, isPercent, durationMinutes) {} + constructor(insulinRate: Double, isPercent: Boolean, durationMinutes: Int) : super(insulinRate, isPercent, durationMinutes) // list.add((byte) 0); // ? diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt index aad989679d..b6bd1a758e 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt @@ -19,5 +19,5 @@ enum class MedtronicNotificationType(var notificationType: Int, PumpWrongMaxBasalSet(R.string.medtronic_error_pump_wrong_max_basal_set, Notification.NORMAL), // PumpWrongTimeUrgent(R.string.medtronic_notification_check_time_date, Notification.URGENT), PumpWrongTimeNormal(R.string.medtronic_notification_check_time_date, Notification.NORMAL), TimeChangeOver24h(Notification.OVER_24H_TIME_CHANGE_REQUESTED, R.string.medtronic_error_pump_24h_time_change_requested, Notification.URGENT); - constructor(resourceId: Int, notificationUrgency: Int) : this(Notification.MEDTRONIC_PUMP_ALARM, resourceId, notificationUrgency) {} + constructor(resourceId: Int, notificationUrgency: Int) : this(Notification.MEDTRONIC_PUMP_ALARM, resourceId, notificationUrgency) } \ No newline at end of file diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt index 0be7f1ba73..0eebc3bd81 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt @@ -30,6 +30,6 @@ abstract class MedtronicModule { companion object { @Provides - fun byteUtilProvider(): ByteUtil = ByteUtil(); + fun byteUtilProvider(): ByteUtil = ByteUtil() } } \ No newline at end of file diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt index 6257099574..492b5b9ddb 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt @@ -84,10 +84,6 @@ class MedtronicHistoryActivity : DaggerActivity() { manualChange = false } - override fun onPause() { - super.onPause() - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.medtronic_history_activity) @@ -96,17 +92,17 @@ class MedtronicHistoryActivity : DaggerActivity() { recyclerView = findViewById(R.id.medtronic_history_recyclerview) recyclerView.setHasFixedSize(true) llm = LinearLayoutManager(this) - recyclerView.setLayoutManager(llm) + recyclerView.layoutManager = llm recyclerViewAdapter = RecyclerViewAdapter(filteredHistoryList) - recyclerView.setAdapter(recyclerViewAdapter) - statusView.setVisibility(View.GONE) + recyclerView.adapter = recyclerViewAdapter + statusView.visibility = View.GONE typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper)) val spinnerAdapter = ArrayAdapter(this, R.layout.spinner_centered, typeListFull) - historyTypeSpinner.setAdapter(spinnerAdapter) - historyTypeSpinner.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener { + historyTypeSpinner.adapter = spinnerAdapter + historyTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) { if (manualChange) return - val selected = historyTypeSpinner.getSelectedItem() as TypeList + val selected = historyTypeSpinner.selectedItem as TypeList showingType = selected selectedGroup = selected.entryGroup filterHistory(selectedGroup) @@ -116,7 +112,7 @@ class MedtronicHistoryActivity : DaggerActivity() { if (manualChange) return filterHistory(PumpHistoryEntryGroup.All) } - }) + } } private fun getTypeList(list: List): List { diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt index 285349495a..7003c3112b 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt @@ -4,5 +4,4 @@ import dagger.Module @Module @Suppress("unused") -abstract class OmnipodDashModule { -} +abstract class OmnipodDashModule diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java index 0c23171639..7e80cc70b4 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command. import java.nio.ByteBuffer; public class BolusShortInsulinProgramElement implements ShortInsulinProgramElement { - private short numberOfPulses; + private final short numberOfPulses; public BolusShortInsulinProgramElement(short numberOfPulses) { this.numberOfPulses = numberOfPulses; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java index 7fcf8a8ece..db41aa1653 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java @@ -157,7 +157,7 @@ public enum AlarmType { ALARM_BLE_QN_CRIT_VAR_FAIL((byte) 0xc2), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; AlarmType(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java index b0341235c7..a2c5497619 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java @@ -5,14 +5,14 @@ import androidx.annotation.NonNull; import java.nio.ByteBuffer; public class AlertConfiguration implements Encodable { - private AlertSlot slot; - private boolean enabled; - private short durationInMinutes; - private boolean autoOff; - private AlertTriggerType triggerType; - private short offsetInMinutesOrThresholdInMicroLiters; - private BeepType beepType; - private BeepRepetitionType beepRepetition; + private final AlertSlot slot; + private final boolean enabled; + private final short durationInMinutes; + private final boolean autoOff; + private final AlertTriggerType triggerType; + private final short offsetInMinutesOrThresholdInMicroLiters; + private final BeepType beepType; + private final BeepRepetitionType beepRepetition; public AlertConfiguration(AlertSlot slot, boolean enabled, short durationInMinutes, boolean autoOff, AlertTriggerType triggerType, short offsetInMinutesOrThresholdInMicroLiters, BeepType beepType, BeepRepetitionType beepRepetition) { this.slot = slot; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java index 9e8b23cb74..7ee2b7cb5a 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java @@ -11,7 +11,7 @@ public enum AlertSlot { EXPIRATION((byte) 0x07), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; AlertSlot(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java index 2b290f96b5..31cb23dc14 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java @@ -8,7 +8,7 @@ public enum BeepRepetitionType { XXX4((byte) 0x06), // Used in imminent pod expiration alert XXX5((byte) 0x08); // Used in lump of coal alert - private byte value; + private final byte value; BeepRepetitionType(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java index ee750df520..e88f77e67f 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java @@ -5,7 +5,7 @@ public enum BeepType { FOUR_TIMES_BIP_BEEP((byte) 0x02), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert LONG_SINGLE_BEEP((byte) 0x06); // Used in stop delivery command - private byte value; + private final byte value; BeepType(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java index 7dc9618fb5..dad0745505 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java @@ -9,7 +9,7 @@ public enum DeliveryStatus { BOLUS_AND_TEMP_BASAL_ACTIVE((byte) 0x06), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; DeliveryStatus(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java index d6482386ee..a7fc43b744 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java @@ -32,7 +32,7 @@ public enum NakErrorType { INVALID_CRC((byte) 0x1d), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; NakErrorType(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java index 88fb98b546..b746cd9435 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java @@ -19,7 +19,7 @@ public enum PodStatus { DEACTIVATED((byte) 0x0f), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; PodStatus(byte value) { this.value = value; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java index 384ae11c0e..f903c28eb9 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java @@ -7,7 +7,7 @@ public enum ResponseType { NAK_RESPONSE((byte) 0x06), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; ResponseType(byte value) { this.value = value; @@ -37,7 +37,7 @@ public enum ResponseType { STATUS_RESPONSE_PAGE_81((byte) 0x51), UNKNOWN((byte) 0xff); - private byte value; + private final byte value; AdditionalStatusResponseType(byte value) { this.value = value; @@ -62,7 +62,7 @@ public enum ResponseType { SET_UNIQUE_ID_RESPONSE((byte) 0x1b), UNKNOWN((byte) 0xff); - private byte length; + private final byte length; ActivationResponseType(byte length) { this.length = length; diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java index 2c0703258a..6268ae57f5 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java @@ -6,25 +6,25 @@ import java.util.Arrays; import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus; public final class SetUniqueIdResponse extends ActivationResponseBase { - private byte messageType; - private short messageLength; - private short pulseVolumeInTenThousandthMicroLiter; - private short pumpRate; - private short primePumpRate; - private short numberOfEngagingClutchDrivePulses; - private short numberOfPrimePulses; - private short podExpirationTimeInHours; - private short firmwareVersionMajor; - private short firmwareVersionMinor; - private short firmwareVersionInterim; - private short bleVersionMajor; - private short bleVersionMinor; - private short bleVersionInterim; - private short productId; - private PodStatus podStatus; - private long lotNumber; - private long podSequenceNumber; - private long uniqueIdReceivedInCommand; + private final byte messageType; + private final short messageLength; + private final short pulseVolumeInTenThousandthMicroLiter; + private final short pumpRate; + private final short primePumpRate; + private final short numberOfEngagingClutchDrivePulses; + private final short numberOfPrimePulses; + private final short podExpirationTimeInHours; + private final short firmwareVersionMajor; + private final short firmwareVersionMinor; + private final short firmwareVersionInterim; + private final short bleVersionMajor; + private final short bleVersionMinor; + private final short bleVersionInterim; + private final short productId; + private final PodStatus podStatus; + private final long lotNumber; + private final long podSequenceNumber; + private final long uniqueIdReceivedInCommand; public SetUniqueIdResponse(byte[] encoded) { super(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, encoded);