From 8b2f3e658168231002803ce085e1c5ba0860142a Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 21 Mar 2024 12:16:21 +0000 Subject: [PATCH 1/9] add support for ultra plus flex --- app/reducers/devices.js | 8 ++++++++ lib/core/device.js | 5 ++++- lib/core/driverManifests.js | 6 ++++++ lib/drivers/onetouch/oneTouchVerio.js | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/reducers/devices.js b/app/reducers/devices.js index 38922cac1..27074b2cb 100644 --- a/app/reducers/devices.js +++ b/app/reducers/devices.js @@ -197,6 +197,14 @@ const devices = { enabled: {linux: true, mac: true, 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)', diff --git a/lib/core/device.js b/lib/core/device.js index eb5d2420d..e5f87d8dc 100644 --- a/lib/core/device.js +++ b/lib/core/device.js @@ -87,6 +87,7 @@ device.deviceDrivers = { OneTouchVerioIQ: oneTouchVerioIQ, OneTouchVerioBLE: oneTouchVerioBLE, OneTouchSelect: oneTouchVerio, + OneTouchUltraPlus: oneTouchVerio, AbbottFreeStyleLite: abbottFreeStyleLite, AbbottFreeStyleLibre: abbottFreeStyleLibre, AbbottFreeStyleNeo: abbottFreeStyleNeo, @@ -120,6 +121,7 @@ device.deviceComms = { OneTouchVerioIQ: serialDevice, OneTouchVerioBLE: bleDevice, OneTouchSelect: usbDevice, + OneTouchUltraPlus: usbDevice, AbbottFreeStyleLite: serialDevice, AbbottFreeStyleLibre: hidDevice, AbbottFreeStyleNeo: hidDevice, @@ -380,7 +382,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 index 284c33290..2b9994bc0 100644 --- a/lib/core/driverManifests.js +++ b/lib/core/driverManifests.js @@ -114,6 +114,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 index 013ba7f55..e160f19ec 100644 --- a/lib/drivers/onetouch/oneTouchVerio.js +++ b/lib/drivers/onetouch/oneTouchVerio.js @@ -98,7 +98,7 @@ class USBScsiDevice { } openDevice(deviceInfo, callback) { - 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}`)); } From da444e4c40d9b8224c7d0bb9d2dc48f56c2320ed Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 21 Mar 2024 12:17:04 +0000 Subject: [PATCH 2/9] v2.56.1-ultra-plus-flex.1 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 752474335..8f8982da9 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.56.1", + "version": "2.56.1-ultra-plus-flex.1", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index 4bc307a87..e2d0c90c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.56.1", + "version": "2.56.1-ultra-plus-flex.1", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", From 7c80fc969f255514e6658711dcd1fc1728fe4092 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Thu, 14 Mar 2024 16:53:16 -0400 Subject: [PATCH 3/9] Updated config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index db0697921..acccd3d6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,6 +105,8 @@ jobs: - restore_cache: key: dependency-cache-{{ checksum "package.json" }} # note: node 16.14.2 with npm 8.3.1 breaks yarn installation + - run: python -m pip install packaging + - run: pip install setuptools - run: nvm install v16.13.2 - run: nvm use v16.13.2 - run: node -v From 60f72a3ff7c4ba9fe48fa8ed59750673c97f8356 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Thu, 14 Mar 2024 17:03:11 -0400 Subject: [PATCH 4/9] Updated config.yml --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index acccd3d6a..7e4300949 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,6 +110,9 @@ jobs: - run: nvm install v16.13.2 - run: nvm use v16.13.2 - run: node -v + - run: npm install --global npm@8 node-gyp + - run: npm -v + - run: node-gyp -v - run: npm install --global yarn - run: yarn config set cache-folder ~/.cache/yarn - run: yarn --frozen-lockfile From c8550b482a35c3daae0aa41d59f632ced0f20c77 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 21 Mar 2024 13:02:12 +0000 Subject: [PATCH 5/9] also add ultra plus flex for bluetooth uploads --- app/reducers/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/reducers/devices.js b/app/reducers/devices.js index 27074b2cb..544a313b6 100644 --- a/app/reducers/devices.js +++ b/app/reducers/devices.js @@ -207,7 +207,7 @@ const devices = { }, 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} From 977cc515bc7507c8089fd5e63a5b78c7e1756d1a Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 25 Mar 2024 14:53:45 -0400 Subject: [PATCH 6/9] remove appBundleId to avoid legacy notarize use --- scripts/notarize.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/notarize.js b/scripts/notarize.js index 2c4073fb3..20f331ecd 100644 --- a/scripts/notarize.js +++ b/scripts/notarize.js @@ -11,7 +11,6 @@ exports.default = async function notarizing(context) { console.log(`Notarizing ${appName}`); return await notarize({ - appBundleId: 'org.tidepool.TidepoolUploader', appPath: `${appOutDir}/${appName}.app`, appleId: process.env.APPLEID, appleIdPassword: process.env.APPLEIDPASS, From 8017d262b1cc8141681bd3088b7c8456eb37d2c5 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 25 Mar 2024 15:02:13 -0400 Subject: [PATCH 7/9] disable built-in notarize function --- electron-builder-publish.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron-builder-publish.js b/electron-builder-publish.js index 2c16fa7e7..2f330bbf1 100644 --- a/electron-builder-publish.js +++ b/electron-builder-publish.js @@ -90,7 +90,8 @@ const config = { ] }, 'dir' - ] + ], + notarize: false, }, protocols: [{ name: 'Tidepool Uploader', From 9fd444efaf228a08310a9b3daba65f7f4859b347 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 21 Aug 2024 13:29:18 -0400 Subject: [PATCH 8/9] lintfix --- lib/drivers/onetouch/oneTouchVerio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/drivers/onetouch/oneTouchVerio.js b/lib/drivers/onetouch/oneTouchVerio.js index eb82f4ea2..73db44bdd 100644 --- 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}`)); } From d2d77d717ccc9f3ae9a440a7e7954dd6a413f907 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 24 Oct 2024 16:22:54 +0100 Subject: [PATCH 9/9] v2.59.1-ultra-plus-flex.3 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index ec028eab2..cb1089b9d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.58.0-ultra-plus-flex.2", + "version": "2.59.1-ultra-plus-flex.3", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index d83fbb573..5c3c99aea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.58.0-ultra-plus-flex.2", + "version": "2.59.1-ultra-plus-flex.3", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js",