Skip to content

CON-685_sensorconfig fix the high g accel enabling, show the mag and high accel in sensor config #180

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
MAzalya merged 4 commits into from
Dec 5, 2024
Merged

CON-685_sensorconfig fix the high g accel enabling, show the mag and high accel in sensor config #180

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
a18ffad
update high g accel, mag sensor to shown in config option for shimmer3r
harithjamadi Dec 4, 2024
35fce84
fix high g accel fail to enable
harithjamadi Dec 5, 2024
44929a9
Merge remote-tracking branch 'origin/JA-115' into CON-685_sensorconfig
MAzalya Dec 5, 2024
46b7462
fix the pressure sensor not showing and cant be enable
harithjamadi Dec 5, 2024
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
10 changes: 10 additions & 0 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,16 @@ public static class CompatibilityInfoForMaps{
svoShimmer3RProto3MiniNewImuLogAndStream,
svoShimmer3RProto3DeluxeNewImuLogAndStream);

//Shimmer3r High-G Accel
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoADXL371 = Arrays.asList(
svoShimmer3RNewImuLogAndStream, svoShimmer3RLogAndStream,
svoShimmer3RNewImuAnyExpBrdLogAndStream,
svoShimmer3RGsrUnifiedNewImuLogAndStream,
svoShimmer3RExgUnifiedNewImuLogAndStream,
svoShimmer3RBrAmpUnifiedNewImuLogAndStream,
svoShimmer3RProto3MiniNewImuLogAndStream,
svoShimmer3RProto3DeluxeNewImuLogAndStream);

//TODO need to update this list and remove "any"
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoKionixKXRB52042 = Arrays.asList(
svoAnyIntExpBoardAndSdlog, svoAnyIntExpBoardAndBtStream, svoAnyIntExpBoardAndLogAndStream,
Expand Down
4 changes: 2 additions & 2 deletions ShimmerDriver/src/main/java/com/shimmerresearch/sensors/adxl371/SensorADXL371.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static final class DatabaseConfigHandle{
0x10<<8, //== Configuration.Shimmer3.SensorBitmap.SENSOR_D_ACCEL will be: SensorBitmap.SENSOR_D_ACCEL
0x10<<8, //== Configuration.Shimmer3.SensorBitmap.SENSOR_D_ACCEL will be: SensorBitmap.SENSOR_D_ACCEL
GuiLabelSensors.ACCEL_HIGHG,
CompatibilityInfoForMaps.listOfCompatibleVersionInfoAnyExpBoardStandardFW,
CompatibilityInfoForMaps.listOfCompatibleVersionInfoADXL371,
Arrays.asList(GuiLabelConfig.ADXL371_ACCEL_RANGE,
GuiLabelConfig.ADXL371_ACCEL_RATE),
Arrays.asList(ObjectClusterSensorName.ACCEL_HIGHG_X,
Expand Down Expand Up @@ -230,7 +230,7 @@ public static final class DatabaseConfigHandle{
public static final SensorGroupingDetails sensorGroupAdxlAccel = new SensorGroupingDetails(
LABEL_SENSOR_TILE.HIGH_G_ACCEL,
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_ADXL371_ACCEL_HIGHG),
CompatibilityInfoForMaps.listOfCompatibleVersionInfoAnyExpBoardStandardFW);
CompatibilityInfoForMaps.listOfCompatibleVersionInfoADXL371);

//--------- Constructors for this class start --------------

Expand Down
4 changes: 2 additions & 2 deletions ShimmerDriver/src/main/java/com/shimmerresearch/sensors/bmpX80/SensorBMP390.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static final class ObjectClusterSensorName{

public static final SensorGroupingDetails sensorGroupBmp390 = new SensorGroupingDetails(
LABEL_SENSOR_TILE.PRESSURE_TEMPERATURE,
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_BMPX80_PRESSURE),
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_BMP390_PRESSURE),
CompatibilityInfoForMaps.listOfCompatibleVersionInfoBMP390);

//--------- Sensor info end --------------
Expand Down Expand Up @@ -230,7 +230,7 @@ public void generateConfigOptionsMap() {
public void generateSensorGroupMapping() {
mSensorGroupingMap = new LinkedHashMap<Integer, SensorGroupingDetails>();
//TODO Extra version check here not needed because compatability info already contained in SensorGroupingDetails?
if(mShimmerVerObject.isShimmerGen3() || mShimmerVerObject.isShimmerGen4()){
if(mShimmerVerObject.isShimmerGen3() || mShimmerVerObject.isShimmerGen3R() || mShimmerVerObject.isShimmerGen4()){
mSensorGroupingMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.PRESSURE_TEMPERATURE_BMP390.ordinal(), sensorGroupBmp390);
}
super.updateSensorGroupingMap();
Expand Down
4 changes: 1 addition & 3 deletions ShimmerDriver/src/main/java/com/shimmerresearch/sensors/lisxmdl/SensorLIS3MDL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,7 @@ public void generateConfigOptionsMap() {
@Override
public void generateSensorGroupMapping() {
mSensorGroupingMap = new LinkedHashMap<Integer, SensorGroupingDetails>();
if(mShimmerVerObject.isShimmerGen3() || mShimmerVerObject.isShimmerGen4()){
mSensorGroupingMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.MAG_3R.ordinal(), sensorGroupLisMag);
}
mSensorGroupingMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.MAG_3R.ordinal(), sensorGroupLisMag);
super.updateSensorGroupingMap();
}

Expand Down