From 8e9511f0a7c37365c125e180257e01a6559ce423 Mon Sep 17 00:00:00 2001
From: Pogman <subaziro@gmail.com>
Date: Sat, 18 Feb 2017 15:20:22 +0000
Subject: [PATCH] User status log message added for Pump SGV and Event time and
Pump time offset
---
.../android/medtronic/MainActivity.java | 4 ++--
.../service/MedtronicCnlIntentService.java | 21 +++++++++++++++++--
2 files changed, 21 insertions(+), 4 deletions(-)
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 726339f..4e6b444 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 9b041da..4809551 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()
--
GitLab