From 911193af8b22459ef2db2ea124786a19d1eba45e Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Thu, 10 Apr 2025 21:30:39 +0100 Subject: [PATCH 1/2] DEV-196 #time 1m Changing Shimmer3r to Shimmer3R for greater impact --- .../com/shimmerresearch/driverUtilities/ShimmerVerDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java index bd9a963b0..215b2252e 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java @@ -76,7 +76,7 @@ public static final class HW_ID { aMap.put(HW_ID.SHIMMER_2, "Shimmer2"); aMap.put(HW_ID.SHIMMER_2R, "Shimmer2r"); aMap.put(HW_ID.SHIMMER_3, "Shimmer3"); - aMap.put(HW_ID.SHIMMER_3R, "Shimmer3r"); + aMap.put(HW_ID.SHIMMER_3R, "Shimmer3R"); aMap.put(HW_ID.SHIMMER_SR30, "Shimmer_SR30"); aMap.put(HW_ID.SHIMMER_GQ_BLE, "ShimmerGQBle"); aMap.put(HW_ID.SWEATCH, "SwEatch"); From 10f34d865b1cdffe9a1e63d45dbb302df095f0ae Mon Sep 17 00:00:00 2001 From: JongChern Date: Fri, 11 Apr 2025 11:27:09 +0800 Subject: [PATCH 2/2] Update API_0000X_ByteCommunicationShimmer3R.java --- .../communication/API_0000X_ByteCommunicationShimmer3R.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java index a0153dde3..637bd5d23 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java @@ -16,6 +16,7 @@ import com.shimmerresearch.driver.ShimmerMsg; import com.shimmerresearch.driverUtilities.ChannelDetails; import com.shimmerresearch.driverUtilities.SensorDetails; +import com.shimmerresearch.driverUtilities.ShimmerVerDetails; import com.shimmerresearch.driverUtilities.UtilParseData; import com.shimmerresearch.driverUtilities.UtilShimmer; import com.shimmerresearch.driverUtilities.ShimmerVerDetails.HW_ID; @@ -81,7 +82,7 @@ public void test001_testConnectandDisconnect() { } System.out.println(mDevice.getHardwareVersionParsed()); - if (!mDevice.getHardwareVersionParsed().equals("Shimmer3r")) { + if (!mDevice.getHardwareVersionParsed().equals(ShimmerVerDetails.mMapOfShimmerRevisions.get(HW_ID.SHIMMER_3R))) { assert(false); } if(!mByteCommunicationSimulatorS3R.isGetPressureCalibrationCoefficientsCommand) {