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"); 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) {