This commit is contained in:
2024-06-16 11:28:20 +03:00
parent f6bafc6fe3
commit c2aa5f5eeb
3 changed files with 128 additions and 97 deletions

View File

@ -32,25 +32,31 @@ Reading the sensor:
void app_main(void) void app_main(void)
{ {
esp_log_level_set("zh_bh1750", ESP_LOG_NONE); esp_log_level_set("zh_bh1750", ESP_LOG_NONE);
#ifdef CONFIG_IDF_TARGET_ESP8266
i2c_config_t i2c_config = { i2c_config_t i2c_config = {
.mode = I2C_MODE_MASTER, .mode = I2C_MODE_MASTER,
.sda_io_num = GPIO_NUM_21, // In accordance with used chip. .sda_io_num = GPIO_NUM_04, // In accordance with used chip.
.sda_pullup_en = GPIO_PULLUP_ENABLE, .sda_pullup_en = GPIO_PULLUP_ENABLE,
.scl_io_num = GPIO_NUM_22, // In accordance with used chip. .scl_io_num = GPIO_NUM_05, // In accordance with used chip.
.scl_pullup_en = GPIO_PULLUP_ENABLE, .scl_pullup_en = GPIO_PULLUP_ENABLE,
#ifndef CONFIG_IDF_TARGET_ESP8266
.master.clk_speed = 100000,
#endif
}; };
#ifdef CONFIG_IDF_TARGET_ESP8266
i2c_param_config(I2C_PORT, &i2c_config); i2c_param_config(I2C_PORT, &i2c_config);
i2c_driver_install(I2C_PORT, i2c_config.mode); i2c_driver_install(I2C_PORT, i2c_config.mode);
#else #else
i2c_param_config(I2C_PORT, &i2c_config); i2c_master_bus_config_t i2c_bus_config = {
i2c_driver_install(I2C_PORT, i2c_config.mode, 0, 0, 0); .clk_source = I2C_CLK_SRC_DEFAULT,
.i2c_port = I2C_PORT,
.scl_io_num = GPIO_NUM_22, // In accordance with used chip.
.sda_io_num = GPIO_NUM_21, // In accordance with used chip.
.glitch_ignore_cnt = 7,
.flags.enable_internal_pullup = true,
};
i2c_master_bus_handle_t i2c_bus_handle;
i2c_new_master_bus(&i2c_bus_config, &i2c_bus_handle);
#endif #endif
zh_bh1750_init_config_t zh_bh1750_init_config = ZH_BH1750_INIT_CONFIG_DEFAULT(); zh_bh1750_init_config_t zh_bh1750_init_config = ZH_BH1750_INIT_CONFIG_DEFAULT();
zh_bh1750_init_config.i2c_port = I2C_PORT; zh_bh1750_init_config.i2c_port = I2C_PORT; // Required only for ESP8266.
zh_bh1750_init_config.i2c_handle = i2c_bus_handle; // Required only for ESP32.
zh_bh1750_init(&zh_bh1750_init_config); zh_bh1750_init(&zh_bh1750_init_config);
zh_bh1750_adjust(69); // Just for an example of how to change the sensor sensitivity. zh_bh1750_adjust(69); // Just for an example of how to change the sensor sensitivity.
float lux = 0.0; float lux = 0.0;

View File

@ -2,12 +2,19 @@
#include "esp_err.h" #include "esp_err.h"
#include "esp_log.h" #include "esp_log.h"
#ifdef CONFIG_IDF_TARGET_ESP8266
#include "driver/i2c.h"
#else
#include "driver/i2c_master.h" #include "driver/i2c_master.h"
// #include "driver/i2c.h" #endif
// #ifdef CONFIG_IDF_TARGET_ESP8266
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
// #endif
#ifdef CONFIG_IDF_TARGET_ESP8266
typedef struct
{
} i2c_master_bus_handle_t;
#endif
/** /**
* @brief Default values for zh_bh1750_init_config_t structure for initial initialization of the sensor. * @brief Default values for zh_bh1750_init_config_t structure for initial initialization of the sensor.
@ -18,7 +25,8 @@
.i2c_address = I2C_ADDRESS_LOW, \ .i2c_address = I2C_ADDRESS_LOW, \
.operation_mode = HIGH_RESOLUTION, \ .operation_mode = HIGH_RESOLUTION, \
.work_mode = ONE_TIME, \ .work_mode = ONE_TIME, \
.i2c_port = 0 \ .i2c_port = 0, \
.i2c_handle = 0 \
} }
#ifdef __cplusplus #ifdef __cplusplus
@ -51,8 +59,8 @@ extern "C"
CONTINUOUSLY, // Continuously measurement. CONTINUOUSLY, // Continuously measurement.
ONE_TIME // One time measurement. Sensor is power down after measurement. ONE_TIME // One time measurement. Sensor is power down after measurement.
} work_mode; } work_mode;
bool i2c_port; // I2C port. bool i2c_port; // I2C port.
i2c_master_bus_handle_t i2c_handle; i2c_master_bus_handle_t i2c_handle; // Unique I2C bus handle.
} zh_bh1750_init_config_t; } zh_bh1750_init_config_t;
/** /**
@ -69,8 +77,9 @@ extern "C"
* @return * @return
* - ESP_OK if initialization was success * - ESP_OK if initialization was success
* - ESP_ERR_INVALID_ARG if parameter error * - ESP_ERR_INVALID_ARG if parameter error
* - ESP_ERR_NOT_FOUND if sensor not connected or not responded
*/ */
esp_err_t zh_bh1750_init(zh_bh1750_init_config_t *config); esp_err_t zh_bh1750_init(const zh_bh1750_init_config_t *config);
/** /**
* @brief Read BH1750 sensor. * @brief Read BH1750 sensor.
@ -102,7 +111,7 @@ extern "C"
* - ESP_ERR_INVALID_STATE if I2C driver not installed or not in master mode * - ESP_ERR_INVALID_STATE if I2C driver not installed or not in master mode
* - ESP_ERR_TIMEOUT if operation timeout because the bus is busy * - ESP_ERR_TIMEOUT if operation timeout because the bus is busy
*/ */
esp_err_t zh_bh1750_adjust(uint8_t value); esp_err_t zh_bh1750_adjust(const uint8_t value);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -21,11 +21,13 @@ static bool _is_first_start = false;
static uint8_t _time = 0; static uint8_t _time = 0;
static uint8_t _sensivity = SENSITIVITY_DEFAULT; static uint8_t _sensivity = SENSITIVITY_DEFAULT;
static bool _is_initialized = false; static bool _is_initialized = false;
static i2c_master_dev_handle_t _bh1750_handle; #ifndef CONFIG_IDF_TARGET_ESP8266
static i2c_master_dev_handle_t _bh1750_handle = {0};
#endif
static const char *TAG = "zh_bh1750"; static const char *TAG = "zh_bh1750";
esp_err_t zh_bh1750_init(zh_bh1750_init_config_t *config) esp_err_t zh_bh1750_init(const zh_bh1750_init_config_t *config)
{ {
ESP_LOGI(TAG, "BH1750 initialization begin."); ESP_LOGI(TAG, "BH1750 initialization begin.");
if (config == NULL) if (config == NULL)
@ -34,13 +36,19 @@ esp_err_t zh_bh1750_init(zh_bh1750_init_config_t *config)
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
_init_config = *config; _init_config = *config;
#ifndef CONFIG_IDF_TARGET_ESP8266
i2c_device_config_t bh1750_config = { i2c_device_config_t bh1750_config = {
.dev_addr_length = I2C_ADDR_BIT_LEN_7, .dev_addr_length = I2C_ADDR_BIT_LEN_7,
.device_address = _init_config.i2c_address, .device_address = _init_config.i2c_address,
.scl_speed_hz = 100000, .scl_speed_hz = 100000,
}; };
ESP_ERROR_CHECK(i2c_master_bus_add_device(_init_config.i2c_handle, &bh1750_config, &_bh1750_handle)); i2c_master_bus_add_device(_init_config.i2c_handle, &bh1750_config, &_bh1750_handle);
ESP_ERROR_CHECK(i2c_master_probe(_init_config.i2c_handle, _init_config.i2c_address, 1000 / portTICK_PERIOD_MS)); if (i2c_master_probe(_init_config.i2c_handle, _init_config.i2c_address, 1000 / portTICK_PERIOD_MS) != ESP_OK)
{
ESP_LOGE(TAG, "BH1750 initialization fail. Sensor not connected or not responded.");
return ESP_ERR_NOT_FOUND;
}
#endif
switch (_init_config.operation_mode) switch (_init_config.operation_mode)
{ {
case LOW_RESOLUTION:; case LOW_RESOLUTION:;
@ -77,8 +85,7 @@ esp_err_t zh_bh1750_read(float *data)
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
esp_err_t esp_err = ESP_OK; esp_err_t esp_err = ESP_OK;
uint8_t sensor_data_high = 0; uint8_t sensor_data[2] = {0};
uint8_t sensor_data_low = 0;
if (_init_config.work_mode == CONTINUOUSLY) if (_init_config.work_mode == CONTINUOUSLY)
{ {
if (_is_first_start == true) if (_is_first_start == true)
@ -90,92 +97,101 @@ esp_err_t zh_bh1750_read(float *data)
_is_first_start = true; _is_first_start = true;
} }
} }
ESP_ERROR_CHECK(i2c_master_transmit(_bh1750_handle, &_command, sizeof(_command), 1000 / portTICK_PERIOD_MS)); #ifdef CONFIG_IDF_TARGET_ESP8266
// i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create(); i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create();
// i2c_master_start(i2c_cmd_handle); i2c_master_start(i2c_cmd_handle);
// i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true); i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true);
// i2c_master_write_byte(i2c_cmd_handle, _command, true); i2c_master_write_byte(i2c_cmd_handle, _command, true);
// i2c_master_stop(i2c_cmd_handle); i2c_master_stop(i2c_cmd_handle);
// esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
// i2c_cmd_link_delete(i2c_cmd_handle); i2c_cmd_link_delete(i2c_cmd_handle);
// if (esp_err != ESP_OK) #else
// { esp_err = i2c_master_transmit(_bh1750_handle, &_command, sizeof(_command), 1000 / portTICK_PERIOD_MS);
// ESP_LOGE(TAG, "BH1750 read fail. I2C driver error."); #endif
// return esp_err; if (esp_err != ESP_OK)
// } {
ESP_LOGE(TAG, "BH1750 read fail. I2C driver error.");
return esp_err;
}
vTaskDelay(((_sensivity / SENSITIVITY_DEFAULT) * _time) / portTICK_PERIOD_MS); vTaskDelay(((_sensivity / SENSITIVITY_DEFAULT) * _time) / portTICK_PERIOD_MS);
READ: READ:
// i2c_cmd_handle = i2c_cmd_link_create(); #ifdef CONFIG_IDF_TARGET_ESP8266
// i2c_master_start(i2c_cmd_handle); i2c_cmd_handle = i2c_cmd_link_create();
// i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_READ, true); i2c_master_start(i2c_cmd_handle);
// i2c_master_read_byte(i2c_cmd_handle, &sensor_data_high, I2C_MASTER_ACK); i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_READ, true);
// i2c_master_read_byte(i2c_cmd_handle, &sensor_data_low, I2C_MASTER_NACK); i2c_master_read_byte(i2c_cmd_handle, &sensor_data[0], I2C_MASTER_ACK);
// i2c_master_stop(i2c_cmd_handle); i2c_master_read_byte(i2c_cmd_handle, &sensor_data[1], I2C_MASTER_NACK);
// esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); i2c_master_stop(i2c_cmd_handle);
// i2c_cmd_link_delete(i2c_cmd_handle); esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
// if (esp_err != ESP_OK) i2c_cmd_link_delete(i2c_cmd_handle);
// { #else
// ESP_LOGE(TAG, "BH1750 read fail. I2C driver error."); esp_err = i2c_master_receive(_bh1750_handle, sensor_data, sizeof(sensor_data), 1000 / portTICK_PERIOD_MS);
// return esp_err; #endif
// } if (esp_err != ESP_OK)
uint8_t temp[2] = {0}; {
ESP_ERROR_CHECK(i2c_master_receive(_bh1750_handle, &temp, 2, -1)); ESP_LOGE(TAG, "BH1750 read fail. I2C driver error.");
// ESP_ERROR_CHECK(i2c_master_receive(_bh1750_handle, &sensor_data_low, 1, -1)); return esp_err;
}
if (_init_config.operation_mode == HIGH_RESOLUTION_2) if (_init_config.operation_mode == HIGH_RESOLUTION_2)
{ {
*data = (temp[0] << 8 |temp[1]) * (1 / 1.2 * (69.0 / _sensivity) / 2); *data = (sensor_data[0] << 8 | sensor_data[1]) * (1 / 1.2 * (69.0 / _sensivity) / 2);
} }
else else
{ {
*data = (temp[0] << 8 | temp[1]) * (1 / 1.2 * (69.0 / _sensivity)); *data = (sensor_data[0] << 8 | sensor_data[1]) * (1 / 1.2 * (69.0 / _sensivity));
} }
ESP_LOGI(TAG, "BH1750 read success."); ESP_LOGI(TAG, "BH1750 read success.");
return ESP_OK; return ESP_OK;
} }
esp_err_t zh_bh1750_adjust(uint8_t value) esp_err_t zh_bh1750_adjust(const uint8_t value)
{ {
// ESP_LOGI(TAG, "BH1750 adjust begin."); ESP_LOGI(TAG, "BH1750 adjust begin.");
// if ((value < 31 || value > 254)) if ((value < 31 || value > 254))
// { {
// ESP_LOGE(TAG, "BH1750 adjust fail. Invalid argument."); ESP_LOGE(TAG, "BH1750 adjust fail. Invalid argument.");
// return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
// } }
// if (_is_initialized == false) if (_is_initialized == false)
// { {
// ESP_LOGE(TAG, "BH1750 read fail. BH1750 not initialized."); ESP_LOGE(TAG, "BH1750 read fail. BH1750 not initialized.");
// return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
// } }
// esp_err_t esp_err = ESP_OK; esp_err_t esp_err = ESP_OK;
// _sensivity = value; #ifdef CONFIG_IDF_TARGET_ESP8266
// i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create(); i2c_cmd_handle_t i2c_cmd_handle = i2c_cmd_link_create();
// i2c_master_start(i2c_cmd_handle); i2c_master_start(i2c_cmd_handle);
// i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true); i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true);
// i2c_master_write_byte(i2c_cmd_handle, value >> 5 | MEASUREMENT_TIME_HIGH_BIT, true); i2c_master_write_byte(i2c_cmd_handle, value >> 5 | MEASUREMENT_TIME_HIGH_BIT, true);
// i2c_master_stop(i2c_cmd_handle); i2c_master_stop(i2c_cmd_handle);
// esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
// i2c_cmd_link_delete(i2c_cmd_handle); i2c_cmd_link_delete(i2c_cmd_handle);
// if (esp_err != ESP_OK) if (esp_err != ESP_OK)
// { {
// ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error."); ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error.");
// return esp_err; return esp_err;
// } }
// i2c_cmd_handle = i2c_cmd_link_create(); i2c_cmd_handle = i2c_cmd_link_create();
// i2c_master_start(i2c_cmd_handle); i2c_master_start(i2c_cmd_handle);
// i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true); i2c_master_write_byte(i2c_cmd_handle, _init_config.i2c_address << 1 | I2C_MASTER_WRITE, true);
// i2c_master_write_byte(i2c_cmd_handle, (value & 0b00011111) | MEASUREMENT_TIME_LOW_BIT, true); i2c_master_write_byte(i2c_cmd_handle, (value & 0b00011111) | MEASUREMENT_TIME_LOW_BIT, true);
// i2c_master_stop(i2c_cmd_handle); i2c_master_stop(i2c_cmd_handle);
// esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS); esp_err = i2c_master_cmd_begin(_init_config.i2c_port, i2c_cmd_handle, 1000 / portTICK_PERIOD_MS);
// i2c_cmd_link_delete(i2c_cmd_handle); i2c_cmd_link_delete(i2c_cmd_handle);
// if (esp_err != ESP_OK) #else
// { uint8_t sensitivity_data[2] = {value >> 5 | MEASUREMENT_TIME_HIGH_BIT, (value & 0b00011111) | MEASUREMENT_TIME_LOW_BIT};
// ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error."); esp_err = i2c_master_transmit(_bh1750_handle, sensitivity_data, sizeof(sensitivity_data), 1000 / portTICK_PERIOD_MS);
// return esp_err; #endif
// } if (esp_err != ESP_OK)
// if (_init_config.work_mode == CONTINUOUSLY) {
// { ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error.");
// _is_first_start = false; return esp_err;
// } }
// ESP_LOGI(TAG, "BH1750 adjust success."); if (_init_config.work_mode == CONTINUOUSLY)
{
_is_first_start = false;
}
_sensivity = value;
ESP_LOGI(TAG, "BH1750 adjust success.");
return ESP_OK; return ESP_OK;
} }