Merge branch 'master' into remove-jellyfish

tidepool-org · Oct 31, 2024 · df02a50 · df02a50
2 parents 667d594 + 5e64192
commit df02a50
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/app/reducers/devices.js b/app/reducers/devices.js
@@ -225,9 +225,17 @@ const devices = {
     enabled: {linux: false, mac: false, win: true},
     powerOnlyWarning: true,
   },
+  onetouchultraplus: {
+    instructions: i18n.t('Plug in meter with micro-USB'),
+    name: 'OneTouch Ultra Plus Flex',
+    key: 'onetouchultraplus',
+    source: {type: 'device', driverId: 'OneTouchUltraPlus'},
+    enabled: {linux: true, mac: true, win: true},
+    powerOnlyWarning: true,
+  },
   onetouchverioble: {
     instructions: i18n.t('Turn meter on and make sure Bluetooth is switched on'),
-    name: 'OneTouch Verio Flex, Verio Reflect & Select Plus Flex (with Bluetooth)',
+    name: 'OneTouch Verio Flex, Verio Reflect, Select Plus Flex and Ultra Plus Flex (with Bluetooth)',
     key: 'onetouchverioble',
     source: {type: 'device', driverId: 'OneTouchVerioBLE'},
     enabled: {mac: true, win: true, linux: true}

diff --git a/electron-builder-publish.js b/electron-builder-publish.js
@@ -70,7 +70,8 @@ const config = {
     publisherName: [
       'Tidepool Project'
     ],
-    rfc3161TimeStampServer: 'http://timestamp.digicert.com'
+    rfc3161TimeStampServer: 'http://timestamp.digicert.com',
+    asarUnpack: '**\\*.node',
   },
   mac: {
     category: 'public.app-category.tools',

diff --git a/lib/core/device.js b/lib/core/device.js
@@ -76,6 +76,7 @@ device.deviceDrivers = {
   OneTouchVerioIQ: oneTouchVerioIQ,
   OneTouchVerioBLE: oneTouchVerioBLE,
   OneTouchSelect: oneTouchVerio,
+  OneTouchUltraPlus: oneTouchVerio,
   AbbottFreeStyleLite: abbottFreeStyleLite,
   AbbottFreeStyleLibre: abbottFreeStyleLibre,
   AbbottFreeStyleNeo: abbottFreeStyleNeo,
@@ -111,6 +112,7 @@ device.deviceComms = {
   OneTouchVerioIQ: serialDevice,
   OneTouchVerioBLE: bleDevice,
   OneTouchSelect: usbDevice,
+  OneTouchUltraPlus: usbDevice,
   AbbottFreeStyleLite: serialDevice,
   AbbottFreeStyleLibre: hidDevice,
   AbbottFreeStyleNeo: hidDevice,
@@ -370,7 +372,8 @@ device.detect = (driverId, options, cb) => {
       if (webUSBDevice == null && (
         driverId === 'InsuletOmniPod' ||
         driverId === 'OneTouchVerio' ||
-        driverId === 'OneTouchSelect'
+        driverId === 'OneTouchSelect' ||
+        driverId === 'OneTouchUltraPlus'
       )) {
         // could also be block mode device
         device.deviceInfoCache[driverId] = _.cloneDeep(devdata);

diff --git a/lib/core/driverManifests.js b/lib/core/driverManifests.js
@@ -115,6 +115,12 @@ const driverManifests = {
       { vendorId: 10086, productId: 4100 }, // Select Plus Flex
     ],
   },
+  OneTouchUltraPlus: {
+    mode: 'usb',
+    usb: [
+      { vendorId: 10086, productId: 14 }, // Ultra Plus Flex
+    ],
+  },
   OneTouchUltraMini: {
     mode: 'serial',
     usb: [

diff --git a/lib/drivers/onetouch/oneTouchVerio.js b/lib/drivers/onetouch/oneTouchVerio.js
@@ -103,7 +103,7 @@ class USBScsiDevice {
       return callback(new Error(`Could not find device "${deviceInfo.driverId}".`));
     }
 
-    this.device = findByIds(deviceInfo.usbDevice.vendorId, deviceInfo.usbDevice.productId);
+    this.device = findByIds(deviceInfo?.usbDevice?.vendorId, deviceInfo?.usbDevice?.productId);
     if (!this.device) {
       return callback(new Error(`Failed to open connection to ${deviceInfo.driverId}`));
     }