Compare commits

..

No commits in common. "master" and "v1.2" have entirely different histories.
master ... v1.2

3 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.1)
set(CMAKE_C_STANDARD 11)
idf_component_register(
SRCS bmx280.c

View File

@ -634,7 +634,7 @@ esp_err_t bmx280_readout(bmx280_t *bmx280, int32_t *temperature, uint32_t *press
return error;
*temperature = BME280_compensate_T_int32(bmx280,
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[2] >> 4)
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[0] >> 4)
);
}
@ -644,7 +644,7 @@ esp_err_t bmx280_readout(bmx280_t *bmx280, int32_t *temperature, uint32_t *press
return error;
*pressure = BME280_compensate_P_int64(bmx280,
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[2] >> 4)
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[0] >> 4)
);
}

View File

@ -57,6 +57,7 @@ typedef enum bmx280_tstby_t {
typedef enum bmx280_iirf_t {
BMX280_IIR_NONE = 0x0,
BMX280_IIR_X1,
BMX280_IIR_X2,
BMX280_IIR_X4,
BMX280_IIR_X8,