Skip to content

Commit 6dc2063

Browse files
JongChernJongChern
committed
refactoring
1 parent fc6e6f5 commit 6dc2063

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,9 +1122,9 @@ public static class ObjectClusterSensorName{
11221122
public static String ACCEL_HIGHG_X = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_X;
11231123
public static String ACCEL_HIGHG_Y = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_Y;
11241124
public static String ACCEL_HIGHG_Z= SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_Z;
1125-
public static String MAG_WR_X = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_X;
1126-
public static String MAG_WR_Y = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Y;
1127-
public static String MAG_WR_Z= SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Z;
1125+
public static String ALT_MAG_X = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_X;
1126+
public static String ALT_MAG_Y = SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Y;
1127+
public static String ALT_MAG_Z= SensorLIS3MDL.ObjectClusterSensorName.MAG_ALT_Z;
11281128

11291129
public static String BRIDGE_AMP_HIGH = SensorBridgeAmp.ObjectClusterSensorName.BRIDGE_AMP_HIGH;
11301130
public static String BRIDGE_AMP_LOW = SensorBridgeAmp.ObjectClusterSensorName.BRIDGE_AMP_LOW;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,15 +1150,15 @@ else if (isShimmerGen3()) {
11501150
}
11511151
if (((fwType == COMMUNICATION_TYPE.BLUETOOTH) && (mEnabledSensors & BTStream.MAG_ALT) > 0)
11521152
|| ((fwType == COMMUNICATION_TYPE.SD) && (mEnabledSensors & SDLogHeader.MAG_MPU) > 0)) {
1153-
int iMagX=getSignalIndex(Shimmer3.ObjectClusterSensorName.MAG_WR_X);
1154-
int iMagY=getSignalIndex(Shimmer3.ObjectClusterSensorName.MAG_WR_Y);
1155-
int iMagZ=getSignalIndex(Shimmer3.ObjectClusterSensorName.MAG_WR_Z);
1153+
int iMagX=getSignalIndex(Shimmer3.ObjectClusterSensorName.ALT_MAG_X);
1154+
int iMagY=getSignalIndex(Shimmer3.ObjectClusterSensorName.ALT_MAG_Y);
1155+
int iMagZ=getSignalIndex(Shimmer3.ObjectClusterSensorName.ALT_MAG_Z);
11561156
tempData[0]=(double)newPacketInt[iMagX];
11571157
tempData[1]=(double)newPacketInt[iMagY];
11581158
tempData[2]=(double)newPacketInt[iMagZ];
1159-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_X,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagX]);
1160-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_Y,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagY]);
1161-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_Z,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagZ]);
1159+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_X,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagX]);
1160+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_Y,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagY]);
1161+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_Z,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iMagZ]);
11621162
uncalibratedData[iMagX]=(double)newPacketInt[iMagX];
11631163
uncalibratedData[iMagY]=(double)newPacketInt[iMagY];
11641164
uncalibratedData[iMagZ]=(double)newPacketInt[iMagZ];
@@ -1174,9 +1174,9 @@ else if (isShimmerGen3()) {
11741174
calibratedData[iMagZ]=altMagCalibratedData[2];
11751175

11761176
if(isShimmerGen3R()) {
1177-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_X,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[0],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
1178-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_Y,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[1],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
1179-
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.MAG_WR_Z,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[2],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
1177+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_X,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[0],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
1178+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_Y,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[1],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
1179+
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.ALT_MAG_Z,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MAG_CAL_UNIT,altMagCalibratedData[2],mSensorLIS3MDL.mIsUsingDefaultAltMagParam);
11801180
}
11811181
magnetometer.x=altMagCalibratedData[0];
11821182
magnetometer.y=altMagCalibratedData[1];
@@ -3408,23 +3408,23 @@ else if ((byte)signalId[i]==(byte)0x16){
34083408
}
34093409
else if ((byte)signalId[i]==(byte)0x17){
34103410
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
3411-
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_WR_X;
3411+
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_X;
34123412
signalDataTypeArray[i+1] = "i16";
34133413
packetSize=packetSize+2;
34143414
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;
34153415
}
34163416
}
34173417
else if ((byte)signalId[i]==(byte)0x18){
34183418
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
3419-
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_WR_Y;
3419+
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_Y;
34203420
signalDataTypeArray[i+1] = "i16";
34213421
packetSize=packetSize+2;
34223422
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;
34233423
}
34243424
}
34253425
else if ((byte)signalId[i]==(byte)0x19){
34263426
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
3427-
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_WR_Z;
3427+
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_Z;
34283428
signalDataTypeArray[i+1] = "i16";
34293429
packetSize=packetSize+2;
34303430
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;

0 commit comments

Comments
 (0)