Merge branch 'master' into DEV-85

Author: JongChern

ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java

@@ -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 = SensorLIS3MDL.GuiLabelSensors.MAG_ALT;
+			public static final String ALT_MAG_3R = SensorLIS3MDL.GuiLabelSensors.MAG_ALT;
 
 //			public static final String PRESS_TEMP_BMP180 = 	SensorBMP180.GuiLabelSensors.PRESS_TEMP_BMP180;
 

ShimmerDriver/src/main/java/com/shimmerresearch/sensors/lisxmdl/SensorLIS2MDL.java

@@ -472,11 +472,11 @@ public int getMagRateFromFreqForSensor(boolean isEnabled, double freq, int power
 			{
 				magRate = 0; // 10Hz
 			} else {
-				if (freq<10.0){
+				if (freq <= 10.0){
 					magRate = 0; // 10Hz
-				} else if (freq<20.0){
+				} else if (freq <= 20.0){
 					magRate = 1; // 20Hz
-				} else if (freq<50.0) {
+				} else if (freq <= 50.0) {
 					magRate = 2; // 50Hz
 				} else {
 					magRate = 3; // 100Hz