Skip to content

Commit 7abbb5d

Browse files
marknolanmarknolan
committed
basic 200g support for DCU
1 parent 73aceda commit 7abbb5d

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ public enum LABEL_SENSOR_TILE{
887887
PROTO3_DELUXE_SUPP(SensorPPG.LABEL_SENSOR_TILE.PROTO3_DELUXE_SUPP),
888888
BRIDGE_AMPLIFIER(SensorBridgeAmp.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER),
889889
BRIDGE_AMPLIFIER_SUPP(SensorBridgeAmp.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER_SUPP),
890-
HIGH_G_ACCEL(Configuration.Shimmer3.GuiLabelSensors.HIGH_G_ACCEL),
890+
ADXL377_ACCEL_200G(Configuration.Shimmer3.GuiLabelSensors.ADXL377_ACCEL_200G),
891891
MPU_ACCEL_GYRO_MAG(SensorMPU9X50.LABEL_SENSOR_TILE.MPU_ACCEL_GYRO_MAG),
892892
MPU(SensorMPU9X50.LABEL_SENSOR_TILE.MPU),
893893
MPU_OTHER(SensorMPU9X50.LABEL_SENSOR_TILE.MPU_OTHER),
@@ -963,7 +963,7 @@ public class GuiLabelSensors{
963963
public static final String EULER_ANGLES_6DOF = "Euler Angles (6DOF)";
964964
public static final String EULER_ANGLES_9DOF = "Euler Angles (9DOF)"; // needed in both MPU and Algorithm???
965965

966-
public static final String HIGH_G_ACCEL = "200g Accel";
966+
public static final String ADXL377_ACCEL_200G = "200g Accel";
967967

968968
// public static final String PPG_DUMMY = SensorPPG.GuiLabelSensors.PPG_DUMMY;
969969
// public static final String PPG_A12 = SensorPPG.GuiLabelSensors.PPG_A12;
@@ -1301,9 +1301,9 @@ public static class CompatibilityInfoForMaps{
13011301
private static final ShimmerVerObject svoProto3DeluxeLogAndStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,3,3,HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE);
13021302
private static final ShimmerVerObject svoProto3DeluxeNewImuLogAndStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,8,1,HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE, NEW_IMU_EXP_REV.PROTO3_DELUXE);
13031303

1304-
private static final ShimmerVerObject svoHighGAccelSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL);
1305-
private static final ShimmerVerObject svoHighGAccelBtStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.BTSTREAM,0,5,0,HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL);
1306-
private static final ShimmerVerObject svoHighGAccelLogAndStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,3,3,HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL);
1304+
private static final ShimmerVerObject svoAdxl377Accel200GSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G);
1305+
private static final ShimmerVerObject svoAdxl377Accel200GBtStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.BTSTREAM,0,5,0,HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G);
1306+
private static final ShimmerVerObject svoAdxl377Accel200GLogAndStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,3,3,HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G);
13071307

13081308
public static final ShimmerVerObject svoShimmer4Stock = new ShimmerVerObject(HW_ID.SHIMMER_4_SDK,FW_ID.SHIMMER4_SDK_STOCK,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);
13091309
private static final ShimmerVerObject svoArduino = new ShimmerVerObject(HW_ID.ARDUINO,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);
@@ -1392,35 +1392,33 @@ public static class CompatibilityInfoForMaps{
13921392
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA1 = Arrays.asList(
13931393
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
13941394
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
1395-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
13961395
svoShimmer4Stock);
13971396

13981397
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA12 = Arrays.asList(
13991398
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14001399
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14011400
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14021401
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1403-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1402+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14041403
svoShimmer4Stock);
14051404

14061405
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA13 = Arrays.asList(
14071406
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14081407
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14091408
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14101409
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1411-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1410+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14121411
svoShimmer4Stock);
14131412

14141413
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA14 = Arrays.asList(
14151414
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14161415
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
1417-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1416+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14181417
svoShimmer4Stock);
14191418

14201419
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntAdcsGeneral = Arrays.asList(
14211420
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14221421
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1423-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
14241422
svoShimmer4Stock);
14251423

14261424
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExtAdcs = Arrays.asList(
@@ -1439,8 +1437,8 @@ public static class CompatibilityInfoForMaps{
14391437
svoExgUnifiedSdLog, svoExgUnifiedBtStream, svoExgUnifiedLogAndStream,
14401438
svoShimmer4Stock);
14411439

1442-
private static final List<ShimmerVerObject> listOfCompatibleVersionInfoHighGAccel = Arrays.asList(
1443-
svoHighGAccelSdLog,svoHighGAccelBtStream,svoHighGAccelLogAndStream);
1440+
private static final List<ShimmerVerObject> listOfCompatibleVersionInfoAdxl377Accel200G = Arrays.asList(
1441+
svoAdxl377Accel200GSdLog,svoAdxl377Accel200GBtStream,svoAdxl377Accel200GLogAndStream);
14441442

14451443
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoMPLSensors = Arrays.asList(svoSdLogMpl);//,baseShimmer4); //TODO Shimmer4 temp here
14461444

@@ -1569,13 +1567,13 @@ public static class CompatibilityInfoForMaps{
15691567
CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe));
15701568
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER.ordinal(), SensorBridgeAmp.sensorGroupBrAmp);
15711569
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER_SUPP.ordinal(), SensorBridgeAmp.sensorGroupBrAmpTemperature);
1572-
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.HIGH_G_ACCEL.ordinal(), new SensorGroupingDetails(
1573-
Configuration.Shimmer3.LABEL_SENSOR_TILE.HIGH_G_ACCEL.getTileText(),
1570+
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.ADXL377_ACCEL_200G.ordinal(), new SensorGroupingDetails(
1571+
Configuration.Shimmer3.LABEL_SENSOR_TILE.ADXL377_ACCEL_200G.getTileText(),
15741572
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, //X-axis
15751573
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13, //Y-axis
15761574
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14, //Z-axis
15771575
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1),
1578-
CompatibilityInfoForMaps.listOfCompatibleVersionInfoHighGAccel)); //unused but accessible
1576+
CompatibilityInfoForMaps.listOfCompatibleVersionInfoAdxl377Accel200G)); //unused but accessible
15791577
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.INTERNAL_EXPANSION_ADC.ordinal(), SensorADC.sensorGroupInternalExpansionADCs);
15801578

15811579
//Not implemented: GUI_LABEL_CHANNEL_GROUPING_GPS

‎ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static final class HW_ID_SR_CODES {
102102
public static final int EXP_BRD_PROTO3_DELUXE = 38;
103103
public static final int BASE15U = 41;
104104
public static final int BASE6U = 42;
105-
public static final int EXP_BRD_HIGH_G_ACCEL = 44;
105+
public static final int EXP_BRD_ADXL377_ACCEL_200G = 44;
106106
public static final int EXP_BRD_GPS = 46;
107107
public static final int EXP_BRD_EXG_UNIFIED = 47;
108108
public static final int EXP_BRD_GSR_UNIFIED = 48;
@@ -129,7 +129,7 @@ public static final class HW_ID_SR_CODES {
129129
aMap.put(HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE, "PROTO3 Deluxe");
130130
aMap.put(HW_ID_SR_CODES.BASE15U, "Base15U");
131131
aMap.put(HW_ID_SR_CODES.BASE6U, "Base6U");
132-
aMap.put(HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL, "High-g Accel");
132+
aMap.put(HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G, "200g Accel");
133133
aMap.put(HW_ID_SR_CODES.EXP_BRD_GPS, "GPS");
134134
aMap.put(HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED, "ECG/EMG/Resp");
135135
aMap.put(HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED, "GSR+");

0 commit comments

Comments
 (0)