Skip to content

Commit 077898c

Browse files
RuMolloyRuMolloy
authored
Merge pull request #4 from ShimmerEngineering/MN
Minor 200g accel devel for test.
2 parents 0d54604 + 4c91198 commit 077898c

2 files changed

Lines changed: 38 additions & 39 deletions

File tree

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

Lines changed: 14 additions & 17 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-
HIGH_G_ACCEL(Configuration.Shimmer3.GuiLabelSensors.HIGH_G_ACCEL),
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 HIGH_G_ACCEL = "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 svoHighGAccelSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL);
1310-
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);
1311-
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);
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);
@@ -1438,35 +1438,33 @@ public static class CompatibilityInfoForMaps{
14381438
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA1 = Arrays.asList(
14391439
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14401440
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
1441-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
14421441
svoShimmer4Stock);
14431442

14441443
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA12 = Arrays.asList(
14451444
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14461445
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14471446
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14481447
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1449-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1448+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14501449
svoShimmer4Stock);
14511450

14521451
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA13 = Arrays.asList(
14531452
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14541453
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
14551454
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14561455
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1457-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1456+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14581457
svoShimmer4Stock);
14591458

14601459
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntExpA14 = Arrays.asList(
14611460
svoProto3MiniSdLog, svoProto3MiniBtStream, svoProto3MiniLogAndStream,
14621461
svoProto3DeluxeSdLog, svoProto3DeluxeBtStream, svoProto3DeluxeLogAndStream,
1463-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
1462+
svoAdxl377Accel200GSdLog, svoAdxl377Accel200GBtStream, svoAdxl377Accel200GLogAndStream,
14641463
svoShimmer4Stock);
14651464

14661465
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoIntAdcsGeneral = Arrays.asList(
14671466
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream,
14681467
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
1469-
svoHighGAccelSdLog, svoHighGAccelBtStream, svoHighGAccelLogAndStream,
14701468
svoShimmer4Stock);
14711469

14721470
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExtAdcs = Arrays.asList(
@@ -1493,8 +1491,8 @@ public static class CompatibilityInfoForMaps{
14931491
svoSdLog, svoLogAndStream,
14941492
svoShimmer4Stock, svoStrokare);
14951493

1496-
private static final List<ShimmerVerObject> listOfCompatibleVersionInfoHighGAccel = Arrays.asList(
1497-
svoHighGAccelSdLog,svoHighGAccelBtStream,svoHighGAccelLogAndStream);
1494+
private static final List<ShimmerVerObject> listOfCompatibleVersionInfoAdxl377Accel200G = Arrays.asList(
1495+
svoAdxl377Accel200GSdLog,svoAdxl377Accel200GBtStream,svoAdxl377Accel200GLogAndStream);
14981496

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

@@ -1621,13 +1619,12 @@ public static class CompatibilityInfoForMaps{
16211619
CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe));
16221620
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER.ordinal(), SensorBridgeAmp.sensorGroupBrAmp);
16231621
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.BRIDGE_AMPLIFIER_SUPP.ordinal(), SensorBridgeAmp.sensorGroupBrAmpTemperature);
1624-
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.HIGH_G_ACCEL.ordinal(), new SensorGroupingDetails(
1625-
Configuration.Shimmer3.LABEL_SENSOR_TILE.HIGH_G_ACCEL.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(),
16261624
Arrays.asList(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, //X-axis
16271625
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13, //Y-axis
1628-
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14, //Z-axis
1629-
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1),
1630-
CompatibilityInfoForMaps.listOfCompatibleVersionInfoHighGAccel)); //unused but accessible
1626+
Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14), //Z-axis
1627+
CompatibilityInfoForMaps.listOfCompatibleVersionInfoAdxl377Accel200G)); //unused but accessible
16311628
aMap.put(Configuration.Shimmer3.LABEL_SENSOR_TILE.INTERNAL_EXPANSION_ADC.ordinal(), SensorADC.sensorGroupInternalExpansionADCs);
16321629

16331630
//Not implemented: GUI_LABEL_CHANNEL_GROUPING_GPS

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +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_HIGH_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;
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;
112113

113-
public static final int SHIMMER_GQ_802154_LR = 56;
114-
public static final int SHIMMER_GQ_802154_NR = 57;
115-
public static final int SHIMMER_4_SDK = 58;
116-
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;
117118
}
118119

119120
public static final Map<Integer, String> mMapOfShimmerHardware;
@@ -131,11 +132,12 @@ public static final class HW_ID_SR_CODES {
131132
aMap.put(HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE, "PROTO3 Deluxe");
132133
aMap.put(HW_ID_SR_CODES.BASE15U, "Base15U");
133134
aMap.put(HW_ID_SR_CODES.BASE6U, "Base6U");
134-
aMap.put(HW_ID_SR_CODES.EXP_BRD_HIGH_G_ACCEL, "High-g Accel");
135+
aMap.put(HW_ID_SR_CODES.EXP_BRD_ADXL377_ACCEL_200G, "200g Accel");
135136
aMap.put(HW_ID_SR_CODES.EXP_BRD_GPS, "GPS");
136137
aMap.put(HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED, "ECG/EMG/Resp");
137138
aMap.put(HW_ID_SR_CODES.EXP_BRD_GSR_UNIFIED, "GSR+");
138139
aMap.put(HW_ID_SR_CODES.EXP_BRD_BR_AMP_UNIFIED, "Bridge Amplifier+");
140+
aMap.put(HW_ID_SR_CODES.EXP_BRD_H3LIS331DL_ACCEL_HIGH_G, "High-g Accel");
139141

140142
aMap.put(HW_ID_SR_CODES.SHIMMER_GQ_802154_LR, "ShimmerGQ 802.15.4");
141143
aMap.put(HW_ID_SR_CODES.SHIMMER_GQ_802154_NR, "ShimmerGQ 802.15.4");

0 commit comments

Comments
 (0)