Skip to content

Consensys_v1.6.2 - hack fix for CON-644 and CON-645 to release #114

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

Open
ShimmerEngineering wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consensys_v1.6.2 - hack fix for CON-644 and CON-645 to release #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@ public ObjectCluster buildMsg(byte[] newPacket, COMMUNICATION_TYPE fwType, boole
else {
if (!isRtcDifferenceSet()){
//sd log time stamp already included in mnChannels
if(isEXGUsingDefaultECGConfiguration() || isEXGUsingDefaultRespirationConfiguration()){
//HACK for CON-644 -> Do not merge to Dev/Master
numAdditionalChannels += 1;
}
}
else {
//for RTC
Expand Down
2 changes: 1 addition & 1 deletion ...merDriver/src/main/java/com/shimmerresearch/driver/calibration/CalibDetailsKinematic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public boolean isSensitivityWithinRangeOfDefault(){
}
}
}

isValid = true; //HACK for CON-645 -> Do not merge to Dev/Master
return isValid;
}

Expand Down