Skip to content

Commit e08fa34

Browse files
jyong15jyong15
authored
Merge pull request #245 from ShimmerEngineering/DEV-497
DEV-497
2 parents cb495c1 + c44e907 commit e08fa34

1 file changed

Lines changed: 108 additions & 109 deletions

File tree

‎ShimmerDriver/src/main/java/com/shimmerresearch/sensors/bmpX80/CalibDetailsBmp390.java‎

Lines changed: 108 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -25,56 +25,55 @@ public class Bmp3Constants {
2525
public static final byte BMP3_W_MAX_PRES = 6;
2626
}
2727

28-
private static final class Bmp3QuantizedCalibData {
29-
public static double ParT1;
30-
public static double ParT2;
31-
public static double ParT3;
32-
public static double ParP1;
33-
public static double ParP2;
34-
public static double ParP3;
35-
public static double ParP4;
36-
public static double ParP5;
37-
public static double ParP6;
38-
public static double ParP7;
39-
public static double ParP8;
40-
public static double ParP9;
41-
public static double ParP10;
42-
public static double ParP11;
43-
public static double TLin;
44-
}
4528

46-
private static final class Bmp3RegCalibData {
47-
// Trim Variables
48-
public static short ParT1;
49-
public static short ParT2;
50-
public static byte ParT3;
51-
public static short ParP1;
52-
public static short ParP2;
53-
public static byte ParP3;
54-
public static byte ParP4;
55-
public static int ParP5;
56-
public static int ParP6;
57-
public static byte ParP7;
58-
public static byte ParP8;
59-
public static short ParP9;
60-
public static byte ParP10;
61-
public static byte ParP11;
62-
}
29+
public double Bmp3QuantizedCalibData_ParT1;
30+
public double Bmp3QuantizedCalibData_ParT2;
31+
public double Bmp3QuantizedCalibData_ParT3;
32+
public double Bmp3QuantizedCalibData_ParP1;
33+
public double Bmp3QuantizedCalibData_ParP2;
34+
public double Bmp3QuantizedCalibData_ParP3;
35+
public double Bmp3QuantizedCalibData_ParP4;
36+
public double Bmp3QuantizedCalibData_ParP5;
37+
public double Bmp3QuantizedCalibData_ParP6;
38+
public double Bmp3QuantizedCalibData_ParP7;
39+
public double Bmp3QuantizedCalibData_ParP8;
40+
public double Bmp3QuantizedCalibData_ParP9;
41+
public double Bmp3QuantizedCalibData_ParP10;
42+
public double Bmp3QuantizedCalibData_ParP11;
43+
public double Bmp3QuantizedCalibData_TLin;
44+
45+
46+
// Trim Variables
47+
public short Bmp3RegCalibData_ParT1;
48+
public short Bmp3RegCalibData_ParT2;
49+
public byte Bmp3RegCalibData_ParT3;
50+
public short Bmp3RegCalibData_ParP1;
51+
public short Bmp3RegCalibData_ParP2;
52+
public byte Bmp3RegCalibData_ParP3;
53+
public byte Bmp3RegCalibData_ParP4;
54+
public int Bmp3RegCalibData_ParP5;
55+
public int Bmp3RegCalibData_ParP6;
56+
public byte Bmp3RegCalibData_ParP7;
57+
public byte Bmp3RegCalibData_ParP8;
58+
public short Bmp3RegCalibData_ParP9;
59+
public byte Bmp3RegCalibData_ParP10;
60+
public byte Bmp3RegCalibData_ParP11;
6361

64-
public double par_T1 = Bmp3QuantizedCalibData.ParT1;
65-
public double par_T2 = Bmp3QuantizedCalibData.ParT2;
66-
public double par_T3 = Bmp3QuantizedCalibData.ParT3;
67-
public double par_P1 = Bmp3QuantizedCalibData.ParP1;
68-
public double par_P2 = Bmp3QuantizedCalibData.ParP2;
69-
public double par_P3 = Bmp3QuantizedCalibData.ParP3;
70-
public double par_P4 = Bmp3QuantizedCalibData.ParP4;
71-
public double par_P5 = Bmp3QuantizedCalibData.ParP5;
72-
public double par_P6 = Bmp3QuantizedCalibData.ParP6;
73-
public double par_P7 = Bmp3QuantizedCalibData.ParP7;
74-
public double par_P8 = Bmp3QuantizedCalibData.ParP8;
75-
public double par_P9 =Bmp3QuantizedCalibData.ParP9;
76-
public double par_P10 = Bmp3QuantizedCalibData.ParP10;
77-
public double par_P11 = Bmp3QuantizedCalibData.ParP11;
62+
63+
public double par_T1 ;
64+
public double par_T2 ;
65+
public double par_T3 ;
66+
public double par_P1 ;
67+
public double par_P2 ;
68+
public double par_P3 ;
69+
public double par_P4 ;
70+
public double par_P5 ;
71+
public double par_P6 ;
72+
public double par_P7 ;
73+
public double par_P8 ;
74+
public double par_P9 ;
75+
public double par_P10;
76+
public double par_P11;
7877

7978
public void setPressureCalib(
8079
double T1, double T2, double T3,
@@ -106,18 +105,18 @@ public double[] calibratePressureSensorData(double UP, double UT) {
106105
double partialDataT1;
107106
double partialDataT2;
108107

109-
partialDataT1 = uncompTemp - Bmp3QuantizedCalibData.ParT1;
110-
partialDataT2 = partialDataT1 * Bmp3QuantizedCalibData.ParT2;
108+
partialDataT1 = uncompTemp - Bmp3QuantizedCalibData_ParT1;
109+
partialDataT2 = partialDataT1 * Bmp3QuantizedCalibData_ParT2;
111110

112-
Bmp3QuantizedCalibData.TLin = partialDataT2 + (partialDataT1 * partialDataT1) * Bmp3QuantizedCalibData.ParT3;
111+
Bmp3QuantizedCalibData_TLin = partialDataT2 + (partialDataT1 * partialDataT1) * Bmp3QuantizedCalibData_ParT3;
113112

114-
if (Bmp3QuantizedCalibData.TLin < Bmp3Constants.BMP3_MIN_TEMP_DOUBLE) {
115-
Bmp3QuantizedCalibData.TLin = Bmp3Constants.BMP3_MIN_TEMP_DOUBLE;
113+
if (Bmp3QuantizedCalibData_TLin < Bmp3Constants.BMP3_MIN_TEMP_DOUBLE) {
114+
Bmp3QuantizedCalibData_TLin = Bmp3Constants.BMP3_MIN_TEMP_DOUBLE;
116115
rslt = Bmp3Constants.BMP3_W_MIN_TEMP;
117116
}
118117

119-
if (Bmp3QuantizedCalibData.TLin > Bmp3Constants.BMP3_MAX_TEMP_DOUBLE) {
120-
Bmp3QuantizedCalibData.TLin = Bmp3Constants.BMP3_MAX_TEMP_DOUBLE;
118+
if (Bmp3QuantizedCalibData_TLin > Bmp3Constants.BMP3_MAX_TEMP_DOUBLE) {
119+
Bmp3QuantizedCalibData_TLin = Bmp3Constants.BMP3_MAX_TEMP_DOUBLE;
121120
rslt = Bmp3Constants.BMP3_W_MAX_TEMP;
122121
}
123122

@@ -135,20 +134,20 @@ public double[] calibratePressureSensorData(double UP, double UT) {
135134
double partialOut1;
136135
double partialOut2;
137136

138-
partialData1 = Bmp3QuantizedCalibData.ParP6 * Bmp3QuantizedCalibData.TLin;
139-
partialData2 = Bmp3QuantizedCalibData.ParP7 * powBmp3(Bmp3QuantizedCalibData.TLin, 2);
140-
partialData3 = Bmp3QuantizedCalibData.ParP8 * powBmp3(Bmp3QuantizedCalibData.TLin, 3);
141-
partialOut1 = Bmp3QuantizedCalibData.ParP5 + partialData1 + partialData2 + partialData3;
137+
partialData1 = Bmp3QuantizedCalibData_ParP6 * Bmp3QuantizedCalibData_TLin;
138+
partialData2 = Bmp3QuantizedCalibData_ParP7 * powBmp3(Bmp3QuantizedCalibData_TLin, 2);
139+
partialData3 = Bmp3QuantizedCalibData_ParP8 * powBmp3(Bmp3QuantizedCalibData_TLin, 3);
140+
partialOut1 = Bmp3QuantizedCalibData_ParP5 + partialData1 + partialData2 + partialData3;
142141

143-
partialData1 = Bmp3QuantizedCalibData.ParP2 * Bmp3QuantizedCalibData.TLin;
144-
partialData2 = Bmp3QuantizedCalibData.ParP3 * powBmp3(Bmp3QuantizedCalibData.TLin, 2);
145-
partialData3 = Bmp3QuantizedCalibData.ParP4 * powBmp3(Bmp3QuantizedCalibData.TLin, 3);
146-
partialOut2 = UP * (Bmp3QuantizedCalibData.ParP1 + partialData1 + partialData2 + partialData3);
142+
partialData1 = Bmp3QuantizedCalibData_ParP2 * Bmp3QuantizedCalibData_TLin;
143+
partialData2 = Bmp3QuantizedCalibData_ParP3 * powBmp3(Bmp3QuantizedCalibData_TLin, 2);
144+
partialData3 = Bmp3QuantizedCalibData_ParP4 * powBmp3(Bmp3QuantizedCalibData_TLin, 3);
145+
partialOut2 = UP * (Bmp3QuantizedCalibData_ParP1 + partialData1 + partialData2 + partialData3);
147146

148147
partialData1 = powBmp3(UP, 2);
149-
partialData2 = Bmp3QuantizedCalibData.ParP9 + Bmp3QuantizedCalibData.ParP10 * Bmp3QuantizedCalibData.TLin;
148+
partialData2 = Bmp3QuantizedCalibData_ParP9 + Bmp3QuantizedCalibData_ParP10 * Bmp3QuantizedCalibData_TLin;
150149
partialData3 = partialData1 * partialData2;
151-
partialData4 = partialData3 + powBmp3(UP, 3) * Bmp3QuantizedCalibData.ParP11;
150+
partialData4 = partialData3 + powBmp3(UP, 3) * Bmp3QuantizedCalibData_ParP11;
152151
compPress = partialOut1 + partialOut2 + partialData4;
153152

154153
if (compPress < Bmp3Constants.BMP3_MIN_PRES_DOUBLE) {
@@ -163,7 +162,7 @@ public double[] calibratePressureSensorData(double UP, double UT) {
163162

164163
double[] caldata = new double[2];
165164
caldata[0]=compPress;
166-
caldata[1]=Bmp3QuantizedCalibData.TLin;
165+
caldata[1]=Bmp3QuantizedCalibData_TLin;
167166
return caldata;
168167
}
169168

@@ -194,77 +193,77 @@ public void parseCalParamByteArray(byte[] bufferCalibrationParameters, CALIB_REA
194193

195194
// 1 / 2^8
196195
tempVar = 0.00390625;
197-
Bmp3RegCalibData.ParT1 = (short) concatenateBytes(pressureResoResTest[1], pressureResoResTest[0]);
198-
Bmp3QuantizedCalibData.ParT1 = ((double) Bmp3RegCalibData.ParT1 / tempVar);
196+
Bmp3RegCalibData_ParT1 = (short) concatenateBytes(pressureResoResTest[1], pressureResoResTest[0]);
197+
Bmp3QuantizedCalibData_ParT1 = ((double) Bmp3RegCalibData_ParT1 / tempVar);
199198

200-
Bmp3RegCalibData.ParT2 = (short) concatenateBytes(pressureResoResTest[3], pressureResoResTest[2]);
199+
Bmp3RegCalibData_ParT2 = (short) concatenateBytes(pressureResoResTest[3], pressureResoResTest[2]);
201200
tempVar = 1073741824.0;
202-
Bmp3QuantizedCalibData.ParT2 = ((double) Bmp3RegCalibData.ParT2 / tempVar);
201+
Bmp3QuantizedCalibData_ParT2 = ((double) Bmp3RegCalibData_ParT2 / tempVar);
203202

204-
Bmp3RegCalibData.ParT3 = (byte) pressureResoResTest[4];
203+
Bmp3RegCalibData_ParT3 = (byte) pressureResoResTest[4];
205204
tempVar = 281474976710656.0;
206-
Bmp3QuantizedCalibData.ParT3 = ((double) Bmp3RegCalibData.ParT3 / tempVar);
205+
Bmp3QuantizedCalibData_ParT3 = ((double) Bmp3RegCalibData_ParT3 / tempVar);
207206

208-
Bmp3RegCalibData.ParP1 = (short) concatenateBytes(pressureResoResTest[6], pressureResoResTest[5]);
207+
Bmp3RegCalibData_ParP1 = (short) concatenateBytes(pressureResoResTest[6], pressureResoResTest[5]);
209208
tempVar = 1048576.0;
210-
Bmp3QuantizedCalibData.ParP1 = ((double) (Bmp3RegCalibData.ParP1 - 16384) / tempVar);
209+
Bmp3QuantizedCalibData_ParP1 = ((double) (Bmp3RegCalibData_ParP1 - 16384) / tempVar);
211210

212-
Bmp3RegCalibData.ParP2 = (short) concatenateBytes(pressureResoResTest[8], pressureResoResTest[7]);
211+
Bmp3RegCalibData_ParP2 = (short) concatenateBytes(pressureResoResTest[8], pressureResoResTest[7]);
213212
tempVar = 536870912.0;
214-
Bmp3QuantizedCalibData.ParP2 = ((double) (Bmp3RegCalibData.ParP2 - 16384) / tempVar);
213+
Bmp3QuantizedCalibData_ParP2 = ((double) (Bmp3RegCalibData_ParP2 - 16384) / tempVar);
215214

216-
Bmp3RegCalibData.ParP3 = (byte) pressureResoResTest[9];
215+
Bmp3RegCalibData_ParP3 = (byte) pressureResoResTest[9];
217216
tempVar = 4294967296.0;
218-
Bmp3QuantizedCalibData.ParP3 = ((double) Bmp3RegCalibData.ParP3 / tempVar);
217+
Bmp3QuantizedCalibData_ParP3 = ((double) Bmp3RegCalibData_ParP3 / tempVar);
219218

220-
Bmp3RegCalibData.ParP4 = (byte) pressureResoResTest[10];
219+
Bmp3RegCalibData_ParP4 = (byte) pressureResoResTest[10];
221220
tempVar = 137438953472.0;
222-
Bmp3QuantizedCalibData.ParP4 = ((double) Bmp3RegCalibData.ParP4 / tempVar);
221+
Bmp3QuantizedCalibData_ParP4 = ((double) Bmp3RegCalibData_ParP4 / tempVar);
223222

224-
Bmp3RegCalibData.ParP5 = concatenateBytes(pressureResoResTest[12], pressureResoResTest[11]);
223+
Bmp3RegCalibData_ParP5 = concatenateBytes(pressureResoResTest[12], pressureResoResTest[11]);
225224

226225
// 1 / 2^3
227226
tempVar = 0.125;
228-
Bmp3QuantizedCalibData.ParP5 = ((double) Bmp3RegCalibData.ParP5 / tempVar);
227+
Bmp3QuantizedCalibData_ParP5 = ((double) Bmp3RegCalibData_ParP5 / tempVar);
229228

230-
Bmp3RegCalibData.ParP6 = concatenateBytes(pressureResoResTest[14], pressureResoResTest[13]);
229+
Bmp3RegCalibData_ParP6 = concatenateBytes(pressureResoResTest[14], pressureResoResTest[13]);
231230
tempVar = 64.0;
232-
Bmp3QuantizedCalibData.ParP6 = ((double) Bmp3RegCalibData.ParP6 / tempVar);
231+
Bmp3QuantizedCalibData_ParP6 = ((double) Bmp3RegCalibData_ParP6 / tempVar);
233232

234-
Bmp3RegCalibData.ParP7 = (byte) pressureResoResTest[15];
233+
Bmp3RegCalibData_ParP7 = (byte) pressureResoResTest[15];
235234
tempVar = 256.0;
236-
Bmp3QuantizedCalibData.ParP7 = ((double) Bmp3RegCalibData.ParP7 / tempVar);
235+
Bmp3QuantizedCalibData_ParP7 = ((double) Bmp3RegCalibData_ParP7 / tempVar);
237236

238-
Bmp3RegCalibData.ParP8 = (byte) pressureResoResTest[16];
237+
Bmp3RegCalibData_ParP8 = (byte) pressureResoResTest[16];
239238
tempVar = 32768.0;
240-
Bmp3QuantizedCalibData.ParP8 = ((double) Bmp3RegCalibData.ParP8 / tempVar);
239+
Bmp3QuantizedCalibData_ParP8 = ((double) Bmp3RegCalibData_ParP8 / tempVar);
241240

242-
Bmp3RegCalibData.ParP9 = (short) concatenateBytes(pressureResoResTest[18], pressureResoResTest[17]);
241+
Bmp3RegCalibData_ParP9 = (short) concatenateBytes(pressureResoResTest[18], pressureResoResTest[17]);
243242
tempVar = 281474976710656.0;
244-
Bmp3QuantizedCalibData.ParP9 = ((double) Bmp3RegCalibData.ParP9 / tempVar);
243+
Bmp3QuantizedCalibData_ParP9 = ((double) Bmp3RegCalibData_ParP9 / tempVar);
245244

246-
Bmp3RegCalibData.ParP10 = (byte) pressureResoResTest[19];
245+
Bmp3RegCalibData_ParP10 = (byte) pressureResoResTest[19];
247246
tempVar = 281474976710656.0;
248-
Bmp3QuantizedCalibData.ParP10 = ((double) Bmp3RegCalibData.ParP10 / tempVar);
247+
Bmp3QuantizedCalibData_ParP10 = ((double) Bmp3RegCalibData_ParP10 / tempVar);
249248

250-
Bmp3RegCalibData.ParP11 = (byte) pressureResoResTest[20];
249+
Bmp3RegCalibData_ParP11 = (byte) pressureResoResTest[20];
251250
tempVar = 36893488147419103232.0;
252-
Bmp3QuantizedCalibData.ParP11 = ((double) Bmp3RegCalibData.ParP11 / tempVar);
253-
254-
System.out.println("par_T1 = " + Bmp3QuantizedCalibData.ParT1);
255-
System.out.println("par_T2 = " + Bmp3QuantizedCalibData.ParT2);
256-
System.out.println("par_T3 = " + Bmp3QuantizedCalibData.ParT3);
257-
System.out.println("par_P1 = " + Bmp3QuantizedCalibData.ParP1);
258-
System.out.println("par_P2 = " + Bmp3QuantizedCalibData.ParP2);
259-
System.out.println("par_P3 = " + Bmp3QuantizedCalibData.ParP3);
260-
System.out.println("par_P4 = " + Bmp3QuantizedCalibData.ParP4);
261-
System.out.println("par_P5 = " + Bmp3QuantizedCalibData.ParP5);
262-
System.out.println("par_P6 = " + Bmp3QuantizedCalibData.ParP6);
263-
System.out.println("par_P7 = " + Bmp3QuantizedCalibData.ParP7);
264-
System.out.println("par_P8 = " + Bmp3QuantizedCalibData.ParP8);
265-
System.out.println("par_P9 = " + Bmp3QuantizedCalibData.ParP9);
266-
System.out.println("par_P10 = " + Bmp3QuantizedCalibData.ParP10);
267-
System.out.println("par_P11 = " + Bmp3QuantizedCalibData.ParP11);
251+
Bmp3QuantizedCalibData_ParP11 = ((double) Bmp3RegCalibData_ParP11 / tempVar);
252+
253+
System.out.println("par_T1 = " + Bmp3QuantizedCalibData_ParT1);
254+
System.out.println("par_T2 = " + Bmp3QuantizedCalibData_ParT2);
255+
System.out.println("par_T3 = " + Bmp3QuantizedCalibData_ParT3);
256+
System.out.println("par_P1 = " + Bmp3QuantizedCalibData_ParP1);
257+
System.out.println("par_P2 = " + Bmp3QuantizedCalibData_ParP2);
258+
System.out.println("par_P3 = " + Bmp3QuantizedCalibData_ParP3);
259+
System.out.println("par_P4 = " + Bmp3QuantizedCalibData_ParP4);
260+
System.out.println("par_P5 = " + Bmp3QuantizedCalibData_ParP5);
261+
System.out.println("par_P6 = " + Bmp3QuantizedCalibData_ParP6);
262+
System.out.println("par_P7 = " + Bmp3QuantizedCalibData_ParP7);
263+
System.out.println("par_P8 = " + Bmp3QuantizedCalibData_ParP8);
264+
System.out.println("par_P9 = " + Bmp3QuantizedCalibData_ParP9);
265+
System.out.println("par_P10 = " + Bmp3QuantizedCalibData_ParP10);
266+
System.out.println("par_P11 = " + Bmp3QuantizedCalibData_ParP11);
268267
}
269268
}
270269

0 commit comments

Comments
 (0)