Tidy up

Author: dmariapan-shimmer

ShimmerDriver/src/main/java/com/shimmerresearch/sensors/lsm6dsv/SensorLSM6DSV.java

@@ -566,7 +566,6 @@ public void setDefaultLSM6DSVAccelSensorConfig(boolean isSensorEnabled) {
 		}
 	}
 
-	
 	//--------- LN Accel methods end --------------
 
 
@@ -1143,14 +1142,6 @@ else if(sensorId==mSensorIdGyro) {
 			}
 			return true;
 		}
-
-		if(sensorId==mSensorIdGyro || sensorId == Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN){
-			setDefaultLSM6DSVGyroSensorConfig(isSensorEnabled);
-		}
-		if(sensorId==mSensorIdAccelLN || sensorId == Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO){
-			setDefaultLSM6DSVAccelSensorConfig(isSensorEnabled);
-		}
-		
 		return false;
 	}
 
@@ -1235,10 +1226,10 @@ public void generateCalibMap() {
 
 	@Override
 	public boolean isSensorUsingDefaultCal(int sensorId) {
-		if(sensorId==Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN || sensorId == mSensorIdAccelLN){
+		if(sensorId==Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN){
 			return isUsingDefaultLNAccelParam();
 		}
-		if(sensorId==Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO || sensorId == mSensorIdGyro){
+		else if(sensorId==Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO){
 			return isUsingDefaultGyroParam();
 		}
 		return false;