Skip to content

DEV-75 #198

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 3 commits into from
Jan 31, 2025
Merged

DEV-75 #198

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17893d2
Update for Mag WR 3R Support
dmariapan-shimmer Jan 20, 2025
69b5374
Merge branch 'DEV-74' into DEV-75
JongChern Jan 22, 2025
8f2652e
Merge branch 'master' into DEV-75
JongChern Jan 31, 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
1 change: 1 addition & 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 @@ -982,6 +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 PRESS_TEMP_BMP180 = SensorBMP180.GuiLabelSensors.PRESS_TEMP_BMP180;

Expand Down