Compare commits

..

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

4 changed files with 10 additions and 15 deletions

View File

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

View File

@ -338,6 +338,12 @@ static esp_err_t bmx280_probe(bmx280_t *bmx280)
#endif #endif
} }
static esp_err_t bmx280_reset(bmx280_t *bmx280)
{
const static uint8_t din[] = { BMX280_RESET_VEC };
return bmx280_write(bmx280, BMX280_REG_RESET, din, sizeof din);
}
static esp_err_t bmx280_calibrate(bmx280_t *bmx280) static esp_err_t bmx280_calibrate(bmx280_t *bmx280)
{ {
// Honestly, the best course of action is to read the high and low banks // Honestly, the best course of action is to read the high and low banks
@ -442,12 +448,6 @@ bmx280_t* bmx280_create_master(i2c_master_bus_handle_t bus_handle)
} }
#endif #endif
esp_err_t bmx280_reset(bmx280_t *bmx280)
{
const static uint8_t din[] = { BMX280_RESET_VEC };
return bmx280_write(bmx280, BMX280_REG_RESET, din, sizeof din);
}
void bmx280_close(bmx280_t *bmx280) void bmx280_close(bmx280_t *bmx280)
{ {
#if CONFIG_USE_I2C_MASTER_DRIVER #if CONFIG_USE_I2C_MASTER_DRIVER
@ -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[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; return error;
*pressure = BME280_compensate_P_int64(bmx280, *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,12 +57,6 @@ BMXAPI bmx280_t* bmx280_create_legacy(i2c_port_t port);
#define bmx280_create_master(port) static_assert(0, "You have the wrong driver configuration for using the new I2C master driver.") #define bmx280_create_master(port) static_assert(0, "You have the wrong driver configuration for using the new I2C master driver.")
#endif #endif
/**
* Restart the sensor, effectively puting it into sleep mode.
* @param bmx280 The instance to reset.
*/
esp_err_t bmx280_reset(bmx280_t *bmx280);
/** /**
* Destroy your the instance. * Destroy your the instance.
* @param bmx280 The instance to destroy. * @param bmx280 The instance to destroy.

View File

@ -57,6 +57,7 @@ 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,