Skip to content

CON-723_2 update on basic dock not detecting after undocking shimmer #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShimmerEngineering merged 4 commits into from
Jan 6, 2025
Merged

CON-723_2 update on basic dock not detecting after undocking shimmer #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2a7a83
JA-131 #time 1.5h support for Shimmer3R device type
marknolan Nov 26, 2024
e6fd182
update on basic dock not detecting after undocking shimmer
harithjamadi Dec 2, 2024
132572a
Merge pull request #175 from ShimmerEngineering/JA-131
ShimmerEngineering Jan 6, 2025
881bf0f
Merge branch 'master' into CON-723_2
JongChern Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,9 @@ public void addDOCKCoummnicationRoute(String dockId, int slotNumber) {
addCommunicationRoute(COMMUNICATION_TYPE.DOCK);
}

public void clearDockInfo(){
setDockInfo(DEFAULT_DOCKID, DEFAULT_SLOTNUMBER);
public void clearDockInfo(String dockId, int slotNumber){
setDockInfo(dockId, slotNumber);
// setDockInfo(DEFAULT_DOCKID, DEFAULT_SLOTNUMBER);
}

public void setDockInfo(String dockId, int slotNumber){
Expand Down Expand Up @@ -753,7 +754,7 @@ public void removeCommunicationRoute(COMMUNICATION_TYPE communicationType) {
if(communicationType==COMMUNICATION_TYPE.DOCK){
setIsDocked(false);
setFirstDockRead();
clearDockInfo();
clearDockInfo(mDockID, mSlotNumber);
}

//TODO temp here -> check if the best place for it
Expand Down
15 changes: 12 additions & 3 deletions ...river/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public static enum DEVICE_TYPE {
SHIMMER3("Shimmer3"),
SHIMMER3_OUTPUT("OUTPUT"),
SHIMMER_ECG_MD("ShimmerECGmd"),
SHIMMER3R("Shimmer3R"),
SHIMMER4("Shimmer4"),

LUMAFIT("Lumafit"),
Expand Down Expand Up @@ -106,8 +107,8 @@ public static final class SH_SEARCH {
};

public static final class MASS_STORAGE_DEVICE {
public static final String[] HARDWARD_ID = new String[] {
"VID_0424&PID_4050",
public static final String[] HARDWARE_ID = new String[] {
"VID_0424&PID_4050", // Docks and Bases
};
public static final String[] BUS_DESCRIPTION = new String[] {
"SHIMMER",
Expand All @@ -133,15 +134,23 @@ public static final class MASS_STORAGE_DEVICE {
public static final String[] COMP_DEV_BASE = new String[] {
"VID_0403&PID_6011",
};

public static final String[] USB_HUB = new String[] {
"VID_0424&PID_2640",
};

public static final String[] SHIMMER_3R = new String[] {
"VID_0483&PID_52A4",
};

public static final String[] SHIMMER = new String[] {
"shimmer",
};

public static final String[] SHIMMER3R_COMPOSITE_DEVICE = new String[] { "SHIMMER COMPOSITE DEVICE" };

public static final String[] SHIMMER3R_MSC_DEVICE = new String[] { "SHIMMER MSC DEVICE" };

public static final class SERVICE_DESCRIPTION {
public static final String[] COMPOSITE_DEVICE = new String[]{"USB Composite Device"};

Expand Down