From 935dac3ac24217b489116316977f2b41e31f503c Mon Sep 17 00:00:00 2001
From: Gerrit Niezen <gerrit@tidepool.org>
Date: Tue, 18 Feb 2025 16:26:10 +0000
Subject: [PATCH 1/2] sometimes manufacturers are set to "Manufacturer name"

---
 lib/drivers/bluetoothLE/bluetoothLEDriver.js | 2 +-
 locales/en/translation.missing.json          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/drivers/bluetoothLE/bluetoothLEDriver.js b/lib/drivers/bluetoothLE/bluetoothLEDriver.js
index 76f940517..aaadfbe5a 100644
--- a/lib/drivers/bluetoothLE/bluetoothLEDriver.js
+++ b/lib/drivers/bluetoothLE/bluetoothLEDriver.js
@@ -95,7 +95,7 @@ module.exports = (config) => {
          return cb (new Error('We don\'t currently support this meter.'));
        }
 
-       if (cfg.deviceInfo.manufacturers == null && cfg.deviceInfo.name.startsWith('TNG')) {
+       if (cfg.deviceInfo.name.startsWith('TNG')) {
          // Fora meters don't set the BLE manufacturer string
          cfg.deviceInfo.manufacturers = ['ForaCare'];
        }
diff --git a/locales/en/translation.missing.json b/locales/en/translation.missing.json
index 61cc43322..204277f67 100644
--- a/locales/en/translation.missing.json
+++ b/locales/en/translation.missing.json
@@ -78,5 +78,6 @@
   "login to your account in Tidepool Web": "login to your account in Tidepool Web",
   "Go to Workspace": "Go to Workspace",
   "Want to use Tidepool for your private data?": "Want to use Tidepool for your private data?",
-  "Go to Private Workspace": "Go to Private Workspace"
+  "Go to Private Workspace": "Go to Private Workspace",
+  "Couldn't connect to device.": "Couldn't connect to device."
 }
\ No newline at end of file

From 722272105103f53fb5d0c3121cd2f77d59431759 Mon Sep 17 00:00:00 2001
From: Gerrit Niezen <gerrit@tidepool.org>
Date: Thu, 27 Feb 2025 16:52:34 +0000
Subject: [PATCH 2/2] catch retry failed error

---
 lib/drivers/bluetoothLE/bluetoothLEDriver.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/drivers/bluetoothLE/bluetoothLEDriver.js b/lib/drivers/bluetoothLE/bluetoothLEDriver.js
index aaadfbe5a..ce31b5a26 100644
--- a/lib/drivers/bluetoothLE/bluetoothLEDriver.js
+++ b/lib/drivers/bluetoothLE/bluetoothLEDriver.js
@@ -249,9 +249,14 @@ module.exports = (config) => {
          cfg.deviceComms.ble.addEventListener('numberOfRecords', handleNumberOfRecords, { once: true });
 
         setTimeout(async () => {
+
           retryTimer = setTimeout(async () => {
             debug('Retrying..');
-            await cfg.deviceComms.ble.getNumberOfRecords();
+            try{
+              await cfg.deviceComms.ble.getNumberOfRecords();
+            } catch(err) {
+              console.log('Retry failed:', err);
+            }
           }, 1000);
 
           try {