From 521a35cf57e6ab67ad9f1f300423143bd88ebe0b Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Thu, 13 Mar 2025 14:49:24 +0800 Subject: [PATCH] update generalised adcs naming --- .../shimmerresearch/driver/Configuration.java | 15 +- .../shimmerresearch/driver/ShimmerObject.java | 58 +++--- .../shimmerresearch/sensors/SensorADC.java | 167 +++++++++--------- .../shimmerresearch/sensors/SensorPPG.java | 154 ++++++++-------- 4 files changed, 200 insertions(+), 194 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java index 21cf763d3..3034cf9bf 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/Configuration.java @@ -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; diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java index 2d1e300b4..e49a01d4d 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java @@ -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); @@ -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]); @@ -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); @@ -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]); @@ -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); @@ -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]); @@ -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); @@ -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); @@ -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){ @@ -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); @@ -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){ @@ -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); @@ -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; @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorADC.java b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorADC.java index b85c8afe8..56dcf9549 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorADC.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorADC.java @@ -50,17 +50,19 @@ public class GuiLabelSensors{ public static final String EXT_EXP_A7 = "Ext A7"; public static final String EXT_EXP_A6 = "Ext A6"; public static final String EXT_EXP_A15 = "Ext A15"; - public static final String EXT_EXP_A9 = "Ext A9"; - public static final String EXT_EXP_A11 = "Ext A11"; - public static final String EXT_EXP_A12 = "Ext A12"; public static final String INT_EXP_A12 = "Int A12"; public static final String INT_EXP_A13 = "Int A13"; public static final String INT_EXP_A14 = "Int A14"; public static final String INT_EXP_A1 = "Int A1"; - public static final String INT_EXP_A10 = "Int A10"; - public static final String INT_EXP_A15 = "Int A15"; - public static final String INT_EXP_A16 = "Int A16"; - public static final String INT_EXP_A17 = "Int A17"; + + //Generalised ADC channel name and number + public static final String EXT_ADC_0 = "Ext A0"; + public static final String EXT_ADC_1 = "Ext A1"; + public static final String EXT_ADC_2 = "Ext A2"; + public static final String INT_ADC_0 = "Int A0"; + public static final String INT_ADC_1 = "Int A1"; + public static final String INT_ADC_2 = "Int A2"; + public static final String INT_ADC_3 = "Int A3"; } // GUI Sensor Tiles @@ -82,13 +84,14 @@ public static class DatabaseChannelHandles{ public static final String INT_ADC_A13 = "F5437a_Int_A13"; public static final String INT_ADC_A14 = "F5437a_Int_A14"; - public static final String EXT_ADC_A9 = "F5437a_Ext_A9"; - public static final String EXT_ADC_A11 = "F5437a_Ext_A11"; - public static final String EXT_ADC_A12 = "F5437a_Ext_A12"; - public static final String INT_ADC_A17 = "F5437a_Int_A17"; - public static final String INT_ADC_A10 = "F5437a_Int_A10"; - public static final String INT_ADC_A15 = "F5437a_Int_A15"; - public static final String INT_ADC_A16 = "F5437a_Int_A16"; + //Generalised ADC channel name and number + public static final String EXT_ADC_0 = "F5437a_Ext_A0"; + public static final String EXT_ADC_1 = "F5437a_Ext_A1"; + public static final String EXT_ADC_2 = "F5437a_Ext_A2"; + public static final String INT_ADC_0 = "F5437a_Int_A0"; + public static final String INT_ADC_1 = "F5437a_Int_A1"; + public static final String INT_ADC_2 = "F5437a_Int_A2"; + public static final String INT_ADC_3 = "F5437a_Int_A3"; } //GUI AND EXPORT CHANNELS @@ -101,13 +104,15 @@ public static class ObjectClusterSensorName{ public static String INT_EXP_ADC_A13 = "Int_Exp_A13"; public static String INT_EXP_ADC_A14 = "Int_Exp_A14"; - public static String EXT_EXP_ADC_A9 = "Ext_Exp_A9"; - public static String EXT_EXP_ADC_A11 = "Ext_Exp_A11"; - public static String EXT_EXP_ADC_A12 = "Ext_Exp_A12"; - public static String INT_EXP_ADC_A17 = "Int_Exp_A17"; - public static String INT_EXP_ADC_A10 = "Int_Exp_A10"; - public static String INT_EXP_ADC_A15 = "Int_Exp_A15"; - public static String INT_EXP_ADC_A16 = "Int_Exp_A16"; + //Generalised ADC channel name and number + public static String EXT_ADC_0 = "Ext_Exp_A0"; + public static String EXT_ADC_1 = "Ext_Exp_A1"; + public static String EXT_ADC_2 = "Ext_Exp_A2"; + public static String INT_ADC_0 = "Int_Exp_A0"; + public static String INT_ADC_1 = "Int_Exp_A1"; + public static String INT_ADC_2 = "Int_Exp_A2"; + public static String INT_ADC_3 = "Int_Exp_A3"; + } @@ -183,23 +188,23 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS null, Arrays.asList(ObjectClusterSensorName.EXT_EXP_ADC_A15), false); - public static final SensorDetailsRef sensorADC_EXT_EXP_ADC_A9Ref = new SensorDetailsRef(0x02<<(0*8), 0x02<<(0*8), GuiLabelSensors.EXT_EXP_A9, + public static final SensorDetailsRef sensorADC_EXT_ADC_0Ref = new SensorDetailsRef(0x02<<(0*8), 0x02<<(0*8), GuiLabelSensors.EXT_ADC_0, CompatibilityInfoForMaps.listOfCompatibleVersionInfoExtAdcs, null, null, - Arrays.asList(ObjectClusterSensorName.EXT_EXP_ADC_A9), + Arrays.asList(ObjectClusterSensorName.EXT_ADC_0), false); - public static final SensorDetailsRef sensorADC_EXT_EXP_ADC_A11Ref = new SensorDetailsRef(0x01<<(0*8), 0x01<<(0*8), GuiLabelSensors.EXT_EXP_A11, + public static final SensorDetailsRef sensorADC_EXT_ADC_1Ref = new SensorDetailsRef(0x01<<(0*8), 0x01<<(0*8), GuiLabelSensors.EXT_ADC_1, CompatibilityInfoForMaps.listOfCompatibleVersionInfoExtAdcs, null, null, - Arrays.asList(ObjectClusterSensorName.EXT_EXP_ADC_A11), + Arrays.asList(ObjectClusterSensorName.EXT_ADC_1), false); - public static final SensorDetailsRef sensorADC_EXT_EXP_ADC_A12Ref = new SensorDetailsRef(0x08<<(1*8), 0x08<<(1*8), GuiLabelSensors.EXT_EXP_A12, + public static final SensorDetailsRef sensorADC_EXT_ADC_2Ref = new SensorDetailsRef(0x08<<(1*8), 0x08<<(1*8), GuiLabelSensors.EXT_ADC_2, CompatibilityInfoForMaps.listOfCompatibleVersionInfoExtAdcs, null, null, - Arrays.asList(ObjectClusterSensorName.EXT_EXP_ADC_A12), + Arrays.asList(ObjectClusterSensorName.EXT_ADC_2), false); public static final SensorDetailsRef sensorADC_INT_EXP_ADC_A1Ref = new SensorDetailsRef(0x04<<(1*8), 0x04<<(1*8), GuiLabelSensors.INT_EXP_A1, @@ -308,10 +313,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(ObjectClusterSensorName.INT_EXP_ADC_A14), false); - public static final SensorDetailsRef sensorADC_INT_EXP_ADC_A17Ref = new SensorDetailsRef( + public static final SensorDetailsRef sensorADC_INT_ADC_3Ref = new SensorDetailsRef( 0x04<<(1*8), 0x04<<(1*8), - GuiLabelSensors.INT_EXP_A17, + GuiLabelSensors.INT_ADC_3, CompatibilityInfoForMaps.listOfCompatibleVersionInfoIntExpA17, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_DUMMY, @@ -332,13 +337,13 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS // Configuration.Shimmer3.SENSOR_ID.EXG2_24BIT ), Arrays.asList(Configuration.Shimmer3.GuiLabelConfig.INT_EXP_BRD_POWER_INTEGER), - Arrays.asList(ObjectClusterSensorName.INT_EXP_ADC_A17), + Arrays.asList(ObjectClusterSensorName.INT_ADC_3), false); - public static final SensorDetailsRef sensorADC_INT_EXP_ADC_A10Ref = new SensorDetailsRef( + public static final SensorDetailsRef sensorADC_INT_ADC_0Ref = new SensorDetailsRef( 0x02<<(1*8), 0x02<<(1*8), - GuiLabelSensors.INT_EXP_A10, + GuiLabelSensors.INT_ADC_0, CompatibilityInfoForMaps.listOfCompatibleVersionInfoIntExpA10, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.HOST_PPG_DUMMY, @@ -360,13 +365,13 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Configuration.Shimmer3.SENSOR_ID.SHIMMER_RESISTANCE_AMP, Configuration.Shimmer3.SENSOR_ID.SHIMMER_BRIDGE_AMP), Arrays.asList(Configuration.Shimmer3.GuiLabelConfig.INT_EXP_BRD_POWER_INTEGER), - Arrays.asList(ObjectClusterSensorName.INT_EXP_ADC_A10), + Arrays.asList(ObjectClusterSensorName.INT_ADC_0), false); - public static final SensorDetailsRef sensorADC_INT_EXP_ADC_A15Ref = new SensorDetailsRef( + public static final SensorDetailsRef sensorADC_INT_ADC_1Ref = new SensorDetailsRef( 0x01<<(1*8), 0x01<<(1*8), - GuiLabelSensors.INT_EXP_A15, + GuiLabelSensors.INT_ADC_1, CompatibilityInfoForMaps.listOfCompatibleVersionInfoIntExpA15, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.HOST_PPG_DUMMY, @@ -388,13 +393,13 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Configuration.Shimmer3.SENSOR_ID.SHIMMER_RESISTANCE_AMP, Configuration.Shimmer3.SENSOR_ID.SHIMMER_BRIDGE_AMP), Arrays.asList(Configuration.Shimmer3.GuiLabelConfig.INT_EXP_BRD_POWER_INTEGER), - Arrays.asList(ObjectClusterSensorName.INT_EXP_ADC_A15), + Arrays.asList(ObjectClusterSensorName.INT_ADC_1), false); - public static final SensorDetailsRef sensorADC_INT_EXP_ADC_A16Ref = new SensorDetailsRef( + public static final SensorDetailsRef sensorADC_INT_ADC_2Ref = new SensorDetailsRef( 0x80<<(2*8), 0x80<<(2*8), - GuiLabelSensors.INT_EXP_A16, + GuiLabelSensors.INT_ADC_2, CompatibilityInfoForMaps.listOfCompatibleVersionInfoIntExpA16, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_DUMMY, @@ -414,7 +419,7 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Configuration.Shimmer3.SENSOR_ID.SHIMMER_RESISTANCE_AMP, Configuration.Shimmer3.SENSOR_ID.SHIMMER_BRIDGE_AMP), Arrays.asList(Configuration.Shimmer3.GuiLabelConfig.INT_EXP_BRD_POWER_INTEGER), - Arrays.asList(ObjectClusterSensorName.INT_EXP_ADC_A16), + Arrays.asList(ObjectClusterSensorName.INT_ADC_2), false); public static final Map mSensorMapRef; @@ -435,14 +440,14 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS public static final Map mSensorMapRef3r; static { Map aMap = new LinkedHashMap(); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A7, sensorADC_EXT_EXP_ADC_A9Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A6, sensorADC_EXT_EXP_ADC_A11Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A15, sensorADC_EXT_EXP_ADC_A12Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A7, sensorADC_EXT_ADC_0Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A6, sensorADC_EXT_ADC_1Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_EXT_EXP_ADC_A15, sensorADC_EXT_ADC_2Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1, sensorADC_INT_EXP_ADC_A17Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, sensorADC_INT_EXP_ADC_A10Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13, sensorADC_INT_EXP_ADC_A15Ref); - aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14, sensorADC_INT_EXP_ADC_A16Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1, sensorADC_INT_ADC_3Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, sensorADC_INT_ADC_0Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13, sensorADC_INT_ADC_1Ref); + aMap.put(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14, sensorADC_INT_ADC_2Ref); mSensorMapRef3r = Collections.unmodifiableMap(aMap); } @@ -474,10 +479,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x0D); - public static final ChannelDetails channel_EXT_EXP_ADC_A9 = new ChannelDetails( - ObjectClusterSensorName.EXT_EXP_ADC_A9, - ObjectClusterSensorName.EXT_EXP_ADC_A9, - DatabaseChannelHandles.EXT_ADC_A9, + public static final ChannelDetails channel_EXT_ADC_0 = new ChannelDetails( + ObjectClusterSensorName.EXT_ADC_0, + ObjectClusterSensorName.EXT_ADC_0, + DatabaseChannelHandles.EXT_ADC_0, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -492,10 +497,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x0E); - public static final ChannelDetails channel_EXT_EXP_ADC_A11 = new ChannelDetails( - ObjectClusterSensorName.EXT_EXP_ADC_A11, - ObjectClusterSensorName.EXT_EXP_ADC_A11, - DatabaseChannelHandles.EXT_ADC_A11, + public static final ChannelDetails channel_EXT_ADC_1 = new ChannelDetails( + ObjectClusterSensorName.EXT_ADC_1, + ObjectClusterSensorName.EXT_ADC_1, + DatabaseChannelHandles.EXT_ADC_1, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -514,10 +519,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x0F); - public static final ChannelDetails channel_EXT_EXP_ADC_A12 = new ChannelDetails( - ObjectClusterSensorName.EXT_EXP_ADC_A12, - ObjectClusterSensorName.EXT_EXP_ADC_A12, - DatabaseChannelHandles.EXT_ADC_A12, + public static final ChannelDetails channel_EXT_ADC_2 = new ChannelDetails( + ObjectClusterSensorName.EXT_ADC_2, + ObjectClusterSensorName.EXT_ADC_2, + DatabaseChannelHandles.EXT_ADC_2, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -533,10 +538,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x10); - public static final ChannelDetails channel_INT_EXP_ADC_A17 = new ChannelDetails( - ObjectClusterSensorName.INT_EXP_ADC_A17, - ObjectClusterSensorName.INT_EXP_ADC_A17, - DatabaseChannelHandles.INT_ADC_A17, + public static final ChannelDetails channel_INT_ADC_3 = new ChannelDetails( + ObjectClusterSensorName.INT_ADC_3, + ObjectClusterSensorName.INT_ADC_3, + DatabaseChannelHandles.INT_ADC_3, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -552,10 +557,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x11); - public static final ChannelDetails channel_INT_EXP_ADC_A10 = new ChannelDetails( - ObjectClusterSensorName.INT_EXP_ADC_A10, - ObjectClusterSensorName.INT_EXP_ADC_A10, - DatabaseChannelHandles.INT_ADC_A10, + public static final ChannelDetails channel_INT_ADC_0 = new ChannelDetails( + ObjectClusterSensorName.INT_ADC_0, + ObjectClusterSensorName.INT_ADC_0, + DatabaseChannelHandles.INT_ADC_0, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -571,10 +576,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x12); - public static final ChannelDetails channel_INT_EXP_ADC_A15 = new ChannelDetails( - ObjectClusterSensorName.INT_EXP_ADC_A15, - ObjectClusterSensorName.INT_EXP_ADC_A15, - DatabaseChannelHandles.INT_ADC_A15, + public static final ChannelDetails channel_INT_ADC_1 = new ChannelDetails( + ObjectClusterSensorName.INT_ADC_1, + ObjectClusterSensorName.INT_ADC_1, + DatabaseChannelHandles.INT_ADC_1, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -589,10 +594,10 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), 0x13); - public static final ChannelDetails channel_INT_EXP_ADC_A16 = new ChannelDetails( - ObjectClusterSensorName.INT_EXP_ADC_A16, - ObjectClusterSensorName.INT_EXP_ADC_A16, - DatabaseChannelHandles.INT_ADC_A16, + public static final ChannelDetails channel_INT_ADC_2 = new ChannelDetails( + ObjectClusterSensorName.INT_ADC_2, + ObjectClusterSensorName.INT_ADC_2, + DatabaseChannelHandles.INT_ADC_2, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL), @@ -617,14 +622,14 @@ public static MICROCONTROLLER_ADC_PROPERTIES getMicrocontrollerAdcPropertiesForS static { Map aMap = new LinkedHashMap(); // External ADCs - aMap.put(ObjectClusterSensorName.EXT_EXP_ADC_A9, channel_EXT_EXP_ADC_A9); - aMap.put(ObjectClusterSensorName.EXT_EXP_ADC_A11, channel_EXT_EXP_ADC_A11); - aMap.put(ObjectClusterSensorName.EXT_EXP_ADC_A12, channel_EXT_EXP_ADC_A12); + aMap.put(ObjectClusterSensorName.EXT_ADC_0, channel_EXT_ADC_0); + aMap.put(ObjectClusterSensorName.EXT_ADC_1, channel_EXT_ADC_1); + aMap.put(ObjectClusterSensorName.EXT_ADC_2, channel_EXT_ADC_2); // Internal ADCs - aMap.put(ObjectClusterSensorName.INT_EXP_ADC_A17, channel_INT_EXP_ADC_A17); - aMap.put(ObjectClusterSensorName.INT_EXP_ADC_A10, channel_INT_EXP_ADC_A10); - aMap.put(ObjectClusterSensorName.INT_EXP_ADC_A15, channel_INT_EXP_ADC_A15); - aMap.put(ObjectClusterSensorName.INT_EXP_ADC_A16, channel_INT_EXP_ADC_A16); + aMap.put(ObjectClusterSensorName.INT_ADC_3, channel_INT_ADC_3); + aMap.put(ObjectClusterSensorName.INT_ADC_0, channel_INT_ADC_0); + aMap.put(ObjectClusterSensorName.INT_ADC_1, channel_INT_ADC_1); + aMap.put(ObjectClusterSensorName.INT_ADC_2, channel_INT_ADC_2); mChannelMapRef3r = Collections.unmodifiableMap(aMap); } diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorPPG.java b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorPPG.java index d4307b735..4b83f64ef 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorPPG.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorPPG.java @@ -83,12 +83,12 @@ public static class GuiLabelSensors{ public static final String PPG2_A1 = "PPG2 A1"; public static final String PPG2_A14 = "PPG2 A14"; - public static final String PPG_A10 = "PPG A10"; - public static final String PPG_A15 = "PPG A15"; - public static final String PPG1_A10 = "PPG1 A10"; - public static final String PPG1_A15 = "PPG1 A15"; - public static final String PPG2_A17 = "PPG2 A17"; - public static final String PPG2_A16 = "PPG2 A16"; + public static final String PPG_A0 = "PPG A0"; + public static final String PPG_A1 = "PPG A1"; + public static final String PPG1_A0 = "PPG1 A0"; + public static final String PPG1_A1 = "PPG1 A1"; + public static final String PPG2_A2 = "PPG2 A2"; + public static final String PPG2_A3 = "PPG2 A3"; } @@ -100,12 +100,12 @@ public class DatabaseChannelHandles{ public static final String PPG2_A1 = "F5437a_PPG2_A1"; public static final String PPG2_A14 = "F5437a_PPG2_A14"; - public static final String PPG_A10 = "F5437a_PPG_A10"; - public static final String PPG_A15 = "F5437a_PPG_A15"; - public static final String PPG1_A10 = "F5437a_PPG1_A10"; - public static final String PPG1_A15 = "F5437a_PPG1_A15"; - public static final String PPG2_A17 = "F5437a_PPG2_A17"; - public static final String PPG2_A16 = "F5437a_PPG2_A16"; + public static final String PPG_A0 = "F5437a_PPG_A0"; + public static final String PPG_A1 = "F5437a_PPG_A1"; + public static final String PPG1_A0 = "F5437a_PPG1_A0"; + public static final String PPG1_A1 = "F5437a_PPG1_A1"; + public static final String PPG2_A2 = "F5437a_PPG2_A2"; + public static final String PPG2_A3 = "F5437a_PPG2_A3"; } public static class DatabaseConfigHandle{ @@ -122,12 +122,12 @@ public static class ObjectClusterSensorName{ public static String PPG2_A1 = "PPG2_A1"; public static String PPG2_A14 = "PPG2_A14"; - public static String PPG_A10 = "PPG_A10"; - public static String PPG_A15 = "PPG_A15"; - public static String PPG1_A10 = "PPG1_A10"; - public static String PPG1_A15 = "PPG1_A15"; - public static String PPG2_A17 = "PPG2_A17"; - public static String PPG2_A16 = "PPG2_A16"; + public static String PPG_A0 = "PPG_A0"; + public static String PPG_A1 = "PPG_A1"; + public static String PPG1_A0 = "PPG1_A0"; + public static String PPG1_A1 = "PPG1_A1"; + public static String PPG2_A2 = "PPG2_A2"; + public static String PPG2_A3 = "PPG2_A3"; } //--------- Sensor specific variables End -------------- @@ -142,13 +142,13 @@ public static class ObjectClusterSensorName{ //--------- Configuration options start -------------- public static final String[] ListOfPpgAdcSelection = {"Int A13","Int A12"}; - public static final String[] ListOfPpgAdcSelection3r = {"Int A15","Int A10"}; + public static final String[] ListOfPpgAdcSelection3r = {"Int A1","Int A0"}; public static final Integer[] ListOfPpgAdcSelectionConfigValues = {0,1}; public static final String[] ListOfPpg1AdcSelection = {"Int A13","Int A12"}; - public static final String[] ListOfPpg1AdcSelection3r = {"Int A15","Int A10"}; + public static final String[] ListOfPpg1AdcSelection3r = {"Int A1","Int A0"}; public static final Integer[] ListOfPpg1AdcSelectionConfigValues = {0,1}; public static final String[] ListOfPpg2AdcSelection = {"Int A1","Int A14"}; - public static final String[] ListOfPpg2AdcSelection3r = {"Int A17","Int A16"}; + public static final String[] ListOfPpg2AdcSelection3r = {"Int A3","Int A2"}; public static final Integer[] ListOfPpg2AdcSelectionConfigValues = {0,1}; public static final Integer[] FixedConflictingSensorIds = { @@ -251,14 +251,14 @@ public static class ObjectClusterSensorName{ // sensorPpgHostPPG_A12.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG_12_13; } - public static final SensorDetailsRef sensorPpgHostPPG_A10 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG_A0 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A12Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A12Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG_A10, + GuiLabelSensors.PPG_A0, CompatibilityInfoForMaps.listOfCompatibleVersionInfoGsr, getListSensorPpgHostPPG_A12(), // RM passed in list into constructor as settings the list outside of constructor wasn't working null, - Arrays.asList(ObjectClusterSensorName.PPG_A10), + Arrays.asList(ObjectClusterSensorName.PPG_A0), true); { List listOfKeysConflicting = new ArrayList(); @@ -266,7 +266,7 @@ public static class ObjectClusterSensorName{ listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A13); listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12); listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13); - sensorPpgHostPPG_A10.mListOfSensorIdsConflicting = Collections.unmodifiableList(listOfKeysConflicting); + sensorPpgHostPPG_A0.mListOfSensorIdsConflicting = Collections.unmodifiableList(listOfKeysConflicting); // sensorPpgHostPPG_A12.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG_12_13; } @@ -308,14 +308,14 @@ public static final List getListSensorPpgHostPPG_A12(){ // sensorPpgHostPPG_A13.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG_12_13; } - public static final SensorDetailsRef sensorPpgHostPPG_A15 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG_A1 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A13Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A13Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG_A15, + GuiLabelSensors.PPG_A1, CompatibilityInfoForMaps.listOfCompatibleVersionInfoGsr, getListSensorPpgHostPPG_A13(), // RM passed in list into constructor as settings the list outside of constructor wasn't working null, - Arrays.asList(ObjectClusterSensorName.PPG_A15), + Arrays.asList(ObjectClusterSensorName.PPG_A1), true); { @@ -324,7 +324,7 @@ public static final List getListSensorPpgHostPPG_A12(){ listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A12); listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12); listOfKeysConflicting.add(Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13); - sensorPpgHostPPG_A15.mListOfSensorIdsConflicting = Collections.unmodifiableList(listOfKeysConflicting); + sensorPpgHostPPG_A1.mListOfSensorIdsConflicting = Collections.unmodifiableList(listOfKeysConflicting); // sensorPpgHostPPG_A13.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG_12_13; } @@ -387,10 +387,10 @@ public static final List getListSensorPpgHostPPG_A13(){ // { // sensorPpgHostPPG1_A12.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG1_12_13; // } - public static final SensorDetailsRef sensorPpgHostPPG1_A10 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG1_A0 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A12Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A12Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG1_A10, + GuiLabelSensors.PPG1_A0, CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.SHIMMER_GSR, @@ -410,7 +410,7 @@ public static final List getListSensorPpgHostPPG_A13(){ Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13), null, - Arrays.asList(ObjectClusterSensorName.PPG1_A10), + Arrays.asList(ObjectClusterSensorName.PPG1_A0), true); public static final SensorDetailsRef sensorPpgHostPPG1_A13 = new SensorDetailsRef( @@ -440,10 +440,10 @@ public static final List getListSensorPpgHostPPG_A13(){ // { // sensorPpgHostPPG1_A13.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG1_12_13; // } - public static final SensorDetailsRef sensorPpgHostPPG1_A15 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG1_A1 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A13Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A13Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG1_A15, + GuiLabelSensors.PPG1_A1, CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.SHIMMER_GSR, @@ -462,7 +462,7 @@ public static final List getListSensorPpgHostPPG_A13(){ Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A12, Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A13), null, - Arrays.asList(ObjectClusterSensorName.PPG1_A15), + Arrays.asList(ObjectClusterSensorName.PPG1_A1), true); public static final SensorDetailsRef sensorPpg2Dummy = new SensorDetailsRef( @@ -504,10 +504,10 @@ public static final List getListSensorPpgHostPPG_A13(){ // { // sensorPpgHostPPG2_A1.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG2_1_14; // } - public static final SensorDetailsRef sensorPpgHostPPG2_A17 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG2_A3 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A1Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A1Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG2_A17, + GuiLabelSensors.PPG2_A3, CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.SHIMMER_GSR, @@ -526,7 +526,7 @@ public static final List getListSensorPpgHostPPG_A13(){ Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1, Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14), null, - Arrays.asList(ObjectClusterSensorName.PPG2_A17), + Arrays.asList(ObjectClusterSensorName.PPG2_A3), true); public static final SensorDetailsRef sensorPpgHostPPG2_A14 = new SensorDetailsRef( @@ -557,10 +557,10 @@ public static final List getListSensorPpgHostPPG_A13(){ // { // sensorPpgHostPPG2_A1.mDerivedSensorBitmapID = ShimmerObject.DerivedSensorsBitMask.PPG2_1_14; // } - public static final SensorDetailsRef sensorPpgHostPPG2_A16 = new SensorDetailsRef( + public static final SensorDetailsRef sensorPpgHostPPG2_A2 = new SensorDetailsRef( SensorADC.sensorADC_INT_EXP_ADC_A14Ref.mSensorBitmapIDStreaming, SensorADC.sensorADC_INT_EXP_ADC_A14Ref.mSensorBitmapIDSDLogHeader, - GuiLabelSensors.PPG2_A16, + GuiLabelSensors.PPG2_A2, CompatibilityInfoForMaps.listOfCompatibleVersionInfoProto3Deluxe, Arrays.asList( Configuration.Shimmer3.SENSOR_ID.SHIMMER_GSR, @@ -580,7 +580,7 @@ public static final List getListSensorPpgHostPPG_A13(){ Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A1, Configuration.Shimmer3.SENSOR_ID.SHIMMER_INT_EXP_ADC_A14), null, - Arrays.asList(ObjectClusterSensorName.PPG2_A16), + Arrays.asList(ObjectClusterSensorName.PPG2_A2), true); public static final Map mSensorMapRef; @@ -609,14 +609,14 @@ public static final List getListSensorPpgHostPPG_A13(){ // Derived Channels - GSR Board aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_DUMMY, sensorPpgDummy); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A12, sensorPpgHostPPG_A10); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A13, sensorPpgHostPPG_A15); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A12, sensorPpgHostPPG_A0); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG_A13, sensorPpgHostPPG_A1); aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG1_DUMMY,sensorPpg1Dummy); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG1_A12, sensorPpgHostPPG1_A10); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG1_A13, sensorPpgHostPPG1_A15); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG1_A12, sensorPpgHostPPG1_A0); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG1_A13, sensorPpgHostPPG1_A1); aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_DUMMY ,sensorPpg2Dummy); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_A1, sensorPpgHostPPG2_A17); - aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_A14, sensorPpgHostPPG2_A16); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_A1, sensorPpgHostPPG2_A3); + aMap.put(Configuration.Shimmer3.SENSOR_ID.HOST_PPG2_A14, sensorPpgHostPPG2_A2); mSensorMapRef3r = Collections.unmodifiableMap(aMap); } @@ -677,53 +677,53 @@ public static final List getListSensorPpgHostPPG_A13(){ Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); // PPG - Using GSR+ board - public static final ChannelDetails channelPPG_A10 = new ChannelDetails( - ObjectClusterSensorName.PPG_A10, - ObjectClusterSensorName.PPG_A10, - DatabaseChannelHandles.PPG_A10, + public static final ChannelDetails channelPPG_A0 = new ChannelDetails( + ObjectClusterSensorName.PPG_A0, + ObjectClusterSensorName.PPG_A0, + DatabaseChannelHandles.PPG_A0, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); - public static final ChannelDetails channelPPG_A15 = new ChannelDetails( - ObjectClusterSensorName.PPG_A15, - ObjectClusterSensorName.PPG_A15, - DatabaseChannelHandles.PPG_A15, + public static final ChannelDetails channelPPG_A1 = new ChannelDetails( + ObjectClusterSensorName.PPG_A1, + ObjectClusterSensorName.PPG_A1, + DatabaseChannelHandles.PPG_A1, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); // PPG - Using Proto3 Deluxe TRRS Socket 1 - public static final ChannelDetails channelPPG1_A10 = new ChannelDetails( - ObjectClusterSensorName.PPG1_A10, - ObjectClusterSensorName.PPG1_A10, - DatabaseChannelHandles.PPG1_A10, + public static final ChannelDetails channelPPG1_A0 = new ChannelDetails( + ObjectClusterSensorName.PPG1_A0, + ObjectClusterSensorName.PPG1_A0, + DatabaseChannelHandles.PPG1_A0, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); - public static final ChannelDetails channelPPG1_A15 = new ChannelDetails( - ObjectClusterSensorName.PPG1_A15, - ObjectClusterSensorName.PPG1_A15, - DatabaseChannelHandles.PPG1_A15, + public static final ChannelDetails channelPPG1_A1 = new ChannelDetails( + ObjectClusterSensorName.PPG1_A1, + ObjectClusterSensorName.PPG1_A1, + DatabaseChannelHandles.PPG1_A1, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); // PPG - Using Proto3 Deluxe TRRS Socket 2 - public static final ChannelDetails channelPPG2_A17 = new ChannelDetails( - ObjectClusterSensorName.PPG2_A17, - ObjectClusterSensorName.PPG2_A17, - DatabaseChannelHandles.PPG2_A17, + public static final ChannelDetails channelPPG2_A3 = new ChannelDetails( + ObjectClusterSensorName.PPG2_A3, + ObjectClusterSensorName.PPG2_A3, + DatabaseChannelHandles.PPG2_A3, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); - public static final ChannelDetails channelPPG2_A16 = new ChannelDetails( - ObjectClusterSensorName.PPG2_A16, - ObjectClusterSensorName.PPG2_A16, - DatabaseChannelHandles.PPG2_A16, + public static final ChannelDetails channelPPG2_A2 = new ChannelDetails( + ObjectClusterSensorName.PPG2_A2, + ObjectClusterSensorName.PPG2_A2, + DatabaseChannelHandles.PPG2_A2, CHANNEL_DATA_TYPE.UINT14, 2, CHANNEL_DATA_ENDIAN.LSB, CHANNEL_UNITS.MILLIVOLTS, Arrays.asList(CHANNEL_TYPE.CAL, CHANNEL_TYPE.UNCAL)); @@ -751,14 +751,14 @@ public static final List getListSensorPpgHostPPG_A13(){ Map aChannelMap = new LinkedHashMap(); // PPG - Using GSR+ board - aChannelMap.put(ObjectClusterSensorName.PPG_A10, SensorPPG.channelPPG_A10); - aChannelMap.put(ObjectClusterSensorName.PPG_A15, SensorPPG.channelPPG_A15); + aChannelMap.put(ObjectClusterSensorName.PPG_A0, SensorPPG.channelPPG_A0); + aChannelMap.put(ObjectClusterSensorName.PPG_A1, SensorPPG.channelPPG_A1); // PPG - Using Proto3 Deluxe TRRS Socket 1 - aChannelMap.put(ObjectClusterSensorName.PPG1_A10, SensorPPG.channelPPG1_A10); - aChannelMap.put(ObjectClusterSensorName.PPG1_A15, SensorPPG.channelPPG1_A15); + aChannelMap.put(ObjectClusterSensorName.PPG1_A0, SensorPPG.channelPPG1_A0); + aChannelMap.put(ObjectClusterSensorName.PPG1_A1, SensorPPG.channelPPG1_A1); // PPG - Using Proto3 Deluxe TRRS Socket 2 - aChannelMap.put(ObjectClusterSensorName.PPG2_A17, SensorPPG.channelPPG2_A17); - aChannelMap.put(ObjectClusterSensorName.PPG2_A16, SensorPPG.channelPPG2_A16); + aChannelMap.put(ObjectClusterSensorName.PPG2_A3, SensorPPG.channelPPG2_A3); + aChannelMap.put(ObjectClusterSensorName.PPG2_A2, SensorPPG.channelPPG2_A2); mChannelMapRef3r = Collections.unmodifiableMap(aChannelMap); }