Skip to content

DEV-277 Shimmer3R - LIS2MDL and ADXL371 (not all 3R HW Supports it) #218

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
JongChern merged 2 commits into from
Jun 3, 2025
Merged

DEV-277 Shimmer3R - LIS2MDL and ADXL371 (not all 3R HW Supports it) #218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83d73bd
add hw specific version compatibility check
MAzalya May 23, 2025
1c01bde
Merge remote-tracking branch 'origin/master' into DEV-277
MAzalya Jun 3, 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
69 changes: 65 additions & 4 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 @@ -5466,14 +5466,18 @@ else if(isSupportedNewImuSensors()){
mSensorLSM6DSV = new SensorLSM6DSV(this);
addSensorClass(mSensorLSM6DSV);

mSensorADXL371 = new SensorADXL371(this);
addSensorClass(mSensorADXL371);
if(isShimmer3RwithHighGAccelSupport()){
mSensorADXL371 = new SensorADXL371(this);
addSensorClass(mSensorADXL371);
}

mSensorLIS2DW12 = new SensorLIS2DW12(this);
addSensorClass(mSensorLIS2DW12);

mSensorLIS3MDL = new SensorLIS3MDL(this);
addSensorClass(mSensorLIS3MDL);
if(isShimmer3RwithAltMagSupport()){
mSensorLIS3MDL = new SensorLIS3MDL(this);
addSensorClass(mSensorLIS3MDL);
}

mSensorLIS2MDL = new SensorLIS2MDL(this);
addSensorClass(mSensorLIS2MDL);
Expand Down Expand Up @@ -10732,6 +10736,63 @@ public static boolean isSupportedBmp280(ShimmerVerObject svo, ExpansionBoardDeta
public boolean isSupportedNewImuSensors() {
return isSupportedNewImuSensors(getShimmerVerObject(), getExpansionBoardDetails());
}

public boolean isShimmer3RwithHighGAccelSupport() {
return isShimmer3RwithHighGAccelSupport(getShimmerVerObject(), getExpansionBoardDetails());
}

public static boolean isShimmer3RwithHighGAccelSupport(ShimmerVerObject svo, ExpansionBoardDetails ebd) {

if(svo==null || ebd==null){
return false;
}

int expBrdId = ebd.getExpansionBoardId();
int expBrdRev = ebd.getExpansionBoardRev();
int expBrdRevSpecial = ebd.getExpansionBoardRevSpecial();

if((svo.getHardwareVersion()==HW_ID.SHIMMER_3R) && (
(expBrdId == HW_ID_SR_CODES.SHIMMER3)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE && expBrdRev == 4 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_BR_AMP_UNIFIED && expBrdRev == 4 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 6 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 7 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 8 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED && expBrdRev == 7 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED && expBrdRev == 8 && expBrdRevSpecial == 0))){
return true;
}
else {
return false;
}
}
public boolean isShimmer3RwithAltMagSupport() {
return isShimmer3RwithAltMagSupport(getShimmerVerObject(), getExpansionBoardDetails());
}

public static boolean isShimmer3RwithAltMagSupport(ShimmerVerObject svo, ExpansionBoardDetails ebd) {
if(svo==null || ebd==null){
return false;
}
int expBrdId = ebd.getExpansionBoardId();
int expBrdRev = ebd.getExpansionBoardRev();
int expBrdRevSpecial = ebd.getExpansionBoardRevSpecial();

if((svo.getHardwareVersion()==HW_ID.SHIMMER_3R) && (
(expBrdId == HW_ID_SR_CODES.SHIMMER3 && expBrdRev == 11 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE && expBrdRev == 4 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_BR_AMP_UNIFIED && expBrdRev == 4 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 6 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 7 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED && expBrdRev == 8 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED && expBrdRev == 7 && expBrdRevSpecial == 0)
|| (expBrdId==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED && expBrdRev == 8 && expBrdRevSpecial == 0))){
return true;
}
else {
return false;
}
}

public static boolean isSupportedNewImuSensors(ShimmerVerObject svo, ExpansionBoardDetails ebd) {
if(svo==null || ebd==null){
Expand Down
Loading