Skip to content

Commit af2276b

Browse files
ShimmerEngineeringShimmerEngineering
authored
Merge pull request #164 from ShimmerEngineering/DEV-198
DEV-198
2 parents c2a1f04 + f1d42c9 commit af2276b

File tree

2 files changed

+67
-56
lines changed

2 files changed

+67
-56
lines changed

‎ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs‎

Lines changed: 54 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -320,13 +320,13 @@ public enum SensorBitmapShimmer3
320320

321321
public enum SensorBitmapShimmer3R
322322
{
323-
SENSOR_EXT_A9 = 0x02,
324-
SENSOR_EXT_A11 = 0x01,
325-
SENSOR_EXT_A12 = 0x0800,
326-
SENSOR_INT_A17 = 0x0400,
327-
SENSOR_INT_A10 = 0x0200,
328-
SENSOR_INT_A15 = 0x0100,
329-
SENSOR_INT_A16 = 0x800000,
323+
SENSOR_EXT_A0 = 0x02,
324+
SENSOR_EXT_A1 = 0x01,
325+
SENSOR_EXT_A2 = 0x0800,
326+
SENSOR_INT_A3 = 0x0400,
327+
SENSOR_INT_A0 = 0x0200,
328+
SENSOR_INT_A1 = 0x0100,
329+
SENSOR_INT_A2 = 0x800000,
330330
SENSOR_BMP380_PRESSURE = 0x40000
331331
}
332332

@@ -3166,10 +3166,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
31663166
}
31673167
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
31683168
{
3169-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A9;
3169+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A0;
31703170
signalDataTypeArray[i + 1] = "u12";
31713171
packetSize = packetSize + 2;
3172-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A9);
3172+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A0);
31733173
}
31743174
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
31753175
{
@@ -3190,10 +3190,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
31903190
}
31913191
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
31923192
{
3193-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A11;
3193+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A1;
31943194
signalDataTypeArray[i + 1] = "u12";
31953195
packetSize = packetSize + 2;
3196-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A11);
3196+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A1);
31973197
}
31983198
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
31993199
{
@@ -3214,10 +3214,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
32143214
}
32153215
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
32163216
{
3217-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A12;
3217+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A2;
32183218
signalDataTypeArray[i + 1] = "u12";
32193219
packetSize = packetSize + 2;
3220-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A12);
3220+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_EXT_A2);
32213221
}
32223222
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
32233223
{
@@ -3238,10 +3238,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
32383238
}
32393239
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
32403240
{
3241-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A17;
3241+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A3;
32423242
signalDataTypeArray[i + 1] = "u12";
32433243
packetSize = packetSize + 2;
3244-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A17);
3244+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A3);
32453245
}
32463246
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
32473247
{
@@ -3263,10 +3263,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
32633263
}
32643264
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
32653265
{
3266-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A10;
3266+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A0;
32673267
signalDataTypeArray[i + 1] = "u12";
32683268
packetSize = packetSize + 2;
3269-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A10);
3269+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A0);
32703270
}
32713271
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
32723272
{
@@ -3287,10 +3287,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
32873287
}
32883288
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
32893289
{
3290-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A15;
3290+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A1;
32913291
signalDataTypeArray[i + 1] = "u12";
32923292
packetSize = packetSize + 2;
3293-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A15);
3293+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A1);
32943294
}
32953295
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER2R)
32963296
{
@@ -3319,10 +3319,10 @@ protected void InterpretDataPacketFormat(int nC, byte[] signalid)
33193319
}
33203320
else if (HardwareVersion == (int)ShimmerVersion.SHIMMER3R)
33213321
{
3322-
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A16;
3322+
signalNameArray[i + 1] = Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A2;
33233323
signalDataTypeArray[i + 1] = "u12";
33243324
packetSize = packetSize + 2;
3325-
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A16);
3325+
enabledSensors = (enabledSensors | (int)SensorBitmapShimmer3R.SENSOR_INT_A2);
33263326
}
33273327
}
33283328
else if ((byte)signalid[i] == (byte)0x14)
@@ -3845,11 +3845,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
38453845

38463846
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
38473847
{
3848-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A9);
3848+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A0);
38493849
double datatemp = newPacket[index];
38503850
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3851-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A9, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3852-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A9, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3851+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A0, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3852+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A0, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
38533853

38543854
}
38553855
else
@@ -3867,11 +3867,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
38673867

38683868
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
38693869
{
3870-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A11);
3870+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A1);
38713871
double datatemp = newPacket[index];
38723872
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3873-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A11, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3874-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A11, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3873+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A1, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3874+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A1, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
38753875

38763876
}
38773877
else
@@ -3888,11 +3888,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
38883888
{
38893889
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
38903890
{
3891-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A12);
3891+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A2);
38923892
double datatemp = newPacket[index];
38933893
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3894-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A12, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3895-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.EXTERNAL_ADC_A12, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3894+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A2, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3895+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_EXT_ADC_A2, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
38963896

38973897
}
38983898
else
@@ -3910,11 +3910,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
39103910

39113911
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
39123912
{
3913-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A17);
3913+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A3);
39143914
double datatemp = newPacket[index];
39153915
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3916-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A17, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3917-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A17, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3916+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A3, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3917+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A3, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
39183918

39193919
}
39203920
else
@@ -3931,11 +3931,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
39313931
{
39323932
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
39333933
{
3934-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A10);
3934+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A0);
39353935
double datatemp = newPacket[index];
39363936
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3937-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A10, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3938-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A10, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3937+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A0, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3938+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A0, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
39393939

39403940
}
39413941
else
@@ -3952,11 +3952,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
39523952
{
39533953
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
39543954
{
3955-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A15);
3955+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A1);
39563956
double datatemp = newPacket[index];
39573957
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3958-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A15, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3959-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A15, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3958+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A1, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3959+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A1, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
39603960

39613961
}
39623962
else
@@ -3974,11 +3974,11 @@ protected virtual ObjectCluster BuildMsg(List<byte> packet)
39743974

39753975
if (HardwareVersion == (int)ShimmerBluetooth.ShimmerVersion.SHIMMER3R)
39763976
{
3977-
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A16);
3977+
int index = getSignalIndex(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A2);
39783978
double datatemp = newPacket[index];
39793979
datatemp = CalibrateShimmer3RAdcChannel(datatemp);
3980-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A16, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3981-
objectCluster.Add(Shimmer3RConfiguration.SignalNames.INTERNAL_ADC_A16, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
3980+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A2, ShimmerConfiguration.SignalFormats.RAW, ShimmerConfiguration.SignalUnits.NoUnits, newPacket[index]);
3981+
objectCluster.Add(Shimmer3RConfiguration.SignalNames.GEN_INT_ADC_A2, ShimmerConfiguration.SignalFormats.CAL, ShimmerConfiguration.SignalUnits.MilliVolts, datatemp);
39823982

39833983
}
39843984
else
@@ -7854,13 +7854,24 @@ public class Shimmer3RConfiguration
78547854
public class SignalNames
78557855
{
78567856
//3R
7857-
public static readonly String EXTERNAL_ADC_A9 = "External ADC A9";
7857+
/*public static readonly String EXTERNAL_ADC_A9 = "External ADC A9";
78587858
public static readonly String EXTERNAL_ADC_A11 = "External ADC A11";
78597859
public static readonly String EXTERNAL_ADC_A12 = "External ADC A12";
78607860
public static readonly String INTERNAL_ADC_A17 = "Internal ADC A17";
78617861
public static readonly String INTERNAL_ADC_A10 = "Internal ADC A10";
78627862
public static readonly String INTERNAL_ADC_A15 = "Internal ADC A15";
78637863
public static readonly String INTERNAL_ADC_A16 = "Internal ADC A16";
7864+
*/
7865+
public static readonly String GEN_EXT_ADC_A0 = "External ADC A0";
7866+
public static readonly String GEN_EXT_ADC_A1 = "External ADC A1";
7867+
public static readonly String GEN_EXT_ADC_A2 = "External ADC A2";
7868+
7869+
public static readonly String GEN_INT_ADC_A0 = "Internal ADC A0";
7870+
public static readonly String GEN_INT_ADC_A1 = "Internal ADC A1";
7871+
public static readonly String GEN_INT_ADC_A2 = "Internal ADC A2";
7872+
public static readonly String GEN_INT_ADC_A3 = "Internal ADC A3";
7873+
public static readonly String GEN_INT_ADC_A4 = "Internal ADC A4";
7874+
78647875
//3R end
78657876
}
78667877
}

0 commit comments

Comments
 (0)