diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java index 726339f60e283fae4f7497471e4971d71a4b5038..4e6b444d2a18fd305fdfa0c2975f87516d322230 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java +++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java @@ -94,8 +94,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc private int chartZoom = 3; private boolean hasZoomedChart = false; - private NumberFormat sgvFormatter; - private boolean mmolxl; + public static NumberFormat sgvFormatter; + public static boolean mmolxl; private boolean mmolxlDecimals; boolean mEnableCgmService = true; diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java index 9b041daf2e537086e1b164b90e5c80b9f34fd2e0..480955183b9ddcf01c42a5849502c959b4740f56 100644 --- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java +++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java @@ -20,6 +20,8 @@ import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.Locale; import java.util.concurrent.TimeoutException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import info.nightscout.android.BuildConfig; import info.nightscout.android.R; @@ -138,14 +140,16 @@ public class MedtronicCnlIntentService extends IntentService { return; } + DateFormat df = new SimpleDateFormat("HH:mm:ss"); + MedtronicCnlReader cnlReader = new MedtronicCnlReader(mHidDevice); Realm realm = Realm.getDefaultInstance(); realm.beginTransaction(); try { - sendStatus("Connecting to the Contour Next Link..."); - Log.d(TAG, "Connecting to the Contour Next Link."); + sendStatus("Connecting to Contour Next Link"); + Log.d(TAG, "Connecting to Contour Next Link"); cnlReader.requestDeviceInfo(); // Is the device already configured? @@ -234,6 +238,19 @@ public class MedtronicCnlIntentService extends IntentService { cnlReader.endEHSMSession(); if (pumpRecord.getSgv() != 0) { + + String sgvString; + if (MainActivity.mmolxl) { + sgvString = MainActivity.sgvFormatter.format((float) pumpRecord.getSgv() / MainActivity.MMOLXLFACTOR); + } else { + sgvString = String.valueOf(pumpRecord.getSgv()); + } + String offsetSign = ""; + if (pumpOffset > 0) { + offsetSign = "+"; + } + sendStatus("SGV: " + sgvString + " At: " + df.format(pumpRecord.getEventDate().getTime()) + " Pump: " + offsetSign + (pumpOffset / 1000L) + "sec"); //note: event time is currently stored with offset + // Check that the record doesn't already exist before committing RealmResults<PumpStatusEvent> checkExistingRecords = activePump.getPumpHistory() .where()