Skip to content

Commit 4c91198

Browse files
marknolanmarknolan
committed
refactoring high-g accel variable names
1 parent 8bb2baa commit 4c91198

2 files changed

Lines changed: 37 additions & 37 deletions

File tree

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ public enum LABEL_SENSOR_TILE{
892892
PROTO3_DELUXE_SUPP(SensorPPG.LABEL_SENSOR_TILE.PROTO3_DELUXE_SUPP),
893893
BRIDGE_AMPLIFIER(SensorBridgeAmp.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER),
894894
BRIDGE_AMPLIFIER_SUPP(SensorBridgeAmp.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER_SUPP),
895-
ACCEL_200G(Configuration.Shimmer3.GuiLabelSensors.ACCEL_200G),
895+
ADXL377_ACCEL_200G(Configuration.Shimmer3.GuiLabelSensors.ADXL377_ACCEL_200G),
896896
MPU_ACCEL_GYRO_MAG(SensorMPU9X50.LABEL_SENSOR_TILE.MPU_ACCEL_GYRO_MAG),
897897
MPU(SensorMPU9X50.LABEL_SENSOR_TILE.MPU),
898898
MPU_OTHER(SensorMPU9X50.LABEL_SENSOR_TILE.MPU_OTHER),
@@ -968,7 +968,7 @@ public class GuiLabelSensors{
968968
public static final String EULER_ANGLES_6DOF = "Euler Angles (6DOF)";
969969
public static final String EULER_ANGLES_9DOF = "Euler Angles (9DOF)"; // needed in both MPU and Algorithm???
970970

971-
public static final String ACCEL_200G = "200g Accel";
971+
public static final String ADXL377_ACCEL_200G = "200g Accel";
972972

973973
// public static final String PPG_DUMMY = SensorPPG.GuiLabelSensors.PPG_DUMMY;
974974
// public static final String PPG_A12 = SensorPPG.GuiLabelSensors.PPG_A12;
@@ -1306,9 +1306,9 @@ public static class CompatibilityInfoForMaps{
13061306
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);
13071307
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);
13081308

1309-
private static final ShimmerVerObject svo200GAccelSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_200_G_ACCEL);
1310-
private static final ShimmerVerObject svo200GAccelBtStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.BTSTREAM,0,5,0,HW_ID_SR_CODES.EXP_BRD_200_G_ACCEL);
1311-
private static final ShimmerVerObject svo200GAccelLogAndStream = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,3,3,HW_ID_SR_CODES.EXP_BRD_200_G_ACCEL);
1309+
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);
1310+
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);
1311+
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);
13121312

13131313
//TODO move non-Shimmer3 devices out of here
13141314
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);
@@ -1445,21 +1445,21 @@ public static class CompatibilityInfoForMaps{
14451445
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14461446
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14471447
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1448-
svo200GAccelSdLog, svo200GAccelBtStream, svo200GAccelLogAndStream,
1448+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14491449
svoShimmer4Stock);
14501450

14511451
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA13 = Arrays.asList(
14521452
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14531453
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14541454
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14551455
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1456-
svo200GAccelSdLog, svo200GAccelBtStream, svo200GAccelLogAndStream,
1456+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14571457
svoShimmer4Stock);
14581458

14591459
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA14 = Arrays.asList(
14601460
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14611461
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
1462-
svo200GAccelSdLog, svo200GAccelBtStream, svo200GAccelLogAndStream,
1462+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14631463
svoShimmer4Stock);
14641464

14651465
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntAdcsGeneral = Arrays.asList(
@@ -1491,8 +1491,8 @@ public static class CompatibilityInfoForMaps{
14911491
svoSdLog, svoLogAndStream,
14921492
svoShimmer4Stock, svoStrokare);
14931493

1494-
private static final List<ShimmerVerObject> listOfCompatibleVersionInfo200GAccel = Arrays.asList(
1495-
svo200GAccelSdLog,svo200GAccelBtStream,svo200GAccelLogAndStream);
1494+
private static final List<ShimmerVerObject> listOfCompatibleVersionInfoAdxl377Accel200G = Arrays.asList(
1495+
svoAdxl377Accel200GSdLog,svoAdxl377Accel200GBtStream,svoAdxl377Accel200GLogAndStream);
14961496

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

@@ -1619,12 +1619,12 @@ public static class CompatibilityInfoForMaps{
16191619
CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe));
16201620
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER.ordinal(), SensorBridgeAmp.sensorGroupBrAmp);
16211621
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER_SUPP.ordinal(), SensorBridgeAmp.sensorGroupBrAmpTemperature);
1622-
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.ACCEL_200G.ordinal(), new SensorGroupingDetails(
1623-
Configuration.Shimmer3.LABEL_SENSOR_TILE.ACCEL_200G.getTileText(),
1622+
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.ADXL377_ACCEL_200G.ordinal(), new SensorGroupingDetails(
1623+
Configuration.Shimmer3.LABEL_SENSOR_TILE.ADXL377_ACCEL_200G.getTileText(),
16241624
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, //X-axis
16251625
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13, //Y-axis
16261626
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14), //Z-axis
1627-
CompatibilityInfoForMaps.listOfCompatibleVersionInfo200GAccel)); //unused but accessible
1627+
CompatibilityInfoForMaps.listOfCompatibleVersionInfoAdxl377Accel200G)); //unused but accessible
16281628
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.INTERNAL_EXPANSION_ADC.ordinal(), SensorADC.sensorGroupInternalExpansionADCs);
16291629

16301630
//Not implemented: GUI_LABEL_CHANNEL_GROUPING_GPS

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,30 @@ public static final class HW_ID {
9191

9292
//TODO change all to ENUMs with ints and Strings passed in
9393
public static final class HW_ID_SR_CODES {
94-
public static final int LOG_FILE = -2; //MN: here for testing
95-
public static final int UNKNOWN = -1;
96-
public static final int NONE = 255;
94+
public static final int LOG_FILE = -2; //MN: here for testing
95+
public static final int UNKNOWN = -1;
96+
public static final int NONE = 255;
9797

98-
public static final int EXP_BRD_BR_AMP = 8;
99-
public static final int SPAN = 9;
100-
public static final int EXP_BRD_GSR = 14;
101-
public static final int SHIMMER3 = 31;
102-
public static final int EXP_BRD_PROTO3_MINI = 36;
103-
public static final int EXP_BRD_EXG = 37;
104-
public static final int EXP_BRD_PROTO3_DELUXE = 38;
105-
public static final int BASE15U = 41;
106-
public static final int BASE6U = 42;
107-
public static final int EXP_BRD_200_G_ACCEL = 44;
108-
public static final int EXP_BRD_GPS = 46;
109-
public static final int EXP_BRD_EXG_UNIFIED = 47;
110-
public static final int EXP_BRD_GSR_UNIFIED = 48;
111-
public static final int EXP_BRD_BR_AMP_UNIFIED = 49;
112-
public static final int EXP_BRD_100_G_ACCEL = 55;
98+
public static final int EXP_BRD_BR_AMP = 8;
99+
public static final int SPAN = 9;
100+
public static final int EXP_BRD_GSR = 14;
101+
public static final int SHIMMER3 = 31;
102+
public static final int EXP_BRD_PROTO3_MINI = 36;
103+
public static final int EXP_BRD_EXG = 37;
104+
public static final int EXP_BRD_PROTO3_DELUXE = 38;
105+
public static final int BASE15U = 41;
106+
public static final int BASE6U = 42;
107+
public static final int EXP_BRD_ADXL377_ACCEL_200G = 44;
108+
public static final int EXP_BRD_GPS = 46;
109+
public static final int EXP_BRD_EXG_UNIFIED = 47;
110+
public static final int EXP_BRD_GSR_UNIFIED = 48;
111+
public static final int EXP_BRD_BR_AMP_UNIFIED = 49;
112+
public static final int EXP_BRD_H3LIS331DL_ACCEL_HIGH_G = 55;
113113

114-
public static final int SHIMMER_GQ_802154_LR = 56;
115-
public static final int SHIMMER_GQ_802154_NR = 57;
116-
public static final int SHIMMER_4_SDK = 58;
117-
public static final int SHIMMER_ECG_MD = 59;
114+
public static final int SHIMMER_GQ_802154_LR = 56;
115+
public static final int SHIMMER_GQ_802154_NR = 57;
116+
public static final int SHIMMER_4_SDK = 58;
117+
public static final int SHIMMER_ECG_MD = 59;
118118
}
119119

120120
public static final Map<Integer, String> mMapOfShimmerHardware;
@@ -132,12 +132,12 @@ public static final class HW_ID_SR_CODES {
132132
aMap.put(HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE, "PROTO3 Deluxe");
133133
aMap.put(HW_ID_SR_CODES.BASE15U, "Base15U");
134134
aMap.put(HW_ID_SR_CODES.BASE6U, "Base6U");
135-
aMap.put(HW_ID_SR_CODES.EXP_BRD_200_G_ACCEL, "200g Accel");
135+
aMap.put(HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G, "200g Accel");
136136
aMap.put(HW_ID_SR_CODES.EXP_BRD_GPS, "GPS");
137137
aMap.put(HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED, "ECG/EMG/Resp");
138138
aMap.put(HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED, "GSR+");
139139
aMap.put(HW_ID_SR_CODES.EXP_BRD_BR_AMP_UNIFIED, "Bridge Amplifier+");
140-
aMap.put(HW_ID_SR_CODES.EXP_BRD_100_G_ACCEL, "100g Accel");
140+
aMap.put(HW_ID_SR_CODES.EXP_BRD_H3LIS331DL_ACCEL_HIGH_G, "High-g Accel");
141141

142142
aMap.put(HW_ID_SR_CODES.SHIMMER_GQ_802154_LR, "ShimmerGQ 802.15.4");
143143
aMap.put(HW_ID_SR_CODES.SHIMMER_GQ_802154_NR, "ShimmerGQ 802.15.4");

0 commit comments

Comments
 (0)