Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

NightscoutFoundation · Mar 5, 2024 · 91ee76a · 91ee76a
2 parents d688217 + 42f9a95
commit 91ee76a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorDays.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorDays.java
@@ -5,7 +5,6 @@
 
 import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight;
@@ -32,6 +31,7 @@
 import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
 import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.None;
+import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getDexCollectionType;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.hasDexcomRaw;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.hasLibre;
@@ -103,7 +103,7 @@ public static SensorDays get(DexCollectionType type, final String tx_id) {
                ths.warmupMs = 2 * HOUR_IN_MS;
             }
 
-            if (FirmwareCapability.isDeviceG7(getTransmitterID())) { // If using a G7
+            if (getBestCollectorHardwareName().equals("G7")) { // If using a G7
                 ths.period = DAY_IN_MS * 10 + HOUR_IN_MS * 12; // The device lasts 10.5 days.
                 ths.warmupMs = 30 * MINUTE_IN_MS; // The warmup time is 30 minutes.
             }