Merge pull request #83 from ShimmerEngineering/ASM-2200

marknolan · web-flow · commit f0ce9230837b · 2022-09-06T12:44:34.000+01:00
ASM-2200 added static method to check for PPG chip
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/VerisenseDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/VerisenseDevice.java
@@ -1122,7 +1122,10 @@ public boolean isEitherLsm6ds3ChannelEnabled() {
 	}
 	
 	public boolean doesHwSupportMax86xxx() {
-		int hwId = getHardwareVersion();
+		return doesHwSupportMax86xxx(getHardwareVersion());
+	}
+
+	public static boolean doesHwSupportMax86xxx(int hwId) {
 		return (hwId==HW_ID.VERISENSE_DEV_BRD || hwId==HW_ID.VERISENSE_PPG || hwId==HW_ID.VERISENSE_PULSE_PLUS);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,10 @@ public boolean isEitherLsm6ds3ChannelEnabled() {`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`	`1124`	`public boolean doesHwSupportMax86xxx() {`
`1125`		`- int hwId = getHardwareVersion();`
	`1125`	`+ return doesHwSupportMax86xxx(getHardwareVersion());`
	`1126`	`+ }`
	`1127`	`+`
	`1128`	`+ public static boolean doesHwSupportMax86xxx(int hwId) {`
`1126`	`1129`	`return (hwId==HW_ID.VERISENSE_DEV_BRD \|\| hwId==HW_ID.VERISENSE_PPG \|\| hwId==HW_ID.VERISENSE_PULSE_PLUS);`
`1127`	`1130`	`}`
`1128`	`1131`