mirror of
https://github.com/utkumaden/esp-idf-bmx280
synced 2025-05-04 17:24:48 +02:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
93e47861b3 | ||
|
1e18e7a815 | ||
|
91c142fd5d |
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.1)
|
cmake_minimum_required(VERSION 3.17)
|
||||||
set(CMAKE_C_STANDARD 11)
|
set(CMAKE_C_STANDARD 11)
|
||||||
idf_component_register(
|
idf_component_register(
|
||||||
SRCS bmx280.c
|
SRCS bmx280.c
|
||||||
|
4
bmx280.c
4
bmx280.c
@ -634,7 +634,7 @@ esp_err_t bmx280_readout(bmx280_t *bmx280, int32_t *temperature, uint32_t *press
|
|||||||
return error;
|
return error;
|
||||||
|
|
||||||
*temperature = BME280_compensate_T_int32(bmx280,
|
*temperature = BME280_compensate_T_int32(bmx280,
|
||||||
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[0] >> 4)
|
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[2] >> 4)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -644,7 +644,7 @@ esp_err_t bmx280_readout(bmx280_t *bmx280, int32_t *temperature, uint32_t *press
|
|||||||
return error;
|
return error;
|
||||||
|
|
||||||
*pressure = BME280_compensate_P_int64(bmx280,
|
*pressure = BME280_compensate_P_int64(bmx280,
|
||||||
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[0] >> 4)
|
(buffer[0] << 12) | (buffer[1] << 4) | (buffer[2] >> 4)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +57,6 @@ typedef enum bmx280_tstby_t {
|
|||||||
|
|
||||||
typedef enum bmx280_iirf_t {
|
typedef enum bmx280_iirf_t {
|
||||||
BMX280_IIR_NONE = 0x0,
|
BMX280_IIR_NONE = 0x0,
|
||||||
BMX280_IIR_X1,
|
|
||||||
BMX280_IIR_X2,
|
BMX280_IIR_X2,
|
||||||
BMX280_IIR_X4,
|
BMX280_IIR_X4,
|
||||||
BMX280_IIR_X8,
|
BMX280_IIR_X8,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user