Skip to content

DEV-274 Swap LIS2MDL and LIS3MDL Mag Implementation #217

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 7 commits into from
May 21, 2025
Merged

DEV-274 Swap LIS2MDL and LIS3MDL Mag Implementation #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06bacb7
initial commit
MAzalya May 19, 2025
9de0ee0
more fixes and tidy up
MAzalya May 19, 2025
afecf6c
add main mag low power mode support
MAzalya May 20, 2025
f5b51b1
more update
MAzalya May 20, 2025
303fb4c
update
MAzalya May 21, 2025
fc6e6f5
Update API_0000X_ByteCommunicationShimmer3R.java
JongChern May 21, 2025
6dc2063
refactoring
JongChern May 21, 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
4 changes: 2 additions & 2 deletions ...river/src/main/java/com/shimmerresearch/algorithms/orientation/OrientationModule9DOF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public static class DatabaseChannelHandles{
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG),
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2MDL_MAG),
CHANNEL_UNITS.NO_UNITS,
SENSOR_CHECK_METHOD.ANY,
listChannelsEuler9DOF_LN);
Expand All @@ -318,7 +318,7 @@ public static class DatabaseChannelHandles{
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2DW12_ACCEL_WR,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO,
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG),
Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2MDL_MAG),
CHANNEL_UNITS.NO_UNITS,
SENSOR_CHECK_METHOD.ANY,
listChannelsQuat9DOF_WR);
Expand Down
22 changes: 11 additions & 11 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 @@ -84,8 +84,8 @@
import com.shimmerresearch.sensors.bmpX80.SensorBMP390;
import com.shimmerresearch.sensors.kionix.SensorKionixAccel;
import com.shimmerresearch.sensors.kionix.SensorKionixKXRB52042;
import com.shimmerresearch.sensors.lisxmdl.SensorLIS2MDL;
import com.shimmerresearch.sensors.lisxmdl.SensorLIS3MDL;
import com.shimmerresearch.sensors.lisxmdl.SensorLIS2MDL;
import com.shimmerresearch.sensors.lsm303.SensorLSM303;
import com.shimmerresearch.sensors.lsm303.SensorLSM303DLHC;
import com.shimmerresearch.sensors.mpu9x50.SensorMPU9150;
Expand Down Expand Up @@ -730,8 +730,8 @@ public class SENSOR_ID{
public static final int SHIMMER_LSM6DSV_GYRO = 38;
public static final int SHIMMER_LIS2DW12_ACCEL_WR = 39;
public static final int SHIMMER_ADXL371_ACCEL_HIGHG = 40;
public static final int SHIMMER_LIS3MDL_MAG = 41;
public static final int SHIMMER_LIS2MDL_MAG_WR = 42;
public static final int SHIMMER_LIS2MDL_MAG = 42;
public static final int SHIMMER_LIS3MDL_MAG_ALT = 41;
public static final int SHIMMER_BMP390_PRESSURE = 43;

// public static final int SHIMMER_EXG1_24BIT = 3;
Expand Down Expand Up @@ -923,8 +923,8 @@ public enum LABEL_SENSOR_TILE{
GYRO(SensorMPU9X50.LABEL_SENSOR_TILE.GYRO),
GYRO_3R(SensorLSM6DSV.LABEL_SENSOR_TILE.GYRO),
MAG(SensorLSM303.LABEL_SENSOR_TILE.MAG),
MAG_3R(SensorLIS3MDL.LABEL_SENSOR_TILE.MAG),
WIDE_RANGE_MAG_3R(SensorLIS2MDL.LABEL_SENSOR_TILE.WIDE_RANGE_MAG),
MAG_3R(SensorLIS2MDL.LABEL_SENSOR_TILE.MAG),
ALT_MAG_3R(SensorLIS3MDL.LABEL_SENSOR_TILE.ALT_MAG),
PRESSURE_TEMPERATURE_BMP180(SensorBMP180.LABEL_SENSOR_TILE.PRESSURE_TEMPERATURE),
PRESSURE_TEMPERATURE_BMP280(SensorBMP280.LABEL_SENSOR_TILE.PRESSURE_TEMPERATURE),
PRESSURE_TEMPERATURE_BMP390(SensorBMP390.LABEL_SENSOR_TILE.PRESSURE_TEMPERATURE),
Expand Down Expand Up @@ -982,7 +982,7 @@ public class GuiLabelSensors{

// public static final String ACCEL_WR = SensorLSM303.GuiLabelSensors.ACCEL_WR;
public static final String MAG = SensorLSM303DLHC.GuiLabelSensors.MAG;
public static final String WR_MAG_3R = SensorLIS2MDL.GuiLabelSensors.MAG_WR;
public static final String WR_MAG_3R = SensorLIS3MDL.GuiLabelSensors.MAG_ALT;

// public static final String PRESS_TEMP_BMP180 = SensorBMP180.GuiLabelSensors.PRESS_TEMP_BMP180;

Expand Down Expand Up @@ -1122,9 +1122,9 @@ public static class ObjectClusterSensorName{
public static String ACCEL_HIGHG_X = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_X;
public static String ACCEL_HIGHG_Y = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_Y;
public static String ACCEL_HIGHG_Z= SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_Z;
public static String MAG_WR_X = SensorLIS2MDL.ObjectClusterSensorName.MAG_WR_X;
public static String MAG_WR_Y = SensorLIS2MDL.ObjectClusterSensorName.MAG_WR_Y;
public static String MAG_WR_Z= SensorLIS2MDL.ObjectClusterSensorName.MAG_WR_Z;
public static String ALT_MAG_X = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_X;
public static String ALT_MAG_Y = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Y;
public static String ALT_MAG_Z= SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Z;

public static String BRIDGE_AMP_HIGH = SensorBridgeAmp.ObjectClusterSensorName.BRIDGE_AMP_HIGH;
public static String BRIDGE_AMP_LOW = SensorBridgeAmp.ObjectClusterSensorName.BRIDGE_AMP_LOW;
Expand Down Expand Up @@ -1504,7 +1504,7 @@ public static class CompatibilityInfoForMaps{
svoProto3DeluxeNewImuSdLog, svoProto3DeluxeNewImuLogAndStream);

//Shimmer3r Mag
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoLISM3MDL = Arrays.asList(
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoLIS2MDL = Arrays.asList(
svoShimmer3RImuLogAndStream, svoShimmer3RLogAndStream,
svoShimmer3RImuAnyExpBrdLogAndStream,
svoShimmer3RGsrUnifiedLogAndStream,
Expand All @@ -1513,7 +1513,7 @@ public static class CompatibilityInfoForMaps{
svoShimmer3RProto3DeluxeLogAndStream);

//Shimmer3r WR Mag
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoLIS2MDL = Arrays.asList(
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoLIS3MDL = Arrays.asList(
svoShimmer3RImuLogAndStream, svoShimmer3RLogAndStream,
svoShimmer3RImuAnyExpBrdLogAndStream,
svoShimmer3RGsrUnifiedLogAndStream,
Expand Down
Loading
Loading