Skip to content

DEV-201 #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JongChern merged 1 commit into from
Mar 14, 2025
Merged

DEV-201 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,13 +1110,14 @@ public static class ObjectClusterSensorName{
public static String INT_EXP_ADC_A13 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A13;
public static String INT_EXP_ADC_A14 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A14;

public static String EXT_EXP_ADC_A9 = SensorADC.ObjectClusterSensorName.EXT_EXP_ADC_A9;
public static String EXT_EXP_ADC_A11 = SensorADC.ObjectClusterSensorName.EXT_EXP_ADC_A11;
public static String EXT_EXP_ADC_A12 = SensorADC.ObjectClusterSensorName.EXT_EXP_ADC_A12;
public static String INT_EXP_ADC_A17 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A17;
public static String INT_EXP_ADC_A10 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A10;
public static String INT_EXP_ADC_A15 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A15;
public static String INT_EXP_ADC_A16 = SensorADC.ObjectClusterSensorName.INT_EXP_ADC_A16;
//Generalised ADC channel name and number
public static String EXT_ADC_0 = SensorADC.ObjectClusterSensorName.EXT_ADC_0;
public static String EXT_ADC_1 = SensorADC.ObjectClusterSensorName.EXT_ADC_1;
public static String EXT_ADC_2 = SensorADC.ObjectClusterSensorName.EXT_ADC_2;
public static String INT_ADC_3 = SensorADC.ObjectClusterSensorName.INT_ADC_3;
public static String INT_ADC_0 = SensorADC.ObjectClusterSensorName.INT_ADC_0;
public static String INT_ADC_1 = SensorADC.ObjectClusterSensorName.INT_ADC_1;
public static String INT_ADC_2 = SensorADC.ObjectClusterSensorName.INT_ADC_2;

public static String ACCEL_HIGHG_X = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_X;
public static String ACCEL_HIGHG_Y = SensorADXL371.ObjectClusterSensorName.ACCEL_HIGHG_Y;
Expand Down
58 changes: 29 additions & 29 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,8 @@ else if (isShimmerGen3()) {
) {
int iA7;
if (mShimmerVerObject.isShimmerGen3R()) {
iA7 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A9);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A9,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA7]);
iA7 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_ADC_0);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_0,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA7]);
}
else {
iA7 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A7);
Expand All @@ -1361,7 +1361,7 @@ else if (isShimmerGen3()) {
if (mEnableCalibration){
calibratedData[iA7]=SensorADC.calibrateU12AdcValueToMillivolts(tempData[0],0,3,1);
if (mShimmerVerObject.isShimmerGen3R()) {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A9,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA7]);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_0,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA7]);
}
else {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A7,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA7]);
Expand All @@ -1376,8 +1376,8 @@ else if (isShimmerGen3()) {
) {
int iA6;
if (mShimmerVerObject.isShimmerGen3R()) {
iA6 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A11);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A11,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA6]);
iA6 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_ADC_1);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_1,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA6]);
}
else {
iA6 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A6);
Expand All @@ -1390,7 +1390,7 @@ else if (isShimmerGen3()) {
if (mEnableCalibration){
calibratedData[iA6]=SensorADC.calibrateU12AdcValueToMillivolts(tempData[0],0,3,1);
if (mShimmerVerObject.isShimmerGen3R()) {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A11,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA6]);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_1,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA6]);
}
else {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A6,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA6]);
Expand All @@ -1405,8 +1405,8 @@ else if (isShimmerGen3()) {
) {
int iA15;
if (mShimmerVerObject.isShimmerGen3R()) {
iA15 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A12);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A12,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA15]);
iA15 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_ADC_2);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_2,CHANNEL_TYPE.UNCAL.toString(),CHANNEL_UNITS.NO_UNITS,(double)newPacketInt[iA15]);
}
else {
iA15 = getSignalIndex(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A15);
Expand All @@ -1420,7 +1420,7 @@ else if (isShimmerGen3()) {
if (mEnableCalibration){
calibratedData[iA15]=SensorADC.calibrateU12AdcValueToMillivolts(tempData[0],0,3,1);
if (mShimmerVerObject.isShimmerGen3R()) {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A12,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA15]);
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_ADC_2,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA15]);
}
else {
objectCluster.addDataToMap(Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A15,CHANNEL_TYPE.CAL.toString(),CHANNEL_UNITS.MILLIVOLTS,calibratedData[iA15]);
Expand All @@ -1436,8 +1436,8 @@ else if (isShimmerGen3()) {
int iA1;
String sensorName;
if (mShimmerVerObject.isShimmerGen3R()) {
iA1 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A17);
sensorName = Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A17;
iA1 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_ADC_3);
sensorName = Shimmer3.ObjectClusterSensorName.INT_ADC_3;
}
else {
iA1 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A1);
Expand Down Expand Up @@ -1480,8 +1480,8 @@ else if (isShimmerGen3()) {
int iA12;
String sensorName;
if (mShimmerVerObject.isShimmerGen3R()) {
iA12 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A10);
sensorName = Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A10;
iA12 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_ADC_0);
sensorName = Shimmer3.ObjectClusterSensorName.INT_ADC_0;
}
else {
iA12 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A12);
Expand All @@ -1493,9 +1493,9 @@ else if (isShimmerGen3()) {
//change name based on derived sensor value
if(isShimmerGen3R()) {
if ((mDerivedSensors & DerivedSensorsBitMask.PPG_10_15)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG_A10;
sensorName = SensorPPG.ObjectClusterSensorName.PPG_A0;
} else if ((mDerivedSensors & DerivedSensorsBitMask.PPG1_10_15)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG1_A10;
sensorName = SensorPPG.ObjectClusterSensorName.PPG1_A0;
}
}else {
if ((mDerivedSensors & DerivedSensorsBitMask.PPG_12_13)>0){
Expand Down Expand Up @@ -1524,8 +1524,8 @@ else if (isShimmerGen3()) {
int iA13;
String sensorName;
if (mShimmerVerObject.isShimmerGen3R()) {
iA13 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A15);
sensorName = Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A15;
iA13 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_ADC_1);
sensorName = Shimmer3.ObjectClusterSensorName.INT_ADC_1;
}
else {
iA13 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A13);
Expand All @@ -1537,9 +1537,9 @@ else if (isShimmerGen3()) {
//change name based on derived sensor value
if(isShimmerGen3R()) {
if ((mDerivedSensors & DerivedSensorsBitMask.PPG_10_15)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG_A15;
sensorName = SensorPPG.ObjectClusterSensorName.PPG_A1;
} else if ((mDerivedSensors & DerivedSensorsBitMask.PPG1_10_15)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG1_A15;
sensorName = SensorPPG.ObjectClusterSensorName.PPG1_A1;
}
}else {
if ((mDerivedSensors & DerivedSensorsBitMask.PPG_12_13)>0){
Expand Down Expand Up @@ -1567,8 +1567,8 @@ else if (isShimmerGen3()) {
int iA14;
String sensorName;
if (mShimmerVerObject.isShimmerGen3R()) {
iA14 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A16);
sensorName = Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A16;
iA14 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_ADC_2);
sensorName = Shimmer3.ObjectClusterSensorName.INT_ADC_2;
}
else {
iA14 = getSignalIndex(Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A14);
Expand All @@ -1581,7 +1581,7 @@ else if (isShimmerGen3()) {
if ((mDerivedSensors & DerivedSensorsBitMask.PPG2_1_14)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG2_A14;
} else if ((mDerivedSensors & DerivedSensorsBitMask.PPG2_17_16)>0){
sensorName = SensorPPG.ObjectClusterSensorName.PPG2_A16;
sensorName = SensorPPG.ObjectClusterSensorName.PPG2_A2;
}
}
sensorNames[iA14]=sensorName;
Expand Down Expand Up @@ -3210,7 +3210,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
else if ((byte)signalId[i]==(byte)0x0D){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A9;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_0;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3231,7 +3231,7 @@ else if ((byte)signalId[i]==(byte)0x0D){
else if ((byte)signalId[i]==(byte)0x0E){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A11;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_1;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3252,7 +3252,7 @@ else if ((byte)signalId[i]==(byte)0x0E){
else if ((byte)signalId[i]==(byte)0x0F){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_EXP_ADC_A12;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_2;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3272,7 +3272,7 @@ else if ((byte)signalId[i]==(byte)0x0F){
else if ((byte)signalId[i]==(byte)0x10){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A17;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_3;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3293,7 +3293,7 @@ else if ((byte)signalId[i]==(byte)0x10){
else if ((byte)signalId[i]==(byte)0x11){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A10;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_0;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3314,7 +3314,7 @@ else if ((byte)signalId[i]==(byte)0x11){
else if ((byte)signalId[i]==(byte)0x12){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A15;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_1;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand All @@ -3340,7 +3340,7 @@ else if ((byte)signalId[i]==(byte)0x12){
else if ((byte)signalId[i]==(byte)0x13){
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_EXP_ADC_A16;
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_2;
signalDataTypeArray[i+1] = "u14";
}
else {
Expand Down
Loading
Loading