From cd37b2981a9875e4b258a959f39ca00b7bc091e1 Mon Sep 17 00:00:00 2001
From: Lennart Goedhart <lennart@omnibase.com.au>
Date: Sat, 30 Jul 2016 11:54:24 +0800
Subject: [PATCH] Rename Realm object Pump to PumpInfo. Add deviceName
---
.../medtronicNg/{Pump.java => PumpInfo.java} | 31 +++++++++++++------
1 file changed, 22 insertions(+), 9 deletions(-)
rename app/src/main/java/info/nightscout/android/model/medtronicNg/{Pump.java => PumpInfo.java} (66%)
diff --git a/app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java b/app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
similarity index 66%
rename from app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java
rename to app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
index 3d34bef..9724cb6 100644
--- a/app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java
+++ b/app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
@@ -8,27 +8,36 @@ import io.realm.annotations.PrimaryKey;
/**
* Created by lgoedhart on 4/06/2016.
*/
-public class Pump extends RealmObject {
+public class PumpInfo extends RealmObject {
@PrimaryKey
- private String serialNumber;
- private int lastRadioChannel;
+ private long pumpMac;
+ private String deviceName;
+ private byte lastRadioChannel;
private RealmList<ContourNextLinkInfo> associatedCnls;
private RealmList<CgmStatusEvent> cgmHistory;
private RealmList<PumpStatusEvent> pumpHistory;
- public String getSerialNumber() {
- return serialNumber;
+ public long getPumpMac() {
+ return pumpMac;
}
- public void setSerialNumber(String serialNumber) {
- this.serialNumber = serialNumber;
+ public void setPumpMac(long pumpMac) {
+ this.pumpMac = pumpMac;
}
- public int getLastRadioChannel() {
+ public String getDeviceName() {
+ return deviceName;
+ }
+
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ public byte getLastRadioChannel() {
return lastRadioChannel;
}
- public void setLastRadioChannel(int lastRadioChannel) {
+ public void setLastRadioChannel(byte lastRadioChannel) {
this.lastRadioChannel = lastRadioChannel;
}
@@ -55,4 +64,8 @@ public class Pump extends RealmObject {
public void setPumpHistory(RealmList<PumpStatusEvent> pumpHistory) {
this.pumpHistory = pumpHistory;
}
+
+ public long getPumpSerial() {
+ return pumpMac & 0xffffff;
+ }
}
--
GitLab