Skip to content

Commit 424ce19

Browse files
committed
fix incorrect pressure temperature cal values
1 parent c6ca1b8 commit 424ce19

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ShimmerAPI/ShimmerAPI/LiteProtocolInstructionSet.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ public enum InstructionsGet {
374374
[pbr::OriginalName("GET_VBATT_COMMAND")] GetVbattCommand = 149,
375375
[pbr::OriginalName("GET_CALIB_DUMP_COMMAND")] GetCalibDumpCommand = 154,
376376
[pbr::OriginalName("GET_I2C_BATT_STATUS_COMMAND_VALUE")] GetI2CBattStatusCommandValue = 158,
377-
[pbr::OriginalName("GET_BMP280_CALIBRATION_COEFFICIENTS_COMMAND")] GetBmp280CalibrationCoefficientsCommand = 159,
378377
}
379378

380379
public enum InstructionsResponse {
@@ -435,7 +434,6 @@ public enum InstructionsResponse {
435434
[pbr::OriginalName("VBATT_RESPONSE")] VbattResponse = 148,
436435
[pbr::OriginalName("RSP_CALIB_DUMP_COMMAND")] RspCalibDumpCommand = 153,
437436
[pbr::OriginalName("RSP_I2C_BATT_STATUS_COMMAND_VALUE")] RspI2CBattStatusCommandValue = 157,
438-
[pbr::OriginalName("BMP280_CALIBRATION_COEFFICIENTS_RESPONSE")] Bmp280CalibrationCoefficientsResponse = 160,
439437
}
440438

441439
}

ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,8 @@ public enum PacketTypeShimmer3 : byte
503503
GET_BMP180_PRES_RESOLUTION_COMMAND = 0x54,
504504
BMP180_CALIBRATION_COEFFICIENTS_RESPONSE = 0x58,
505505
GET_BMP180_CALIBRATION_COEFFICIENTS_COMMAND = 0x59,
506+
BMP280_CALIBRATION_COEFFICIENTS_RESPONSE = 0x9F,
507+
GET_BMP280_CALIBRATION_COEFFICIENTS_COMMAND = 0xA0,
506508
SET_INTERNAL_EXP_POWER_ENABLE_COMMAND = 0x5E,
507509
INTERNAL_EXP_POWER_ENABLE_RESPONSE = 0x5F,
508510
GET_INTERNAL_EXP_POWER_ENABLE_COMMAND = 0x60,
@@ -1639,7 +1641,7 @@ public void ReadData()
16391641
}
16401642
CalculateBMP180PressureCalibrationCoefficientsResponse(bufferbyte);
16411643
break;
1642-
case (byte)InstructionsResponse.Bmp280CalibrationCoefficientsResponse:
1644+
case (byte)PacketTypeShimmer3.BMP280_CALIBRATION_COEFFICIENTS_RESPONSE:
16431645
bufferbyte = new byte[24];
16441646
for (int p = 0; p < 24; p++)
16451647
{
@@ -6068,7 +6070,7 @@ public void ReadPressureCalibrationCoefficients()
60686070
}
60696071
else if (isShimmer3withUpdatedSensors())
60706072
{
6071-
WriteBytes(new byte[1] { (byte)InstructionsGet.GetBmp280CalibrationCoefficientsCommand }, 0, 1);
6073+
WriteBytes(new byte[1] { (byte)PacketTypeShimmer3.GET_BMP280_CALIBRATION_COEFFICIENTS_COMMAND }, 0, 1);
60726074
System.Threading.Thread.Sleep(800);
60736075
}
60746076
else

ShimmerAPI/ShimmerAPI/Simulators/ShimmerLogAndStreamS3Simulator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ protected override void WriteBytes(byte[] buffer, int index, int length)
181181
mBuffer.Add((byte)0x9B);
182182
}
183183
}
184-
else if (buffer[0] == (byte)InstructionsGet.GetBmp280CalibrationCoefficientsCommand)
184+
else if (buffer[0] == (byte)PacketTypeShimmer3.GET_BMP280_CALIBRATION_COEFFICIENTS_COMMAND)
185185
{
186186
mBuffer.Add((byte)0xff);
187187
mBuffer.Add((byte)0x9f);

0 commit comments

Comments
 (0)