Skip to content

Commit 36530c2

Browse files
MAzalyaMAzalya
authored
Merge branch 'master' into DEV-175
2 parents 156e355 + 0dbc09e commit 36530c2

6 files changed

Lines changed: 32 additions & 31 deletions

File tree

‎ShimmerBluetoothManager/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ publishing {
2525

2626
groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
2727
artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
28-
version = '0.11.1_beta' // Replace with your package version
28+
version = '0.11.2_beta' // Replace with your package version
2929

3030
// Jar publication
3131
//(

‎ShimmerDriver/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ publishing {
4747

4848
groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
4949
artifactId = 'shimmerdriver' // Replace with the name of your package
50-
version = '0.11.1_beta' // Replace with your package version
50+
version = '0.11.2_beta' // Replace with your package version
5151

5252
// Jar publication
5353
//(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,9 @@ public static final boolean isSupportedExgChipClocksJoined(ShimmerVerObject svo,
713713
if(svo.getHardwareVersion()==HW_ID.SHIMMER_4_SDK ||
714714
(svo.getHardwareVersion()==HW_ID.SHIMMER_3
715715
&& ebd.getExpansionBoardId()==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED
716-
&& ebd.getExpansionBoardRev()>=4)
717-
|| (svo.getHardwareVersion()==HW_ID.SHIMMER_3R && ebd.getExpansionBoardId()==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED )
716+
&& ebd.getExpansionBoardRev()>=4) ||
717+
(svo.getHardwareVersion()==HW_ID.SHIMMER_3R
718+
&& ebd.getExpansionBoardId()==HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED)
718719
){
719720
return true;
720721
}

‎ShimmerDriver/src/main/java/com/shimmerresearch/exgConfig/ExGConfigBytesDetails.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -311,32 +311,32 @@ public static final class RESPIRATION_MOD_CIRCUITRY{
311311
public static final ExGConfigOption ON = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_MOD_CIRCUITRY, "ON", 1);
312312
}
313313
public static final class RESPIRATION_PHASE_AT_32KHZ{
314-
public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0°", 0);
315-
public static final ExGConfigOption PHASE_11_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "11.25°", 1);
316-
public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5°", 2);
317-
public static final ExGConfigOption PHASE_33_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "33.75°", 3);
318-
public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45°", 4);
319-
public static final ExGConfigOption PHASE_56_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "56.25°", 5);
320-
public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5°", 6);
321-
public static final ExGConfigOption PHASE_78_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "78.75°", 7);
322-
public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90°", 8);
323-
public static final ExGConfigOption PHASE_101_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "101.25°", 9);
324-
public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5°", 10);
325-
public static final ExGConfigOption PHASE_123_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "123.75°", 11);
326-
public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135°", 12);
327-
public static final ExGConfigOption PHASE_146_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "146.25°", 13);
328-
public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5°", 14);
329-
public static final ExGConfigOption PHASE_168_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "168.75°", 15);
314+
public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0\u00B0", 0);
315+
public static final ExGConfigOption PHASE_11_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "11.25\u00B0", 1);
316+
public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5\u00B0", 2);
317+
public static final ExGConfigOption PHASE_33_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "33.75\u00B0", 3);
318+
public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45\u00B0", 4);
319+
public static final ExGConfigOption PHASE_56_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "56.25\u00B0", 5);
320+
public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5\u00B0", 6);
321+
public static final ExGConfigOption PHASE_78_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "78.75\u00B0", 7);
322+
public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90\u00B0", 8);
323+
public static final ExGConfigOption PHASE_101_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "101.25\u00B0", 9);
324+
public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5\u00B0", 10);
325+
public static final ExGConfigOption PHASE_123_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "123.75\u00B0", 11);
326+
public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135\u00B0", 12);
327+
public static final ExGConfigOption PHASE_146_25 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "146.25\u00B0", 13);
328+
public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5\u00B0", 14);
329+
public static final ExGConfigOption PHASE_168_75 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "168.75\u00B0", 15);
330330
}
331331
public static final class RESPIRATION_PHASE_AT_64KHZ{
332-
public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0°", 0);
333-
public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5°", 1);
334-
public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45°", 2);
335-
public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5°", 3);
336-
public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90°", 4);
337-
public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5°", 5);
338-
public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135°", 6);
339-
public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5°", 7);
332+
public static final ExGConfigOption PHASE_0 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "0\u00B0", 0);
333+
public static final ExGConfigOption PHASE_22_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "22.5\u00B0", 1);
334+
public static final ExGConfigOption PHASE_45 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "45\u00B0", 2);
335+
public static final ExGConfigOption PHASE_67_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "67.5\u00B0", 3);
336+
public static final ExGConfigOption PHASE_90 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "90\u00B0", 4);
337+
public static final ExGConfigOption PHASE_112_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "112.5\u00B0", 5);
338+
public static final ExGConfigOption PHASE_135 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "135\u00B0", 6);
339+
public static final ExGConfigOption PHASE_157_5 = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_PHASE, "157.5\u00B0", 7);
340340
}
341341
public static final class RESPIRATION_CONTROL{
342342
public static final ExGConfigOption INTERNAL_CLOCK = new ExGConfigOption(EXG_SETTINGS.REG9_RESPIRATION_CONTROL, "Internal clock", 0);

‎ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorEXG.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ public class SensorEXG extends AbstractSensor{
140140
public static final String[] ListOfExGRespirationDetectFreq = {"32 kHz","64 kHz"};
141141
public static final Integer[] ListOfExGRespirationDetectFreqConfigValues = {0,1};
142142

143-
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°"};
143+
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"};
144144
public static final Integer[] ListOfExGRespirationDetectPhase32khzConfigValues = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
145-
public static final String[] ListOfExGRespirationDetectPhase64khz = {"0°","22.5°","45°","67.5°","90°","112.5°","135°","157.5°"};
145+
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"};
146146
public static final Integer[] ListOfExGRespirationDetectPhase64khzConfigValues = {0,1,2,3,4,5,6,7};
147147

148148
public static final String[] ListOfExGRate = {"125 Hz","250 Hz","500 Hz","1 kHz","2 kHz","4 kHz","8 kHz"};

‎ShimmerDriverPC/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ publishing {
3737

3838
groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
3939
artifactId = 'shimmerdriverpc' // Replace with the name of your package
40-
version = '0.11.1_beta' // Replace with your package version
40+
version = '0.11.2_beta' // Replace with your package version
4141

4242
// Jar publication
4343
//(

0 commit comments

Comments
 (0)