From 5014a8221c2386bab02ff6733860e3898309dfcd Mon Sep 17 00:00:00 2001 From: JongChern Date: Wed, 31 Dec 2025 17:10:34 +0800 Subject: [PATCH] Update ShimmerDevice.java --- .../java/com/shimmerresearch/driver/ShimmerDevice.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 96e6554ef..b8c2e1770 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -3087,9 +3087,14 @@ public void disableAllAlgorithms(){ public boolean isECGAlgoEnabled(AbstractAlgorithm abstractAlgorithm){ SensorDetails ecgSensorDetails = getSensorDetails(Configuration.Shimmer3.SENSOR_ID.HOST_ECG); SensorDetails respSensorDetails = getSensorDetails(Configuration.Shimmer3.SENSOR_ID.HOST_EXG_RESPIRATION); - if((ecgSensorDetails.isEnabled() || respSensorDetails.isEnabled()) && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")){ + + if (ecgSensorDetails!=null && ecgSensorDetails.isEnabled() && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")) { + return true; + } + if (respSensorDetails!=null && ecgSensorDetails.isEnabled() && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")) { return true; } + return false; }