diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt index 5341b0dbe3..b2d10916c2 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt @@ -115,7 +115,7 @@ class DataBroadcastPlugin @Inject constructor( val lastBG = iobCobCalculator.ads.lastBg() ?: return val glucoseStatus = glucoseStatusProvider.glucoseStatusData ?: return - bundle.putDouble("glucoseMgdl", lastBG.value) // last BG in mgdl + bundle.putDouble("glucoseMgdl", lastBG.recalculated) // last BG in mgdl bundle.putLong("glucoseTimeStamp", lastBG.timestamp) // timestamp bundle.putString("units", profileFunction.getUnits().asText) // units used in AAPS "mg/dl" or "mmol" bundle.putString("slopeArrow", lastBG.trendArrow.text) // direction arrow as string diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 889e4bd5ed..875d1b68b4 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -948,8 +948,8 @@ class DataHandlerMobile @Inject constructor( slopeArrow = trendCalculator.getTrendArrow(glucoseValue).symbol, delta = glucoseStatus?.let { deltaString(it.delta, it.delta * Constants.MGDL_TO_MMOLL, units) } ?: "--", avgDelta = glucoseStatus?.let { deltaString(it.shortAvgDelta, it.shortAvgDelta * Constants.MGDL_TO_MMOLL, units) } ?: "--", - sgvLevel = if (glucoseValue.value > highLine) 1L else if (glucoseValue.value < lowLine) -1L else 0L, - sgv = glucoseValue.value, + sgvLevel = if (glucoseValue.recalculated > highLine) 1L else if (glucoseValue.recalculated < lowLine) -1L else 0L, + sgv = glucoseValue.recalculated, high = highLine, low = lowLine, color = 0 diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 54444f68ec..6f764eabb3 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -192,7 +192,7 @@ class CarbsDialog : DialogFragmentWithDate() { } iobCobCalculator.ads.actualBg()?.let { bgReading -> - if (bgReading.value < 72) + if (bgReading.recalculated < 72) binding.hypoTt.isChecked = true } binding.hypoTt.setOnClickListener {