Merge pull request #252 from ShimmerEngineering/DEV-541

DEV-541 add default config for 3R in setDefaultShimmerConfiguration()

Author: MAzalya

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

@@ -4846,7 +4846,8 @@ public void setDefaultShimmerConfiguration() {
 			clearExgConfig(); // this currently must be called before sensorAndConfigMapsCreate() as it controls ExG booleans which affect EnabledSensors
 			sensorAndConfigMapsCreate();
 
-			if (getHardwareVersion() == HW_ID.SHIMMER_3){
+			int hwVersion = getHardwareVersion();
+			if (hwVersion == HW_ID.SHIMMER_3){
 				if(getExpansionBoardId()==HW_ID_SR_CODES.SHIMMER_ECG_MD){
 					setSensorEnabledState(Configuration.Shimmer3.SENSOR_ID.HOST_ECG, true);
 				} else {
@@ -4857,6 +4858,13 @@ public void setDefaultShimmerConfiguration() {
 
 					setIsAlgorithmEnabled(GyroOnTheFlyCalModule.GENERAL_ALGORITHM_NAME, true);
 				}
+			} else if (hwVersion == HW_ID.SHIMMER_3R) {
+				setSensorEnabledState(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN, true);
+				setSensorEnabledState(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO, true);
+				setSensorEnabledState(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2MDL_MAG, true);
+				setSensorEnabledState(Configuration.Shimmer3.SENSOR_ID.SHIMMER_VBATT, true);
+				
+				setIsAlgorithmEnabled(GyroOnTheFlyCalModule.GENERAL_ALGORITHM_NAME, true);
 			}
 
 			mTrialName = DEFAULT_EXPERIMENT_NAME;