From ea29b6ad82ca68e6d2b44b29b36040e2dbbf58c7 Mon Sep 17 00:00:00 2001 From: Roumen Georgiev Date: Fri, 2 Mar 2018 16:33:53 +0200 Subject: [PATCH] propper conversion from MMOL to MgDl --- .../androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java | 4 ++-- .../androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java index ab0cd8dde0..5e2a811dbb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java @@ -261,8 +261,8 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, D if(currentProfile == null) return; if(currentProfile.getUnits().equals(Constants.MMOL)) { - esTT = eatingSoonTT > 0 ? Profile.toMgdl(eatingSoonTT,Constants.MGDL) : 90d; - activityTT = prefTT > 0 ? Profile.toMgdl(prefTT,Constants.MGDL) : 140d; + esTT = eatingSoonTT > 0 ? Profile.toMgdl(eatingSoonTT,Constants.MMOL) : 90d; + activityTT = prefTT > 0 ? Profile.toMgdl(prefTT,Constants.MMOL) : 140d; } else { esTT = eatingSoonTT > 0 ? eatingSoonTT : 90d; activityTT = prefTT > 0 ? prefTT : 140d; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java index 356c3a9b3d..0b8b263262 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java @@ -250,7 +250,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener, if(currentProfile == null) return; if(currentProfile.getUnits().equals(Constants.MMOL)) - tt = prefTT > 0 ? Profile.toMgdl(prefTT, Constants.MGDL) : 80d; + tt = prefTT > 0 ? Profile.toMgdl(prefTT, Constants.MMOL) : 80d; else tt = prefTT > 0 ? prefTT : 80d; final double finalTT = tt;