Skip to content

Commit 5746b0b

Browse files
marknolanmarknolan
committed
Merge remote-tracking branch 'origin/master' into DEV-343_More_BT_cmd_support_for_S3R
2 parents d30f464 + 7c3e306 commit 5746b0b

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,7 +2968,7 @@ public void interpretDataPacketFormat(int numChannels, byte[] signalId){
29682968

29692969
int enabledSensors= 0x00;
29702970
for (int i=iTS;i<numChannels+iTS;i++) {
2971-
if ((byte)signalId[i]==(byte)0x00){
2971+
if ((byte)signalId[i-iTS]==(byte)0x00){
29722972
if (getHardwareVersion()==HW_ID.SHIMMER_SR30 || getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
29732973
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_LN_X;
29742974
signalDataTypeArray[i+1] = "i16";
@@ -2982,7 +2982,7 @@ public void interpretDataPacketFormat(int numChannels, byte[] signalId){
29822982
enabledSensors |= SENSOR_ACCEL;
29832983
}
29842984
}
2985-
else if ((byte)signalId[i]==(byte)0x01){
2985+
else if ((byte)signalId[i-iTS]==(byte)0x01){
29862986
if (getHardwareVersion()==HW_ID.SHIMMER_SR30 || getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
29872987
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_LN_Y;
29882988
signalDataTypeArray[i+1] = "i16";
@@ -2996,7 +2996,7 @@ else if ((byte)signalId[i]==(byte)0x01){
29962996
enabledSensors |= SENSOR_ACCEL;
29972997
}
29982998
}
2999-
else if ((byte)signalId[i]==(byte)0x02){
2999+
else if ((byte)signalId[i-iTS]==(byte)0x02){
30003000
if (getHardwareVersion()==HW_ID.SHIMMER_SR30 || getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
30013001
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_LN_Z;
30023002
signalDataTypeArray[i+1] = "i16";
@@ -3010,7 +3010,7 @@ else if ((byte)signalId[i]==(byte)0x02){
30103010
enabledSensors |= SENSOR_ACCEL;
30113011
}
30123012
}
3013-
else if ((byte)signalId[i]==(byte)0x03){
3013+
else if ((byte)signalId[i-iTS]==(byte)0x03){
30143014

30153015
if (getHardwareVersion()==HW_ID.SHIMMER_SR30){
30163016
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.GYRO_X;
@@ -3031,7 +3031,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
30313031
enabledSensors |= SENSOR_GYRO;
30323032
}
30333033
}
3034-
else if ((byte)signalId[i]==(byte)0x04){
3034+
else if ((byte)signalId[i-iTS]==(byte)0x04){
30353035

30363036
if (getHardwareVersion()==HW_ID.SHIMMER_SR30){
30373037
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.GYRO_Y;
@@ -3052,7 +3052,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
30523052
enabledSensors |= SENSOR_GYRO;
30533053
}
30543054
}
3055-
else if ((byte)signalId[i]==(byte)0x05){
3055+
else if ((byte)signalId[i-iTS]==(byte)0x05){
30563056
if (getHardwareVersion()==HW_ID.SHIMMER_SR30){
30573057
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.GYRO_Z;
30583058
signalDataTypeArray[i+1] = "i16";
@@ -3072,7 +3072,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
30723072
enabledSensors |= SENSOR_GYRO;
30733073
}
30743074
}
3075-
else if ((byte)signalId[i]==(byte)0x06){
3075+
else if ((byte)signalId[i-iTS]==(byte)0x06){
30763076
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
30773077
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.BATTERY; //should be the battery but this will do for now
30783078
signalDataTypeArray[i+1] = "i16";
@@ -3092,7 +3092,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
30923092
enabledSensors |= SENSOR_MAG;
30933093
}
30943094
}
3095-
else if ((byte)signalId[i]==(byte)0x07){
3095+
else if ((byte)signalId[i-iTS]==(byte)0x07){
30963096
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
30973097
signalDataTypeArray[i+1] = "i16";
30983098
packetSize=packetSize+2;
@@ -3116,7 +3116,7 @@ else if(getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHI
31163116
enabledSensors |= SENSOR_MAG;
31173117
}
31183118
}
3119-
else if ((byte)signalId[i]==(byte)0x08)
3119+
else if ((byte)signalId[i-iTS]==(byte)0x08)
31203120
{
31213121
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
31223122
signalDataTypeArray[i+1] = "i16";
@@ -3141,7 +3141,7 @@ else if(getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHI
31413141
enabledSensors |= SENSOR_MAG;
31423142
}
31433143
}
3144-
else if ((byte)signalId[i]==(byte)0x09){
3144+
else if ((byte)signalId[i-iTS]==(byte)0x09){
31453145
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
31463146
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_WR_Z;
31473147
signalDataTypeArray[i+1] = "i16";
@@ -3165,7 +3165,7 @@ else if(getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHI
31653165
enabledSensors |= SENSOR_ECG;
31663166
}
31673167
}
3168-
else if ((byte)signalId[i]==(byte)0x0A){
3168+
else if ((byte)signalId[i-iTS]==(byte)0x0A){
31693169
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
31703170
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_X;
31713171
signalDataTypeArray[i+1] = "i16";
@@ -3189,7 +3189,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
31893189
enabledSensors |= SENSOR_ECG;
31903190
}
31913191
}
3192-
else if ((byte)signalId[i]==(byte)0x0B){
3192+
else if ((byte)signalId[i-iTS]==(byte)0x0B){
31933193
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
31943194
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_Y;
31953195
signalDataTypeArray[i+1] = "i16";
@@ -3213,7 +3213,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
32133213
enabledSensors |= SENSOR_GSR;
32143214
}
32153215
}
3216-
else if ((byte)signalId[i]==(byte)0x0C){
3216+
else if ((byte)signalId[i-iTS]==(byte)0x0C){
32173217
if(getHardwareVersion()==HW_ID.SHIMMER_SR30){
32183218
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.MAG_Z;
32193219
signalDataTypeArray[i+1] = "i16";
@@ -3237,7 +3237,7 @@ else if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SH
32373237
enabledSensors |= SENSOR_GSR;
32383238
}
32393239
}
3240-
else if ((byte)signalId[i]==(byte)0x0D){
3240+
else if ((byte)signalId[i-iTS]==(byte)0x0D){
32413241
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
32423242
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
32433243
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_0;
@@ -3258,7 +3258,7 @@ else if ((byte)signalId[i]==(byte)0x0D){
32583258
enabledSensors |= SENSOR_EMG;
32593259
}
32603260
}
3261-
else if ((byte)signalId[i]==(byte)0x0E){
3261+
else if ((byte)signalId[i-iTS]==(byte)0x0E){
32623262
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
32633263
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
32643264
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_1;
@@ -3279,7 +3279,7 @@ else if ((byte)signalId[i]==(byte)0x0E){
32793279
enabledSensors |= SENSOR_EXP_BOARD_A0;
32803280
}
32813281
}
3282-
else if ((byte)signalId[i]==(byte)0x0F){
3282+
else if ((byte)signalId[i-iTS]==(byte)0x0F){
32833283
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
32843284
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
32853285
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXT_ADC_2;
@@ -3299,7 +3299,7 @@ else if ((byte)signalId[i]==(byte)0x0F){
32993299
enabledSensors |= SENSOR_EXP_BOARD_A7;
33003300
}
33013301
}
3302-
else if ((byte)signalId[i]==(byte)0x10){
3302+
else if ((byte)signalId[i-iTS]==(byte)0x10){
33033303
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
33043304
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
33053305
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_3;
@@ -3320,7 +3320,7 @@ else if ((byte)signalId[i]==(byte)0x10){
33203320
enabledSensors |= SENSOR_BRIDGE_AMP;
33213321
}
33223322
}
3323-
else if ((byte)signalId[i]==(byte)0x11){
3323+
else if ((byte)signalId[i-iTS]==(byte)0x11){
33243324
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
33253325
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
33263326
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_0;
@@ -3341,7 +3341,7 @@ else if ((byte)signalId[i]==(byte)0x11){
33413341
enabledSensors |= SENSOR_BRIDGE_AMP;
33423342
}
33433343
}
3344-
else if ((byte)signalId[i]==(byte)0x12){
3344+
else if ((byte)signalId[i-iTS]==(byte)0x12){
33453345
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
33463346
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
33473347
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_1;
@@ -3367,7 +3367,7 @@ else if ((byte)signalId[i]==(byte)0x12){
33673367
enabledSensors |= SENSOR_HEART;
33683368
}
33693369
}
3370-
else if ((byte)signalId[i]==(byte)0x13){
3370+
else if ((byte)signalId[i-iTS]==(byte)0x13){
33713371
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
33723372
if (getHardwareVersion()==HW_ID.SHIMMER_3R) {
33733373
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.INT_ADC_2;
@@ -3382,55 +3382,55 @@ else if ((byte)signalId[i]==(byte)0x13){
33823382
enabledSensors |= SENSOR_INT_ADC_A14;
33833383
}
33843384
}
3385-
else if ((byte)signalId[i]==(byte)0x14){
3385+
else if ((byte)signalId[i-iTS]==(byte)0x14){
33863386
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
33873387
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_HIGHG_X;
33883388
signalDataTypeArray[i+1] = "i12*>";
33893389
packetSize=packetSize+2;
33903390
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_ACCEL;
33913391
}
33923392
}
3393-
else if ((byte)signalId[i]==(byte)0x15){
3393+
else if ((byte)signalId[i-iTS]==(byte)0x15){
33943394
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
33953395
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_HIGHG_Y;
33963396
signalDataTypeArray[i+1] = "i12*>";
33973397
packetSize=packetSize+2;
33983398
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_ACCEL;
33993399
}
34003400
}
3401-
else if ((byte)signalId[i]==(byte)0x16){
3401+
else if ((byte)signalId[i-iTS]==(byte)0x16){
34023402
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
34033403
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ACCEL_HIGHG_Z;
34043404
signalDataTypeArray[i+1] = "i12*>";
34053405
packetSize=packetSize+2;
34063406
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_ACCEL;
34073407
}
34083408
}
3409-
else if ((byte)signalId[i]==(byte)0x17){
3409+
else if ((byte)signalId[i-iTS]==(byte)0x17){
34103410
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
34113411
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_X;
34123412
signalDataTypeArray[i+1] = "i16";
34133413
packetSize=packetSize+2;
34143414
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;
34153415
}
34163416
}
3417-
else if ((byte)signalId[i]==(byte)0x18){
3417+
else if ((byte)signalId[i-iTS]==(byte)0x18){
34183418
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
34193419
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_Y;
34203420
signalDataTypeArray[i+1] = "i16";
34213421
packetSize=packetSize+2;
34223422
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;
34233423
}
34243424
}
3425-
else if ((byte)signalId[i]==(byte)0x19){
3425+
else if ((byte)signalId[i-iTS]==(byte)0x19){
34263426
if (getHardwareVersion()==HW_ID.SHIMMER_3R){
34273427
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.ALT_MAG_Z;
34283428
signalDataTypeArray[i+1] = "i16";
34293429
packetSize=packetSize+2;
34303430
enabledSensors |= Configuration.Shimmer3.SensorBitmap.SENSOR_ALT_MAG;
34313431
}
34323432
}
3433-
else if ((byte)signalId[i]==(byte)0x1A){
3433+
else if ((byte)signalId[i-iTS]==(byte)0x1A){
34343434
if (getHardwareVersion()==HW_ID.SHIMMER_3){
34353435
String signalName = SensorBMP180.ObjectClusterSensorName.TEMPERATURE_BMP180;
34363436
if(isSupportedBmp280()){
@@ -3448,7 +3448,7 @@ else if ((byte)signalId[i]==(byte)0x1A){
34483448
enabledSensors |= SENSOR_BMPX80;
34493449
}
34503450
}
3451-
else if ((byte)signalId[i]==(byte)0x1B){
3451+
else if ((byte)signalId[i-iTS]==(byte)0x1B){
34523452
if (getHardwareVersion()==HW_ID.SHIMMER_3){
34533453
String signalName = SensorBMP180.ObjectClusterSensorName.PRESSURE_BMP180;
34543454
if(isSupportedBmp280()){
@@ -3466,101 +3466,101 @@ else if ((byte)signalId[i]==(byte)0x1B){
34663466
enabledSensors |= SENSOR_BMPX80;
34673467
}
34683468
}
3469-
else if ((byte)signalId[i]==(byte)0x1C){
3469+
else if ((byte)signalId[i-iTS]==(byte)0x1C){
34703470
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
34713471
signalNameArray[i+1]=SensorGSR.ObjectClusterSensorName.GSR_RESISTANCE;
34723472
signalDataTypeArray[i+1] = "u16";
34733473
packetSize=packetSize+2;
34743474
enabledSensors |= SENSOR_GSR;
34753475
}
34763476
}
3477-
else if ((byte)signalId[i]==(byte)0x1D){
3477+
else if ((byte)signalId[i-iTS]==(byte)0x1D){
34783478
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
34793479
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG1_STATUS;
34803480
signalDataTypeArray[i+1] = "u8";
34813481
packetSize=packetSize+1;
34823482
}
34833483
}
3484-
else if ((byte)signalId[i]==(byte)0x1E){
3484+
else if ((byte)signalId[i-iTS]==(byte)0x1E){
34853485
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
34863486
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG1_CH1_24BIT;
34873487
signalDataTypeArray[i+1] = "i24r";
34883488
packetSize=packetSize+3;
34893489
enabledSensors |= SENSOR_EXG1_24BIT;
34903490
}
34913491
}
3492-
else if ((byte)signalId[i]==(byte)0x1F){
3492+
else if ((byte)signalId[i-iTS]==(byte)0x1F){
34933493
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
34943494
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG1_CH2_24BIT;
34953495
signalDataTypeArray[i+1] = "i24r";
34963496
packetSize=packetSize+3;
34973497
enabledSensors |= SENSOR_EXG1_24BIT;
34983498
}
34993499
}
3500-
else if ((byte)signalId[i]==(byte)0x20){
3500+
else if ((byte)signalId[i-iTS]==(byte)0x20){
35013501
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35023502
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG2_STATUS;
35033503
signalDataTypeArray[i+1] = "u8";
35043504
packetSize=packetSize+1;
35053505
}
35063506
}
3507-
else if ((byte)signalId[i]==(byte)0x21){
3507+
else if ((byte)signalId[i-iTS]==(byte)0x21){
35083508
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35093509
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG2_CH1_24BIT;
35103510
signalDataTypeArray[i+1] = "i24r";
35113511
packetSize=packetSize+3;
35123512
enabledSensors |= SENSOR_EXG2_24BIT;
35133513
}
35143514
}
3515-
else if ((byte)signalId[i]==(byte)0x22){
3515+
else if ((byte)signalId[i-iTS]==(byte)0x22){
35163516
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35173517
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG2_CH2_24BIT;
35183518
signalDataTypeArray[i+1] = "i24r";
35193519
packetSize=packetSize+3;
35203520
enabledSensors |= SENSOR_EXG2_24BIT;
35213521
}
35223522
}
3523-
else if ((byte)signalId[i]==(byte)0x23){
3523+
else if ((byte)signalId[i-iTS]==(byte)0x23){
35243524
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35253525
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG1_CH1_16BIT;
35263526
signalDataTypeArray[i+1] = "i16r";
35273527
packetSize=packetSize+2;
35283528
enabledSensors |= SENSOR_EXG1_16BIT;
35293529
}
35303530
}
3531-
else if ((byte)signalId[i]==(byte)0x24){
3531+
else if ((byte)signalId[i-iTS]==(byte)0x24){
35323532
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35333533
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG1_CH2_16BIT;
35343534
signalDataTypeArray[i+1] = "i16r";
35353535
packetSize=packetSize+2;
35363536
enabledSensors |= SENSOR_EXG1_16BIT;
35373537
}
35383538
}
3539-
else if ((byte)signalId[i]==(byte)0x25){
3539+
else if ((byte)signalId[i-iTS]==(byte)0x25){
35403540
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35413541
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG2_CH1_16BIT;
35423542
signalDataTypeArray[i+1] = "i16r";
35433543
packetSize=packetSize+2;
35443544
enabledSensors |= SENSOR_EXG2_16BIT;
35453545
}
35463546
}
3547-
else if ((byte)signalId[i]==(byte)0x26){
3547+
else if ((byte)signalId[i-iTS]==(byte)0x26){
35483548
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35493549
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.EXG2_CH2_16BIT;
35503550
signalDataTypeArray[i+1] = "i16r";
35513551
packetSize=packetSize+2;
35523552
enabledSensors |= SENSOR_EXG2_16BIT;
35533553
}
35543554
}
3555-
else if ((byte)signalId[i]==(byte)0x27){
3555+
else if ((byte)signalId[i-iTS]==(byte)0x27){
35563556
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35573557
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.BRIDGE_AMP_HIGH;
35583558
signalDataTypeArray[i+1] = "u12";
35593559
packetSize=packetSize+2;
35603560
enabledSensors |= SENSOR_BRIDGE_AMP;
35613561
}
35623562
}
3563-
else if ((byte)signalId[i]==(byte)0x28){
3563+
else if ((byte)signalId[i-iTS]==(byte)0x28){
35643564
if (getHardwareVersion()==HW_ID.SHIMMER_3 || getHardwareVersion()==HW_ID.SHIMMER_3R){
35653565
signalNameArray[i+1]=Shimmer3.ObjectClusterSensorName.BRIDGE_AMP_LOW;
35663566
signalDataTypeArray[i+1] = "u12";
@@ -3569,7 +3569,7 @@ else if ((byte)signalId[i]==(byte)0x28){
35693569
}
35703570
}
35713571
else{
3572-
signalNameArray[i+1]=Byte.toString(signalId[i]);
3572+
signalNameArray[i+1]=Byte.toString(signalId[i-iTS]);
35733573
signalDataTypeArray[i+1] = "u12";
35743574
packetSize=packetSize+2;
35753575
}

0 commit comments

Comments
 (0)