File tree Expand file tree Collapse file tree
ShimmerDriver/src/main/java/com/shimmerresearch/driver Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4845,7 +4845,8 @@ public void setDefaultShimmerConfiguration() {
48454845 clearExgConfig (); // this currently must be called before sensorAndConfigMapsCreate() as it controls ExG booleans which affect EnabledSensors
48464846 sensorAndConfigMapsCreate ();
48474847
4848- if (getHardwareVersion () == HW_ID .SHIMMER_3 ){
4848+ int hwVersion = getHardwareVersion ();
4849+ if (hwVersion == HW_ID .SHIMMER_3 ){
48494850 if (getExpansionBoardId ()==HW_ID_SR_CODES .SHIMMER_ECG_MD ){
48504851 setSensorEnabledState (Configuration .Shimmer3 .SENSOR_ID .HOST_ECG , true );
48514852 } else {
@@ -4856,6 +4857,13 @@ public void setDefaultShimmerConfiguration() {
48564857
48574858 setIsAlgorithmEnabled (GyroOnTheFlyCalModule .GENERAL_ALGORITHM_NAME , true );
48584859 }
4860+ } else if (hwVersion == HW_ID .SHIMMER_3R ) {
4861+ setSensorEnabledState (Configuration .Shimmer3 .SENSOR_ID .SHIMMER_LSM6DSV_ACCEL_LN , true );
4862+ setSensorEnabledState (Configuration .Shimmer3 .SENSOR_ID .SHIMMER_LSM6DSV_GYRO , true );
4863+ setSensorEnabledState (Configuration .Shimmer3 .SENSOR_ID .SHIMMER_LIS2MDL_MAG , true );
4864+ setSensorEnabledState (Configuration .Shimmer3 .SENSOR_ID .SHIMMER_VBATT , true );
4865+
4866+ setIsAlgorithmEnabled (GyroOnTheFlyCalModule .GENERAL_ALGORITHM_NAME , true );
48594867 }
48604868
48614869 mTrialName = DEFAULT_EXPERIMENT_NAME ;
You can’t perform that action at this time.
0 commit comments