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

jamorham · jamorham · commit 194b5954f596 · 2025-01-07T14:00:48.000Z
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
@@ -155,7 +155,7 @@ public static void sendLocalBroadcast(final BgReading bgReading) {
                 }
 
                 bundle.putInt(Intents.EXTRA_SENSOR_BATTERY, BridgeBattery.getBestBridgeBattery());
-                if (getBestCollectorHardwareName().equals("G7") || getBestCollectorHardwareName().equals("Native G6")) { // If we are using G7 or One+, or G6 in native mode
+                if (getBestCollectorHardwareName().equals("G7") || getBestCollectorHardwareName().equals("G6 Native")) { // If we are using G7 or One+, or G6 in native mode
                     usingG6OrG7 = true;
                 }
                 if (getBestCollectorHardwareName().equals("G7") && FirmwareCapability.isDeviceAltOrAlt2(getTransmitterID())) { // If we are using G7 or One+ and there is connectivity

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static void sendLocalBroadcast(final BgReading bgReading) {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`bundle.putInt(Intents.EXTRA_SENSOR_BATTERY, BridgeBattery.getBestBridgeBattery());`
`158`		`- if (getBestCollectorHardwareName().equals("G7") \|\| getBestCollectorHardwareName().equals("Native G6")) { // If we are using G7 or One+, or G6 in native mode`
	`158`	`+ if (getBestCollectorHardwareName().equals("G7") \|\| getBestCollectorHardwareName().equals("G6 Native")) { // If we are using G7 or One+, or G6 in native mode`
`159`	`159`	`usingG6OrG7 = true;`
`160`	`160`	`}`
`161`	`161`	`if (getBestCollectorHardwareName().equals("G7") && FirmwareCapability.isDeviceAltOrAlt2(getTransmitterID())) { // If we are using G7 or One+ and there is connectivity`