Merge branch 'master' into false-av

tidepool-org · Oct 28, 2024 · e352bdd · e352bdd
2 parents f613c00 + 582d559
commit e352bdd
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 43 deletions.
diff --git a/app/actions/sync.js b/app/actions/sync.js
@@ -441,6 +441,7 @@ export function uploadFailure(err, errProps, device) {
   const properties = {
     type: _.get(device, 'source.type', undefined),
     source: `${actionUtils.getUploadTrackingId(device)}`,
+    device: device.key,
     os: `${actionUtils.getOSDetails()}`,
     error: err
   };

diff --git a/app/components/Upload.js b/app/components/Upload.js
@@ -212,7 +212,7 @@ export default class Upload extends Component {
       return this.handleMedtronic600Upload();
     }
 
-    if (device === 'caresensble' || device === 'onetouchverioble' || device === 'foracareble') {
+    if (device === 'caresensble' || device === 'onetouchverioble' || device === 'foracareble' || device === 'relionplatinumble') {
       return this.handleBluetoothUpload(_.get(upload, 'key', null));
     }
 

diff --git a/app/reducers/devices.js b/app/reducers/devices.js
@@ -41,6 +41,14 @@ const devices = {
     source: {type: 'device', driverId: 'AbbottPrecisionXtra'},
     enabled: {mac: false, win: true, linux: true}
   },
+  accuchekusb: {
+    instructions: i18n.t('Plug in meter with micro-USB cable'),
+    name: 'Accu-Chek Aviva Connect, Instant, Guide & Guide Me',
+    key: 'accuchekusb',
+    source: {type: 'device', driverId: 'AccuChekUSB'},
+    enabled: {mac: true, win: true, linux: true},
+    powerOnlyWarning: true,  // shows warning for power-only USB cables
+  },
   bayercontournext: {
     instructions: i18n.t('Plug meter into USB port'),
     key: 'bayercontournext',
@@ -254,6 +262,17 @@ const devices = {
     enabled: {mac: true, win: true, linux: true},
     powerOnlyWarning: true,  // shows warning for power-only USB cables
   },
+  relionplatinumble: {
+    instructions: {
+                    text: i18n.t('To pair: With meter off, hold the down arrow button until Bluetooth symbol appears \u2022 For full pairing instructions,'),
+                    linkText: i18n.t('visit our support site'),
+                    link: 'https://support.tidepool.org/hc/en-us/articles/14204858905492-Uploading-your-ReliOn-Platinum-meter',
+                  },
+    name: 'ReliOn Platinum (using Bluetooth)',
+    key: 'relionplatinumble',
+    source: {type: 'device', driverId: 'BluetoothLE'},
+    enabled: {mac: true, win: true, linux: true}
+  },
   relionpremier: {
     instructions: i18n.t('Plug in meter with cable and make sure the meter is switched on'),
     name: 'ReliOn Premier (BLU, Voice & Classic)',
@@ -268,14 +287,6 @@ const devices = {
     source: {type: 'device', driverId: 'ReliOnPrime'},
     enabled: {mac: true, win: true, linux: true},
   },
-  accuchekusb: {
-    instructions: i18n.t('Plug in meter with micro-USB cable'),
-    name: 'Accu-Chek Aviva Connect, Instant, Guide & Guide Me',
-    key: 'accuchekusb',
-    source: {type: 'device', driverId: 'AccuChekUSB'},
-    enabled: {mac: true, win: true, linux: true},
-    powerOnlyWarning: true,  // shows warning for power-only USB cables
-  },
   tandem: {
     instructions: i18n.t('Plug in pump with micro-USB'),
     key: 'tandem',

diff --git a/lib/drivers/bluetoothLE/bluetoothLEDriver.js b/lib/drivers/bluetoothLE/bluetoothLEDriver.js
@@ -25,6 +25,7 @@ import structJs from '../../struct';
 import common from '../../commonFunctions';
 import uploadDataPeriod from '../../../app/utils/uploadDataPeriod';
 import api from '../../core/api';
+import getModelName from '../roche/models';
 
 const struct = structJs();
 
@@ -89,7 +90,8 @@ module.exports = (config) => {
        if (!cfg.deviceInfo.name.startsWith('CareSens') &&
            !cfg.deviceInfo.name.startsWith('ReliOn 2395') &&
            !cfg.deviceInfo.name.startsWith('ReliOn 0015') &&
-           !cfg.deviceInfo.name.startsWith('TNG VOICE')) {
+           !cfg.deviceInfo.name.startsWith('TNG VOICE') &&
+           !cfg.deviceInfo.name.startsWith('meter+')) {
          return cb (new Error('We don\'t currently support this meter.'));
        }
 
@@ -108,7 +110,12 @@ module.exports = (config) => {
 
        cfg.deviceTags = ['bgm'];
        cfg.deviceInfo.deviceId = `${[cfg.deviceInfo.manufacturers]}-${cfg.deviceInfo.model}`;
-       if(env.electron){
+
+       if(cfg.deviceInfo.name.startsWith('meter+')) {
+         cfg.deviceInfo.serial = cfg.deviceInfo.model + cfg.deviceInfo.name.slice(6);
+         cfg.deviceInfo.deviceId += `-${cfg.deviceInfo.serial}`;
+         data.deviceModel = getModelName(cfg.deviceInfo.model);
+       } else if(env.electron){
          cfg.deviceInfo.deviceId += `-${remote.getGlobal('bluetoothDeviceId')}`;
        } else {
          cfg.deviceInfo.deviceId += `-${cfg.deviceComms.ble.device.id}`;
@@ -308,20 +315,19 @@ module.exports = (config) => {
            record.value = 601;
            annotation = {
              code: 'bg/out-of-range',
-             threshold: 600,
              value: 'high',
            };
-         } else if (record.value < 20) {
-           record.value = 19;
+         } else if (record.value < 10) {
+           record.value = 9; // set value below lowest known threshold
            annotation = {
              code: 'bg/out-of-range',
-             threshold: 20,
              value: 'low',
            };
          }
        }
 
-       if (record.type !== 10) { //check that it's not control solution
+       if (record.type !== 10 &&  // check that it's not control solution
+            record.type !== 4) {  // Accu-Chek meters record unlisted values with type 4
          let postRecord = null;
 
          if (isKetone) {
@@ -334,12 +340,25 @@ module.exports = (config) => {
              .with_units(record.units);
          }
 
+         if (cfg.deviceInfo.manufacturers.includes('Roche')) {
+           // The roche/accuChekUSB.js driver does not record seconds, so to prevent
+           // duplicates we also remove seconds from the Bluetooth uploads for Roche
+           // meters (even the one branded as ReliOn Platinum)
+           record.timestamp.setSeconds(0);
+         }
+
          postRecord
             .with_deviceTime(sundial.formatDeviceTime(record.timestamp))
             .set('index', record.seqNum);
 
          if (annotation) {
            annotate.annotateEvent(postRecord, annotation);
+           // BG treshold values are not provided, and we know there are meters
+           // with different thresholds, e.g. Accu-chek Instant range is 10-600mg/dL
+           // vs 20-600mg/dL for other meters, so we annotate that threshold is unknown
+           annotate.annotateEvent(postRecord, {
+             code: 'bg/unknown-value',
+           });
          }
 
          cfg.tzoUtil.fillInUTCInfo(postRecord, record.timestamp);
@@ -384,6 +403,12 @@ module.exports = (config) => {
        version: cfg.version,
      };
 
+     if(cfg.deviceInfo.name.startsWith('meter+')) {
+       // For Roche meters, we want to store the model number in the upload
+       // record instead of the model name, to match the USB version
+       sessionInfo.deviceModel = cfg.deviceInfo.model;
+     }
+
      cfg.api.upload.toPlatform(
        data.post_records, sessionInfo, progress, cfg.groupId,
        (err, result) => {

diff --git a/lib/drivers/roche/accuChekUSB.js b/lib/drivers/roche/accuChekUSB.js
@@ -35,6 +35,8 @@ import {
   getProductionSpecEntry,
 } from './utils';
 
+import getModelName from './models';
+
 const isBrowser = typeof window !== 'undefined';
 // eslint-disable-next-line no-console
 const debug = isBrowser ? require('bows')('AccuChekUSBDriver') : console.log;
@@ -507,27 +509,6 @@ module.exports = (config) => {
   // timezone is applied across-the-board
   cfg.tzoUtil = new TZOUtil(cfg.timezone, new Date().toISOString(), []);
 
-  const models = [
-    { name: 'Aviva Connect', numbers: [483, 484, 497, 498, 499, 500, 502, 685] },
-    { name: 'Performa Connect', numbers: [479, 501, 503, 765] },
-    { name: 'Guide', numbers: [921, 922, 923, 925, 926, 929, 930, 932] },
-    { name: 'Instant (single-button)', numbers: [958, 959, 960, 961, 963, 964, 965] },
-    { name: 'Guide Me', numbers: [897, 898, 901, 902, 903, 904, 905] },
-    { name: 'Instant (two-button)', numbers: [972, 973, 975, 976, 977, 978, 979, 980] },
-    { name: 'Instant S (single-button)', numbers: [966, 967, 968, 969, 970, 971] },
-    { name: 'ReliOn Platinum', numbers: [982] },
-  ];
-
-  const getModelName = (number) => {
-    // eslint-disable-next-line no-restricted-syntax
-    for (const i in models) {
-      if (models[i].numbers.indexOf(_.toInteger(number)) >= 0) {
-        return models[i].name;
-      }
-    }
-    return `Unknown model ${number}`;
-  };
-
   return {
     /* eslint no-param-reassign:
        [ "error", { "props": true, "ignorePropertyModificationsFor": ["data"] } ] */

diff --git a/lib/drivers/roche/models.js b/lib/drivers/roche/models.js
@@ -0,0 +1,41 @@
+/*
+ * == BSD2 LICENSE ==
+ * Copyright (c) 2024, Tidepool Project
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the associated License, which is identical to the BSD 2-Clause
+ * License as published by the Open Source Initiative at opensource.org.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the License for more details.
+ *
+ * You should have received a copy of the License along with this program; if
+ * not, you can obtain one from Tidepool Project at tidepool.org.
+ * == BSD2 LICENSE ==
+ */
+
+import _ from 'lodash';
+
+const models = [
+  { name: 'Aviva Connect', numbers: [483, 484, 497, 498, 499, 500, 502, 685] },
+  { name: 'Performa Connect', numbers: [479, 501, 503, 765] },
+  { name: 'Guide', numbers: [921, 922, 923, 925, 926, 929, 930, 932] },
+  { name: 'Instant (single-button)', numbers: [958, 959, 960, 961, 963, 964, 965] },
+  { name: 'Guide Me', numbers: [897, 898, 901, 902, 903, 904, 905] },
+  { name: 'Instant (two-button)', numbers: [972, 973, 975, 976, 977, 978, 979, 980] },
+  { name: 'Instant S (single-button)', numbers: [966, 967, 968, 969, 970, 971] },
+  { name: 'ReliOn Platinum', numbers: [982] },
+];
+
+const getModelName = (number) => {
+  // eslint-disable-next-line no-restricted-syntax
+  for (const i in models) {
+    if (models[i].numbers.indexOf(_.toInteger(number)) >= 0) {
+      return models[i].name;
+    }
+  }
+  return `Unknown model ${number}`;
+};
+
+export default getModelName;
diff --git a/locales/en/translation.missing.json b/locales/en/translation.missing.json
@@ -66,8 +66,10 @@
   "You can continue to use your current version,": "You can continue to use your current version,",
   "but we recommend updating as soon as possible.": "but we recommend updating as soon as possible.",
   "Plug in PDA with micro-USB": "Plug in PDA with micro-USB",
-  "There is no new data since last time. If you think this is an error, please reach out below.": "There is no new data since last time. If you think this is an error, please reach out below.",
   "Share this issue with the Tidepool Support Team": "Share this issue with the Tidepool Support Team",
+  "To pair: With meter off, hold the down arrow button until Bluetooth symbol appears • For full pairing instructions,": "To pair: With meter off, hold the down arrow button until Bluetooth symbol appears • For full pairing instructions,",
+  "We couldn't log you in. Try again in a few minutes.": "We couldn't log you in. Try again in a few minutes.",
+  "There is no new data since last time. If you think this is an error, please reach out below.": "There is no new data since last time. If you think this is an error, please reach out below.",
   "Data is up to date": "Data is up to date",
   "There is no data on the device. If you think this is an error, please reach out below.": "There is no data on the device. If you think this is an error, please reach out below.",
   "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload.": "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload."

diff --git a/test/app/actions/async.test.js b/test/app/actions/async.test.js
@@ -1735,7 +1735,8 @@ describe('Asynchronous Actions', () => {
                 type: targetDevice.source.type,
                 source: targetDevice.source.driverId,
                 os: 'BeOS R5.1 (RISC-V)',
-                error: err
+                error: err,
+                device: 'a_pump',
               }
             }
           }
@@ -1844,7 +1845,8 @@ describe('Asynchronous Actions', () => {
                 type: targetDevice.source.type,
                 source: targetDevice.source.driverId,
                 os: 'BeOS R5.1 (RISC-V)',
-                error: err
+                error: err,
+                device: 'a_pump',
               }
             }
           }
@@ -1957,7 +1959,8 @@ describe('Asynchronous Actions', () => {
                 type: targetDevice.source.type,
                 source: targetDevice.source.driverId,
                 os: 'BeOS R5.1 (RISC-V)',
-                error: err
+                error: err,
+                device: 'a_pump',
               }
             }
           }

diff --git a/test/app/actions/sync.test.js b/test/app/actions/sync.test.js
@@ -828,7 +828,8 @@ describe('Synchronous Actions', () => {
                 type: device.source.type,
                 source: device.source.driverId,
                 os: 'BeOS R5.1 (RISC-V)',
-                error: resError
+                error: resError,
+                device: undefined,
               }
             }
           }
@@ -859,7 +860,8 @@ describe('Synchronous Actions', () => {
                 source: device.source.driverId,
                 os: 'BeOS R5.1 (RISC-V)',
                 error: resError,
-                limit: '4 weeks'
+                limit: '4 weeks',
+                device: undefined,
               }
             }
           }

diff --git a/test/app/actions/utils.test.js b/test/app/actions/utils.test.js
@@ -84,6 +84,7 @@ describe('utils', () => {
               source: 'bar',
               os: 'BeOS R5.1 (RISC-V)',
               error: displayErr,
+              device: undefined,
             }
           }
         }
@@ -130,6 +131,7 @@ describe('utils', () => {
               source: 'bar',
               os: 'BeOS R5.1 (RISC-V)',
               error: displayErr,
+              device: undefined,
             }
           }
         }