Skip to content

Commit 5efde5f

Browse files
jyong15jyong15
authored
Merge pull request #195 from ShimmerEngineering/DEV-501
DEV-501 Pressure sensor fix
2 parents 7a6edf1 + 2318574 commit 5efde5f

File tree

2 files changed

+121
-132
lines changed

2 files changed

+121
-132
lines changed

‎ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs‎

Lines changed: 103 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,44 @@ public enum ExpansionBoardDetectShimmer3
804804
public byte[] Exg1RegArray = new byte[10];
805805
public byte[] Exg2RegArray = new byte[10];
806806

807+
// Quantized Trim Variables
808+
public double Bmp3QuantizedCalibData_ParT1;
809+
public double Bmp3QuantizedCalibData_ParT2;
810+
public double Bmp3QuantizedCalibData_ParT3;
811+
public double Bmp3QuantizedCalibData_ParP1;
812+
public double Bmp3QuantizedCalibData_ParP2;
813+
public double Bmp3QuantizedCalibData_ParP3;
814+
public double Bmp3QuantizedCalibData_ParP4;
815+
public double Bmp3QuantizedCalibData_ParP5;
816+
public double Bmp3QuantizedCalibData_ParP6;
817+
public double Bmp3QuantizedCalibData_ParP7;
818+
public double Bmp3QuantizedCalibData_ParP8;
819+
public double Bmp3QuantizedCalibData_ParP9;
820+
public double Bmp3QuantizedCalibData_ParP10;
821+
public double Bmp3QuantizedCalibData_ParP11;
822+
public double Bmp3QuantizedCalibData_TLin;
823+
824+
825+
826+
// Trim Variables
827+
public ushort Bmp3RegCalibData_ParT1;
828+
public ushort Bmp3RegCalibData_ParT2;
829+
public sbyte Bmp3RegCalibData_ParT3;
830+
public short Bmp3RegCalibData_ParP1;
831+
public short Bmp3RegCalibData_ParP2;
832+
public sbyte Bmp3RegCalibData_ParP3;
833+
public sbyte Bmp3RegCalibData_ParP4;
834+
public ushort Bmp3RegCalibData_ParP5;
835+
public ushort Bmp3RegCalibData_ParP6;
836+
public sbyte Bmp3RegCalibData_ParP7;
837+
public sbyte Bmp3RegCalibData_ParP8;
838+
public short Bmp3RegCalibData_ParP9;
839+
public sbyte Bmp3RegCalibData_ParP10;
840+
public sbyte Bmp3RegCalibData_ParP11;
841+
public long Bmp3RegCalibData_TLin;
842+
843+
844+
807845
public ShimmerBluetooth()
808846
{
809847
}
@@ -1938,77 +1976,77 @@ public void CalculateBMP390PressureCalibrationCoefficientsResponse(byte[] buffer
19381976

19391977
// 1 / 2^8
19401978
tempVar = 0.00390625;
1941-
Bmp3RegCalibData.ParT1 = ConcatenateBytes(pressureResoResTest[1], pressureResoResTest[0]);
1942-
Bmp3QuantizedCalibData.ParT1 = ((double)Bmp3RegCalibData.ParT1 / tempVar);
1979+
Bmp3RegCalibData_ParT1 = ConcatenateBytes(pressureResoResTest[1], pressureResoResTest[0]);
1980+
Bmp3QuantizedCalibData_ParT1 = ((double)Bmp3RegCalibData_ParT1 / tempVar);
19431981

1944-
Bmp3RegCalibData.ParT2 = ConcatenateBytes(pressureResoResTest[3], pressureResoResTest[2]);
1982+
Bmp3RegCalibData_ParT2 = ConcatenateBytes(pressureResoResTest[3], pressureResoResTest[2]);
19451983
tempVar = 1073741824.0;
1946-
Bmp3QuantizedCalibData.ParT2 = ((double)Bmp3RegCalibData.ParT2 / tempVar);
1984+
Bmp3QuantizedCalibData_ParT2 = ((double)Bmp3RegCalibData_ParT2 / tempVar);
19471985

1948-
Bmp3RegCalibData.ParT3 = (sbyte)pressureResoResTest[4];
1986+
Bmp3RegCalibData_ParT3 = (sbyte)pressureResoResTest[4];
19491987
tempVar = 281474976710656.0;
1950-
Bmp3QuantizedCalibData.ParT3 = ((double)Bmp3RegCalibData.ParT3 / tempVar);
1988+
Bmp3QuantizedCalibData_ParT3 = ((double)Bmp3RegCalibData_ParT3 / tempVar);
19511989

1952-
Bmp3RegCalibData.ParP1 = (short)ConcatenateBytes(pressureResoResTest[6], pressureResoResTest[5]);
1990+
Bmp3RegCalibData_ParP1 = (short)ConcatenateBytes(pressureResoResTest[6], pressureResoResTest[5]);
19531991
tempVar = 1048576.0;
1954-
Bmp3QuantizedCalibData.ParP1 = ((double)(Bmp3RegCalibData.ParP1 - 16384) / tempVar);
1992+
Bmp3QuantizedCalibData_ParP1 = ((double)(Bmp3RegCalibData_ParP1 - 16384) / tempVar);
19551993

1956-
Bmp3RegCalibData.ParP2 = (short)ConcatenateBytes(pressureResoResTest[8], pressureResoResTest[7]);
1994+
Bmp3RegCalibData_ParP2 = (short)ConcatenateBytes(pressureResoResTest[8], pressureResoResTest[7]);
19571995
tempVar = 536870912.0;
1958-
Bmp3QuantizedCalibData.ParP2 = ((double)(Bmp3RegCalibData.ParP2 - 16384) / tempVar);
1996+
Bmp3QuantizedCalibData_ParP2 = ((double)(Bmp3RegCalibData_ParP2 - 16384) / tempVar);
19591997

1960-
Bmp3RegCalibData.ParP3 = (sbyte)pressureResoResTest[9];
1998+
Bmp3RegCalibData_ParP3 = (sbyte)pressureResoResTest[9];
19611999
tempVar = 4294967296.0;
1962-
Bmp3QuantizedCalibData.ParP3 = ((double)Bmp3RegCalibData.ParP3 / tempVar);
2000+
Bmp3QuantizedCalibData_ParP3 = ((double)Bmp3RegCalibData_ParP3 / tempVar);
19632001

1964-
Bmp3RegCalibData.ParP4 = (sbyte)pressureResoResTest[10];
2002+
Bmp3RegCalibData_ParP4 = (sbyte)pressureResoResTest[10];
19652003
tempVar = 137438953472.0;
1966-
Bmp3QuantizedCalibData.ParP4 = ((double)Bmp3RegCalibData.ParP4 / tempVar);
2004+
Bmp3QuantizedCalibData_ParP4 = ((double)Bmp3RegCalibData_ParP4 / tempVar);
19672005

1968-
Bmp3RegCalibData.ParP5 = ConcatenateBytes(pressureResoResTest[12], pressureResoResTest[11]);
2006+
Bmp3RegCalibData_ParP5 = ConcatenateBytes(pressureResoResTest[12], pressureResoResTest[11]);
19692007

19702008
// 1 / 2^3
19712009
tempVar = 0.125;
1972-
Bmp3QuantizedCalibData.ParP5 = ((double)Bmp3RegCalibData.ParP5 / tempVar);
2010+
Bmp3QuantizedCalibData_ParP5 = ((double)Bmp3RegCalibData_ParP5 / tempVar);
19732011

1974-
Bmp3RegCalibData.ParP6 = ConcatenateBytes(pressureResoResTest[14], pressureResoResTest[13]);
2012+
Bmp3RegCalibData_ParP6 = ConcatenateBytes(pressureResoResTest[14], pressureResoResTest[13]);
19752013
tempVar = 64.0;
1976-
Bmp3QuantizedCalibData.ParP6 = ((double)Bmp3RegCalibData.ParP6 / tempVar);
2014+
Bmp3QuantizedCalibData_ParP6 = ((double)Bmp3RegCalibData_ParP6 / tempVar);
19772015

1978-
Bmp3RegCalibData.ParP7 = (sbyte)pressureResoResTest[15];
2016+
Bmp3RegCalibData_ParP7 = (sbyte)pressureResoResTest[15];
19792017
tempVar = 256.0;
1980-
Bmp3QuantizedCalibData.ParP7 = ((double)Bmp3RegCalibData.ParP7 / tempVar);
2018+
Bmp3QuantizedCalibData_ParP7 = ((double)Bmp3RegCalibData_ParP7 / tempVar);
19812019

1982-
Bmp3RegCalibData.ParP8 = (sbyte)pressureResoResTest[16];
2020+
Bmp3RegCalibData_ParP8 = (sbyte)pressureResoResTest[16];
19832021
tempVar = 32768.0;
1984-
Bmp3QuantizedCalibData.ParP8 = ((double)Bmp3RegCalibData.ParP8 / tempVar);
2022+
Bmp3QuantizedCalibData_ParP8 = ((double)Bmp3RegCalibData_ParP8 / tempVar);
19852023

1986-
Bmp3RegCalibData.ParP9 = (short)ConcatenateBytes(pressureResoResTest[18], pressureResoResTest[17]);
2024+
Bmp3RegCalibData_ParP9 = (short)ConcatenateBytes(pressureResoResTest[18], pressureResoResTest[17]);
19872025
tempVar = 281474976710656.0;
1988-
Bmp3QuantizedCalibData.ParP9 = ((double)Bmp3RegCalibData.ParP9 / tempVar);
2026+
Bmp3QuantizedCalibData_ParP9 = ((double)Bmp3RegCalibData_ParP9 / tempVar);
19892027

1990-
Bmp3RegCalibData.ParP10 = (sbyte)pressureResoResTest[19];
2028+
Bmp3RegCalibData_ParP10 = (sbyte)pressureResoResTest[19];
19912029
tempVar = 281474976710656.0;
1992-
Bmp3QuantizedCalibData.ParP10 = ((double)Bmp3RegCalibData.ParP10 / tempVar);
2030+
Bmp3QuantizedCalibData_ParP10 = ((double)Bmp3RegCalibData_ParP10 / tempVar);
19932031

1994-
Bmp3RegCalibData.ParP11 = (sbyte)pressureResoResTest[20];
2032+
Bmp3RegCalibData_ParP11 = (sbyte)pressureResoResTest[20];
19952033
tempVar = 36893488147419103232.0;
1996-
Bmp3QuantizedCalibData.ParP11 = ((double)Bmp3RegCalibData.ParP11 / tempVar);
1997-
1998-
Debug.WriteLine("par_T1 = " + Bmp3QuantizedCalibData.ParT1);
1999-
Debug.WriteLine("par_T2 = " + Bmp3QuantizedCalibData.ParT2);
2000-
Debug.WriteLine("par_T3 = " + Bmp3QuantizedCalibData.ParT3);
2001-
Debug.WriteLine("par_P1 = " + Bmp3QuantizedCalibData.ParP1);
2002-
Debug.WriteLine("par_P2 = " + Bmp3QuantizedCalibData.ParP2);
2003-
Debug.WriteLine("par_P3 = " + Bmp3QuantizedCalibData.ParP3);
2004-
Debug.WriteLine("par_P4 = " + Bmp3QuantizedCalibData.ParP4);
2005-
Debug.WriteLine("par_P5 = " + Bmp3QuantizedCalibData.ParP5);
2006-
Debug.WriteLine("par_P6 = " + Bmp3QuantizedCalibData.ParP6);
2007-
Debug.WriteLine("par_P7 = " + Bmp3QuantizedCalibData.ParP7);
2008-
Debug.WriteLine("par_P8 = " + Bmp3QuantizedCalibData.ParP8);
2009-
Debug.WriteLine("par_P9 = " + Bmp3QuantizedCalibData.ParP9);
2010-
Debug.WriteLine("par_P10 = " + Bmp3QuantizedCalibData.ParP10);
2011-
Debug.WriteLine("par_P11 = " + Bmp3QuantizedCalibData.ParP11);
2034+
Bmp3QuantizedCalibData_ParP11 = ((double)Bmp3RegCalibData_ParP11 / tempVar);
2035+
2036+
Debug.WriteLine("par_T1 = " + Bmp3QuantizedCalibData_ParT1);
2037+
Debug.WriteLine("par_T2 = " + Bmp3QuantizedCalibData_ParT2);
2038+
Debug.WriteLine("par_T3 = " + Bmp3QuantizedCalibData_ParT3);
2039+
Debug.WriteLine("par_P1 = " + Bmp3QuantizedCalibData_ParP1);
2040+
Debug.WriteLine("par_P2 = " + Bmp3QuantizedCalibData_ParP2);
2041+
Debug.WriteLine("par_P3 = " + Bmp3QuantizedCalibData_ParP3);
2042+
Debug.WriteLine("par_P4 = " + Bmp3QuantizedCalibData_ParP4);
2043+
Debug.WriteLine("par_P5 = " + Bmp3QuantizedCalibData_ParP5);
2044+
Debug.WriteLine("par_P6 = " + Bmp3QuantizedCalibData_ParP6);
2045+
Debug.WriteLine("par_P7 = " + Bmp3QuantizedCalibData_ParP7);
2046+
Debug.WriteLine("par_P8 = " + Bmp3QuantizedCalibData_ParP8);
2047+
Debug.WriteLine("par_P9 = " + Bmp3QuantizedCalibData_ParP9);
2048+
Debug.WriteLine("par_P10 = " + Bmp3QuantizedCalibData_ParP10);
2049+
Debug.WriteLine("par_P11 = " + Bmp3QuantizedCalibData_ParP11);
20122050
}
20132051
private static ushort ConcatenateBytes(byte highByte, byte lowByte)
20142052
{
@@ -7336,22 +7374,22 @@ protected double[] CalibratePressure390SensorData(double UP, double UT)
73367374
double partialDataT1;
73377375
double partialDataT2;
73387376

7339-
partialDataT1 = uncompTemp - Bmp3QuantizedCalibData.ParT1;
7340-
partialDataT2 = partialDataT1 * Bmp3QuantizedCalibData.ParT2;
7377+
partialDataT1 = uncompTemp - Bmp3QuantizedCalibData_ParT1;
7378+
partialDataT2 = partialDataT1 * Bmp3QuantizedCalibData_ParT2;
73417379

73427380
// Update the compensated temperature in calib structure since this is needed for pressure calculation
7343-
Bmp3QuantizedCalibData.TLin = partialDataT2 + (partialDataT1 * partialDataT1) *
7344-
Bmp3QuantizedCalibData.ParT3;
7381+
Bmp3QuantizedCalibData_TLin = partialDataT2 + (partialDataT1 * partialDataT1) *
7382+
Bmp3QuantizedCalibData_ParT3;
73457383

73467384
// Returns compensated temperature
7347-
if (Bmp3QuantizedCalibData.TLin < BMP3_MIN_TEMP_DOUBLE)
7385+
if (Bmp3QuantizedCalibData_TLin < BMP3_MIN_TEMP_DOUBLE)
73487386
{
7349-
Bmp3QuantizedCalibData.TLin = BMP3_MIN_TEMP_DOUBLE;
7387+
Bmp3QuantizedCalibData_TLin = BMP3_MIN_TEMP_DOUBLE;
73507388
}
73517389

7352-
if (Bmp3QuantizedCalibData.TLin > BMP3_MAX_TEMP_DOUBLE)
7390+
if (Bmp3QuantizedCalibData_TLin > BMP3_MAX_TEMP_DOUBLE)
73537391
{
7354-
Bmp3QuantizedCalibData.TLin = BMP3_MAX_TEMP_DOUBLE;
7392+
Bmp3QuantizedCalibData_TLin = BMP3_MAX_TEMP_DOUBLE;
73557393
}
73567394

73577395

@@ -7366,21 +7404,21 @@ protected double[] CalibratePressure390SensorData(double UP, double UT)
73667404
double partialOut1;
73677405
double partialOut2;
73687406

7369-
partialData1 = Bmp3QuantizedCalibData.ParP6 * Bmp3QuantizedCalibData.TLin;
7370-
partialData2 = Bmp3QuantizedCalibData.ParP7 * PowBmp3(Bmp3QuantizedCalibData.TLin, 2);
7371-
partialData3 = Bmp3QuantizedCalibData.ParP8 * PowBmp3(Bmp3QuantizedCalibData.TLin, 3);
7372-
partialOut1 = Bmp3QuantizedCalibData.ParP5 + partialData1 + partialData2 + partialData3;
7407+
partialData1 = Bmp3QuantizedCalibData_ParP6 * Bmp3QuantizedCalibData_TLin;
7408+
partialData2 = Bmp3QuantizedCalibData_ParP7 * PowBmp3(Bmp3QuantizedCalibData_TLin, 2);
7409+
partialData3 = Bmp3QuantizedCalibData_ParP8 * PowBmp3(Bmp3QuantizedCalibData_TLin, 3);
7410+
partialOut1 = Bmp3QuantizedCalibData_ParP5 + partialData1 + partialData2 + partialData3;
73737411

7374-
partialData1 = Bmp3QuantizedCalibData.ParP2 * Bmp3QuantizedCalibData.TLin;
7375-
partialData2 = Bmp3QuantizedCalibData.ParP3 * PowBmp3(Bmp3QuantizedCalibData.TLin, 2);
7376-
partialData3 = Bmp3QuantizedCalibData.ParP4 * PowBmp3(Bmp3QuantizedCalibData.TLin, 3);
7412+
partialData1 = Bmp3QuantizedCalibData_ParP2 * Bmp3QuantizedCalibData_TLin;
7413+
partialData2 = Bmp3QuantizedCalibData_ParP3 * PowBmp3(Bmp3QuantizedCalibData_TLin, 2);
7414+
partialData3 = Bmp3QuantizedCalibData_ParP4 * PowBmp3(Bmp3QuantizedCalibData_TLin, 3);
73777415
partialOut2 = UP *
7378-
(Bmp3QuantizedCalibData.ParP1 + partialData1 + partialData2 + partialData3);
7416+
(Bmp3QuantizedCalibData_ParP1 + partialData1 + partialData2 + partialData3);
73797417

73807418
partialData1 = PowBmp3((double)UP, 2);
7381-
partialData2 = Bmp3QuantizedCalibData.ParP9 + Bmp3QuantizedCalibData.ParP10 * Bmp3QuantizedCalibData.TLin;
7419+
partialData2 = Bmp3QuantizedCalibData_ParP9 + Bmp3QuantizedCalibData_ParP10 * Bmp3QuantizedCalibData_TLin;
73827420
partialData3 = partialData1 * partialData2;
7383-
partialData4 = partialData3 + PowBmp3((double)UP, 3) * Bmp3QuantizedCalibData.ParP11;
7421+
partialData4 = partialData3 + PowBmp3((double)UP, 3) * Bmp3QuantizedCalibData_ParP11;
73847422
compPress = partialOut1 + partialOut2 + partialData4;
73857423

73867424
if (compPress < BMP3_MIN_PRES_DOUBLE)
@@ -7395,7 +7433,7 @@ protected double[] CalibratePressure390SensorData(double UP, double UT)
73957433

73967434
double[] caldata = new double[2];
73977435
caldata[0] = compPress;
7398-
caldata[1] = Bmp3QuantizedCalibData.TLin;
7436+
caldata[1] = Bmp3QuantizedCalibData_TLin;
73997437
return caldata;
74007438
}
74017439

@@ -7693,58 +7731,9 @@ public bool CheckCrc(byte[] bufferTemp, int length)
76937731
}
76947732

76957733
}
7696-
// Define the bmp3_quantized_calib_data class
7697-
public class Bmp3QuantizedCalibData
7698-
{
7699-
// Quantized Trim Variables
7700-
public static double ParT1 { get; set; }
7701-
public static double ParT2 { get; set; }
7702-
public static double ParT3 { get; set; }
7703-
public static double ParP1 { get; set; }
7704-
public static double ParP2 { get; set; }
7705-
public static double ParP3 { get; set; }
7706-
public static double ParP4 { get; set; }
7707-
public static double ParP5 { get; set; }
7708-
public static double ParP6 { get; set; }
7709-
public static double ParP7 { get; set; }
7710-
public static double ParP8 { get; set; }
7711-
public static double ParP9 { get; set; }
7712-
public static double ParP10 { get; set; }
7713-
public static double ParP11 { get; set; }
7714-
public static double TLin { get; set; }
7715-
}
7716-
7717-
// Define the bmp3_reg_calib_data class
7718-
public class Bmp3RegCalibData
7719-
{
7720-
// Trim Variables
7721-
public static ushort ParT1 { get; set; }
7722-
public static ushort ParT2 { get; set; }
7723-
public static sbyte ParT3 { get; set; }
7724-
public static short ParP1 { get; set; }
7725-
public static short ParP2 { get; set; }
7726-
public static sbyte ParP3 { get; set; }
7727-
public static sbyte ParP4 { get; set; }
7728-
public static ushort ParP5 { get; set; }
7729-
public static ushort ParP6 { get; set; }
7730-
public static sbyte ParP7 { get; set; }
7731-
public static sbyte ParP8 { get; set; }
7732-
public static short ParP9 { get; set; }
7733-
public static sbyte ParP10 { get; set; }
7734-
public static sbyte ParP11 { get; set; }
7735-
public static long TLin { get; set; }
7736-
}
7737-
7738-
7739-
// Define the bmp3_calib_data class
7740-
public class Bmp3CalibData
7741-
{
7742-
// Quantized calibration data
7743-
public Bmp3QuantizedCalibData QuantizedCalibData { get; set; }
7744-
7745-
// Register calibration data
7746-
public Bmp3RegCalibData RegCalibData { get; set; }
7747-
}
7734+
7735+
7736+
77487737

77497738
// Define the bmp3_data class
77507739
public class Bmp3Data

‎ShimmerAPI/ShimmerUnitTests/ShimmerTest.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -237,22 +237,22 @@ public void TestBMP390_PressureTemperature()
237237

238238
CalculateBMP390PressureCalibrationCoefficientsResponse(pressureResoResTest);
239239

240-
Assert.AreEqual(Bmp3QuantizedCalibData.ParT1, 7071488);
241-
Assert.AreEqual(Bmp3QuantizedCalibData.ParT2, 0.00001786649227142334);
242-
Assert.AreEqual(Bmp3QuantizedCalibData.ParT3, -0.000000000000024868995751603507);
243-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP1, -0.0086259841918945312);
244-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP2, -0.000020215287804603577);
245-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP3, 0.0000000013969838619232178);
246-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP4, 0.0000000000072759576141834259);
247-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP5, 151184);
248-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP6, 380.375);
249-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP7, 0.01171875);
250-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP8, -0.00018310546875);
251-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP9, 0.000000000013848477919964353);
252-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP10, 0.000000000000024868995751603507);
253-
Assert.AreEqual(Bmp3QuantizedCalibData.ParP11, -0.00000000000000000029815559743351372);
254-
255-
Bmp3QuantizedCalibData.TLin = 23.17016986780799;
240+
Assert.AreEqual(Bmp3QuantizedCalibData_ParT1, 7071488);
241+
Assert.AreEqual(Bmp3QuantizedCalibData_ParT2, 0.00001786649227142334);
242+
Assert.AreEqual(Bmp3QuantizedCalibData_ParT3, -0.000000000000024868995751603507);
243+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP1, -0.0086259841918945312);
244+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP2, -0.000020215287804603577);
245+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP3, 0.0000000013969838619232178);
246+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP4, 0.0000000000072759576141834259);
247+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP5, 151184);
248+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP6, 380.375);
249+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP7, 0.01171875);
250+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP8, -0.00018310546875);
251+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP9, 0.000000000013848477919964353);
252+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP10, 0.000000000000024868995751603507);
253+
Assert.AreEqual(Bmp3QuantizedCalibData_ParP11, -0.00000000000000000029815559743351372);
254+
255+
Bmp3QuantizedCalibData_TLin = 23.17016986780799;
256256

257257
//byte[] sensorData = { 0x00, 0x0D, 0x64, 0x00, 0xBA, 0x7F };
258258
byte[] sensorDataP = { 0x00, 0x0D, 0x64};
@@ -266,7 +266,7 @@ public void TestBMP390_PressureTemperature()
266266
Assert.AreEqual(uncalibResultT[0], 8370688);
267267
double[] bmpX80caldata = new double[2];
268268
bmpX80caldata = CalibratePressure390SensorData(uncalibResultP[0], uncalibResultT[0]);
269-
Bmp3QuantizedCalibData.TLin = bmpX80caldata[1];
269+
Bmp3QuantizedCalibData_TLin = bmpX80caldata[1];
270270

271271
//Assert.AreEqual(resultP, 100911.8245324826);
272272
//Assert.AreEqual(resultT, 23.170169867807999);
@@ -281,7 +281,7 @@ public void TestBMP390_PressureTemperature()
281281
long[] uncalibResultT2 = ProgrammerUtilities.ParseData(sensorDataT2, sensorDataType);
282282
double[] bmpX80caldata2 = new double[2];
283283
bmpX80caldata2 = CalibratePressure390SensorData(uncalibResultP2[0], uncalibResultT2[0]);
284-
Bmp3QuantizedCalibData.TLin = bmpX80caldata2[1];
284+
Bmp3QuantizedCalibData_TLin = bmpX80caldata2[1];
285285

286286
//Assert.AreEqual(resultP2, 100912.81758676282);
287287
//Assert.AreEqual(resultT2, 23.26587201654911);

0 commit comments

Comments
 (0)