From be98e8b7004994282bd907afd0a6209174483e00 Mon Sep 17 00:00:00 2001
From: Lennart Goedhart <lennart@omnibase.com.au>
Date: Sat, 15 Apr 2017 16:20:50 +1000
Subject: [PATCH] =?UTF-8?q?Change=20=E2=80=98640g=E2=80=99=20references=20?=
=?UTF-8?q?to=20=E2=80=98600=20series=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 6 +++---
app/build.gradle | 2 +-
.../message/ContourNextLinkBinaryRequestMessage.java | 2 +-
.../medtronic/service/MedtronicCnlIntentService.java | 6 +++---
app/src/main/res/values/strings.xml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2346e1e..b5c9454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Initial public beta release
-[Unreleased]: https://github.com/pazaan/640gAndroidUploader/compare/v0.2.0...HEAD
-[v0.2.0]: https://github.com/pazaan/640gAndroidUploader/compare/v0.1.1...v0.2.0
-[v0.1.1]: https://github.com/pazaan/640gAndroidUploader/compare/v0.1.0...v0.1.1
+[Unreleased]: https://github.com/pazaan/600SeriesAndroidUploader/compare/v0.2.0...HEAD
+[v0.2.0]: https://github.com/pazaan/600SeriesAndroidUploader/compare/v0.1.1...v0.2.0
+[v0.1.1]: https://github.com/pazaan/600SeriesAndroidUploader/compare/v0.1.0...v0.1.1
diff --git a/app/build.gradle b/app/build.gradle
index 324b0c3..c5a1e8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,7 @@ task zipalignRelease << {
'-v',
'4',
'app/build/outputs/apk/app-release-unsigned.apk',
- 'app/build/outputs/apk/640g-android-uploader.apk'
+ 'app/build/outputs/apk/600-series-uploader.apk'
]
def proc = new ProcessBuilder(command)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryRequestMessage.java
index 96e72ed..4caf9c8 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryRequestMessage.java
@@ -54,7 +54,7 @@ public abstract class ContourNextLinkBinaryRequestMessage<T> extends ContourNext
payloadBuffer.put((byte) 0x51);
payloadBuffer.put((byte) 0x3);
- payloadBuffer.put("000000".getBytes()); // Text of PumpInfo serial, but 000000 for 640g
+ payloadBuffer.put("000000".getBytes()); // Text of PumpInfo serial, but 000000 for 600 Series pumps
byte[] unknownBytes = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
payloadBuffer.put(unknownBytes);
payloadBuffer.put(commandType.getValue());
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 bf08008..befd34c 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
@@ -223,8 +223,8 @@ public class MedtronicCnlIntentService extends IntentService {
byte radioChannel = cnlReader.negotiateChannel(activePump.getLastRadioChannel());
if (radioChannel == 0) {
- sendStatus("Could not communicate with the 640g. Are you near the pump?");
- Log.i(TAG, "Could not communicate with the 640g. Are you near the pump?");
+ sendStatus("Could not communicate with the pump. Is it nearby?");
+ Log.i(TAG, "Could not communicate with the pump. Is it nearby?");
pollInterval = configurationStore.getPollInterval() / (configurationStore.isReducePollOnPumpAway()?2L:1L); // reduce polling interval to half until pump is available
} else {
dataStore.setActivePumpMac(pumpMAC);
@@ -236,7 +236,7 @@ public class MedtronicCnlIntentService extends IntentService {
// read pump status
PumpStatusEvent pumpRecord = realm.createObject(PumpStatusEvent.class);
- String deviceName = String.format("medtronic-640g://%s", cnlReader.getStickSerial());
+ String deviceName = String.format("medtronic-600://%s", cnlReader.getStickSerial());
activePump.setDeviceName(deviceName);
// TODO - this should not be necessary. We should reverse lookup the device name from PumpInfo
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b403419..5ede84c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
<resources>
<string name="hello">---</string>
- <string name="app_name">NS 640g Uploader</string>
+ <string name="app_name">NS 600 Series Uploader</string>
<string name="eula_title">Disclaimer</string>
<string name="eula_accept">Accept</string>
<string name="eula_refuse">Refuse</string>
--
GitLab