Merge pull request #254 from ShimmerEngineering/DEV-579

jyong15 · web-flow · commit d9c60febb6e9 · 2026-01-12T15:04:45.000+08:00
DEV-579 USB 3R support - Right Click Menu Items
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
@@ -1402,6 +1402,9 @@ else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.BASE15.getLabe
 		else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.BASE6.getLabel())){
 			mDockType = DEVICE_TYPE.BASE6;
 		}
+		else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.SHIMMER3R.getLabel())){
+			mDockType = DEVICE_TYPE.SHIMMER3R;
+		} 
 		else {
 			mDockType = DEVICE_TYPE.UNKOWN;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1402,6 +1402,9 @@ else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.BASE15.getLabe`
`1402`	`1402`	`else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.BASE6.getLabel())){`
`1403`	`1403`	`mDockType = DEVICE_TYPE.BASE6;`
`1404`	`1404`	`}`
	`1405`	`+ else if(mDockID.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.SHIMMER3R.getLabel())){`
	`1406`	`+ mDockType = DEVICE_TYPE.SHIMMER3R;`
	`1407`	`+ }`
`1405`	`1408`	`else {`
`1406`	`1409`	`mDockType = DEVICE_TYPE.UNKOWN;`
`1407`	`1410`	`}`