Skip to content

JA-115_3 SensorADXL371 + SensorLIS2MDL + SensorLIS3MDL update #172

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 8 commits into from
Nov 22, 2024
Merged

JA-115_3 SensorADXL371 + SensorLIS2MDL + SensorLIS3MDL update #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de14042
update override method for lisxmdl mag sensor
harithjamadi Nov 13, 2024
cca1726
update override method for adxl371
harithjamadi Nov 13, 2024
93a36bf
update on lisxmdl configoption file
harithjamadi Nov 15, 2024
a4a2228
added some comment on tbd method for high g accel and wr mag
harithjamadi Nov 15, 2024
e36510d
update lis2mdl and lis3mdl method conflict
harithjamadi Nov 15, 2024
9d57286
separating the lis3mdl, lis2mdl to extends abstractsensor individually
harithjamadi Nov 21, 2024
7e67b18
some update on lis3mdl on shimmerobject
harithjamadi Nov 21, 2024
4b792de
added some method for the shimmer object lis3mdl
harithjamadi Nov 21, 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
9 changes: 5 additions & 4 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,7 +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.SensorLISXMDL;
import com.shimmerresearch.sensors.lisxmdl.SensorLIS2MDL;
import com.shimmerresearch.sensors.lisxmdl.SensorLIS3MDL;
import com.shimmerresearch.sensors.lsm303.SensorLSM303;
import com.shimmerresearch.sensors.lsm303.SensorLSM303DLHC;
import com.shimmerresearch.sensors.mpu9x50.SensorMPU9150;
Expand Down Expand Up @@ -719,7 +720,7 @@ public class SENSOR_ID{
public static final int SHIMMER_LSM6DSV_ACCEL_LN = 37;
public static final int SHIMMER_LSM6DSV_GYRO = 38;
public static final int SHIMMER_LIS2DW12_ACCEL_WR = 39;
public static final int SHIMMER_ADXL371_ACCEL = 40;
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_BMP390_PRESSURE = 43;
Expand Down Expand Up @@ -909,8 +910,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(SensorLISXMDL.LABEL_SENSOR_TILE.MAG),
WIDE_RANGE_MAG_3R(SensorLISXMDL.LABEL_SENSOR_TILE.WIDE_RANGE_MAG),
MAG_3R(SensorLIS3MDL.LABEL_SENSOR_TILE.MAG),
WIDE_RANGE_MAG_3R(SensorLIS2MDL.LABEL_SENSOR_TILE.WIDE_RANGE_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
4 changes: 2 additions & 2 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 @@ -8049,7 +8049,7 @@ public void setLSM303MagRange(int i){
if(isShimmerGen3()) {
mSensorLSM303.setLSM303MagRange(i);
} else if(isShimmerGen3R()) {
mSensorLIS3MDL.setLIS3MDLMagRange(i);
mSensorLIS3MDL.setLISMagRange(i);
}
}

Expand All @@ -8074,7 +8074,7 @@ public void setMagRate(int magRate) {
} else if (isShimmerGen3()){
mSensorLSM303.setLSM303MagRate(magRate);
} else if (isShimmerGen3R()) {
mSensorLIS3MDL.setLIS3MDLMagRate(magRate);
mSensorLIS3MDL.setLISMagRate(magRate);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ShimmerDriver/src/main/java/com/shimmerresearch/sensors/AbstractSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public enum SENSORS{
BIOZ("MAX30001"),
ADXL371("ADXL371"),
LIS3MDL("LIS3MDL"), //to be changed
LISXMDL("LISXMDL"),
LIS2MDL("LIS2MDL"),
LSM6DSV("LSM6DSV"),
BMP390("BMP390");

Expand Down
873 changes: 556 additions & 317 deletions ShimmerDriver/src/main/java/com/shimmerresearch/sensors/adxl371/SensorADXL371.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading