From d54fa0fcef4897dbb0c5e234fb2ff89f9acfc716 Mon Sep 17 00:00:00 2001 From: Navid Date: Fri, 31 May 2024 17:44:05 -0400 Subject: [PATCH 1/3] No More references to G5 --- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7222b5530b..339e50f0be 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -6,7 +6,7 @@ Wifi Wixel / Parakeet Wifi Wixel + BT Wixel Wifi Wixel + xBridge Wixel - G5/G6/G7/1 Transmitter + G6/G7/1/1+ Transmitter Libre Bluetooth Libre Bluetooth + wifi Libre wifi diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a55737e4d1..3fa9769bc5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -629,7 +629,7 @@ Turn Bluetooth on Reset Bluetooth by turning it off and on if we don\'t get anything in 20 minutes Bluetooth Watchdog - Reset Bluetooth by turning it off and on as a way to keep the G5 data source working. Without this the G5 collector may fail. + Reset Bluetooth by turning it off and on as a way to keep the data source working. Without this the collector may fail. Dex Bluetooth Watchdog If the Bluetooth watchdog activates often then you can try unchecking this option to see if it helps Older Bluetooth wakelocks which can drain extra battery but might be needed for Bluetooth reception @@ -685,7 +685,7 @@ Show treatment insulin total Total Insulin Percentage of sensor readings received - Percentage of sensor readings received in realtime (non-backfilled). G5 Native mode ONLY + Percentage of sensor readings received in realtime (non-backfilled). Dex Native mode ONLY Packet capture percentage Realtime packet capture percentage Show calibration accuracy evaluation from last 3 days @@ -727,11 +727,11 @@ Low level diagnostic/prototype value ID of your Dexcom Transmitter, e.g. 12AB3 Advanced Dexcom settings for rare situations - G5/G6/G7/Dex1 Debug Settings + Dex Debug Settings Some devices work better when scanning constantly, others do not. If reading is reliable when this setting is not selected, you should have improved battery life. Normally best to keep this disabled - Scan for G5 constantly + Scan constantly This is crucial for some Android devices to properly connect, but can cause missed readings when other UI intensive activities are in use. - Force G5 to UI Thread + Force to UI Thread Authenticate before each read This will attempt a full authentication each read attempt. Needed for newer G5 transmitter firmware versions. Unbond G5 before each read @@ -1215,12 +1215,12 @@ Send your bridge battery level to Nightscout. Uncheck if your battery sensor is broken. Upload bridge battery Send Dexcom transmitter battery statistics to Nightscout. Includes all of the data shown on the Collector Status screen. - Upload OB1G5/G6/G7/1 transmitter battery + Upload OB1 G6/G7/1 transmitter battery Send treatment data to Nightscout. Uncheck if your careportal is broken. Upload treatments Display and sound a notification if Nightscout upload is failing. Alert on failures - For G5, sends collector type (e.g. OB1) and reading backfill status (for native) to Nightscout. + For Dex, sends collector type (e.g. OB1) and reading backfill status (for native) to Nightscout. Append source info to device name Tap to send historical data to Nightscout Back-fill data @@ -1368,7 +1368,7 @@ Download meals from CareLink Notifications Download notifications from CareLink - OB1 G5/G6/G7 Collector Settings + OB1 Dex Collector Settings Complete re-write, should work on Android 4.4 - 9, supports native mode and more Use the OB1 Collector Use the transmitter\'s internal algorithm to calculate glucose values when possible. @@ -1383,14 +1383,14 @@ Fallback to xDrip Use heuristics to minimize Bluetooth scanning + save power Minimize Scanning - I am using a G6, G7 or Dexcom 1 Sensor - G6/G7/Dex1 Support + I am using a G6, G7, Dexcom 1 or One+ Sensor + G6/G7/Dex1/One+ Support OB1 collector can unbond if it thinks the encryption has failed. If you get problems with it unpairing then disable this option. If you then totally lose connection, make sure this is enabled. Allow OB1 unbonding OB1 collector can initiate bonding. Allow OB1 initiate bonding - Old G5 Collector Settings - G5/G6/Dex1 battery options + Old Dex Collector Settings + G6/Dex1 battery options Adjust battery warning level Plugins and Features Heart rate monitor From 018b0c9432e0531677341293ba929d5bf9227978 Mon Sep 17 00:00:00 2001 From: Navid Date: Fri, 31 May 2024 18:09:15 -0400 Subject: [PATCH 2/3] Cleanup --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fa9769bc5..d987d09113 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -731,7 +731,7 @@ Some devices work better when scanning constantly, others do not. If reading is reliable when this setting is not selected, you should have improved battery life. Normally best to keep this disabled Scan constantly This is crucial for some Android devices to properly connect, but can cause missed readings when other UI intensive activities are in use. - Force to UI Thread + Force Dex to UI Thread Authenticate before each read This will attempt a full authentication each read attempt. Needed for newer G5 transmitter firmware versions. Unbond G5 before each read From da83c158eaf2fb4fcaad1bf546095ba5c3f38064 Mon Sep 17 00:00:00 2001 From: Navid Date: Fri, 31 May 2024 18:23:47 -0400 Subject: [PATCH 3/3] Shorter title to fit on screen --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d987d09113..1d20c6dfc2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1215,7 +1215,7 @@ Send your bridge battery level to Nightscout. Uncheck if your battery sensor is broken. Upload bridge battery Send Dexcom transmitter battery statistics to Nightscout. Includes all of the data shown on the Collector Status screen. - Upload OB1 G6/G7/1 transmitter battery + Upload Dexcom battery Send treatment data to Nightscout. Uncheck if your careportal is broken. Upload treatments Display and sound a notification if Nightscout upload is failing.