diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerObject.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerObject.java index 8802eb7ea..0f3bd609f 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerObject.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerObject.java @@ -710,7 +710,9 @@ public static final boolean isSupportedExgChipClocksJoined(ShimmerVerObject svo, if(svo.getHardwareVersion()==HW_ID.SHIMMER_4_SDK || (svo.getHardwareVersion()==HW_ID.SHIMMER_3 && ebd.getExpansionBoardId()==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED - && ebd.getExpansionBoardRev()>=4) + && ebd.getExpansionBoardRev()>=4) || + (svo.getHardwareVersion()==HW_ID.SHIMMER_3R + && ebd.getExpansionBoardId()==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED) ){ return true; } diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/exgConfig/ExGConfigBytesDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/exgConfig/ExGConfigBytesDetails.java index 07413f54e..dfc2eab1f 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/exgConfig/ExGConfigBytesDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/exgConfig/ExGConfigBytesDetails.java @@ -311,32 +311,32 @@ public static final class RESPIRATION_MOD_CIRCUITRY{ public static final ExGConfigOption ON = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_MOD_CIRCUITRY, "ON", 1); } public static final class RESPIRATION_PHASE_AT_32KHZ{ - public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0°", 0); - public static final ExGConfigOption PHASE_11_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "11.25°", 1); - public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5°", 2); - public static final ExGConfigOption PHASE_33_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "33.75°", 3); - public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45°", 4); - public static final ExGConfigOption PHASE_56_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "56.25°", 5); - public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5°", 6); - public static final ExGConfigOption PHASE_78_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "78.75°", 7); - public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90°", 8); - public static final ExGConfigOption PHASE_101_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "101.25°", 9); - public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5°", 10); - public static final ExGConfigOption PHASE_123_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "123.75°", 11); - public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135°", 12); - public static final ExGConfigOption PHASE_146_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "146.25°", 13); - public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5°", 14); - public static final ExGConfigOption PHASE_168_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "168.75°", 15); + public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0\u00B0", 0); + public static final ExGConfigOption PHASE_11_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "11.25\u00B0", 1); + public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5\u00B0", 2); + public static final ExGConfigOption PHASE_33_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "33.75\u00B0", 3); + public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45\u00B0", 4); + public static final ExGConfigOption PHASE_56_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "56.25\u00B0", 5); + public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5\u00B0", 6); + public static final ExGConfigOption PHASE_78_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "78.75\u00B0", 7); + public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90\u00B0", 8); + public static final ExGConfigOption PHASE_101_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "101.25\u00B0", 9); + public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5\u00B0", 10); + public static final ExGConfigOption PHASE_123_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "123.75\u00B0", 11); + public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135\u00B0", 12); + public static final ExGConfigOption PHASE_146_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "146.25\u00B0", 13); + public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5\u00B0", 14); + public static final ExGConfigOption PHASE_168_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "168.75\u00B0", 15); } public static final class RESPIRATION_PHASE_AT_64KHZ{ - public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0°", 0); - public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5°", 1); - public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45°", 2); - public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5°", 3); - public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90°", 4); - public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5°", 5); - public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135°", 6); - public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5°", 7); + public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0\u00B0", 0); + public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5\u00B0", 1); + public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45\u00B0", 2); + public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5\u00B0", 3); + public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90\u00B0", 4); + public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5\u00B0", 5); + public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135\u00B0", 6); + public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5\u00B0", 7); } public static final class RESPIRATION_CONTROL{ public static final ExGConfigOption INTERNAL_CLOCK = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_CONTROL, "Internal clock", 0); diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorEXG.java b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorEXG.java index aa016ccfd..ec9c443b4 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorEXG.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorEXG.java @@ -140,9 +140,9 @@ public class SensorEXG extends AbstractSensor{ public static final String[] ListOfExGRespirationDetectFreq = {"32 kHz","64 kHz"}; public static final Integer[] ListOfExGRespirationDetectFreqConfigValues = {0,1}; - public static final String[] ListOfExGRespirationDetectPhase32khz = {"0°","11.25°","22.5°","33.75°","45°","56.25°","67.5°","78.75°","90°","101.25°","112.5°","123.75°","135°","146.25°","157.5°","168.75°"}; + public static final String[] ListOfExGRespirationDetectPhase32khz = {"0\u00B0","11.25\u00B0","22.5\u00B0","33.75\u00B0","45\u00B0","56.25\u00B0","67.5\u00B0","78.75\u00B0","90\u00B0","101.25\u00B0","112.5\u00B0","123.75\u00B0","135\u00B0","146.25\u00B0","157.5\u00B0","168.75\u00B0"}; public static final Integer[] ListOfExGRespirationDetectPhase32khzConfigValues = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; - public static final String[] ListOfExGRespirationDetectPhase64khz = {"0°","22.5°","45°","67.5°","90°","112.5°","135°","157.5°"}; + public static final String[] ListOfExGRespirationDetectPhase64khz = {"0\u00B0","22.5\u00B0","45\u00B0","67.5\u00B0","90\u00B0","112.5\u00B0","135\u00B0","157.5\u00B0"}; public static final Integer[] ListOfExGRespirationDetectPhase64khzConfigValues = {0,1,2,3,4,5,6,7}; public static final String[] ListOfExGRate = {"125 Hz","250 Hz","500 Hz","1 kHz","2 kHz","4 kHz","8 kHz"};