alexey.zholtikov/zh_bh1750
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Compare commits

base: alexey.zholtikov:v1.0.2
Branches Tags
alexey.zholtikov:main
alexey.zholtikov:v1.0.5 alexey.zholtikov:v1.0.4 alexey.zholtikov:v1.0.3 alexey.zholtikov:v1.0.2 alexey.zholtikov:v1.0.1 alexey.zholtikov:v1.0.0
...
compare: alexey.zholtikov:v1.0.4
Branches Tags
alexey.zholtikov:main
alexey.zholtikov:v1.0.5 alexey.zholtikov:v1.0.4 alexey.zholtikov:v1.0.3 alexey.zholtikov:v1.0.2 alexey.zholtikov:v1.0.1 alexey.zholtikov:v1.0.0

2 Commits
v1.0.2 ... v1.0.4

Author SHA1 Message Date
Alexey Zholtikov
23cac1f945 Version 1.0.4 
Minor main code refactoring.
 2024-07-21 08:54:24 +03:00
Alexey Zholtikov
54c3b16697 Version 1.0.3 
Updated error messages.
 2024-07-04 12:59:37 +03:00
3 changed files with 26 additions and 30 deletions
Expand all files Collapse all files

12
include/zh_bh1750.h
View File

@ -76,10 +76,8 @@ extern "C"
* @return * @return
* - ESP_OK if read was success * - ESP_OK if read was success
* - ESP_ERR_INVALID_ARG if parameter error * - ESP_ERR_INVALID_ARG if parameter error
* - ESP_ERR_NOT_FOUND if BH1750 is not initialized * - ESP_ERR_NOT_FOUND if sensor is not initialized
* - ESP_FAIL if sending command error or slave has not ACK the transfer * - ESP_ERR_INVALID_RESPONSE if I2C driver error
* - 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_t zh_bh1750_read(float *data); esp_err_t zh_bh1750_read(float *data);
@ -95,10 +93,8 @@ extern "C"
* @return * @return
* - ESP_OK if adjust was success * - ESP_OK if adjust was success
* - ESP_ERR_INVALID_ARG if parameter error * - ESP_ERR_INVALID_ARG if parameter error
* - ESP_ERR_NOT_FOUND if BH1750 is not initialized or auto adjust is enabled * - ESP_ERR_NOT_FOUND if sensor is not initialized or auto adjust is enabled
* - ESP_FAIL if sending command error or slave has not ACK the transfer * - ESP_ERR_INVALID_RESPONSE if I2C driver error
* - 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_t zh_bh1750_adjust(const uint8_t value); esp_err_t zh_bh1750_adjust(const uint8_t value);

2
version.txt
View File

@ -1 +1 @@
1.0.2 1.0.4

42
zh_bh1750.c
View File

@ -87,7 +87,7 @@ esp_err_t zh_bh1750_read(float *data)
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
REPEATE:; REPEATE:;
esp_err_t esp_err = ESP_OK; esp_err_t err = ESP_OK;
uint8_t sensor_data[2] = {0}; uint8_t sensor_data[2] = {0};
if (_init_config.work_mode == CONTINUOUSLY) if (_init_config.work_mode == CONTINUOUSLY)
{ {
@ -106,15 +106,15 @@ REPEATE:;
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); 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);
#else #else
esp_err = i2c_master_transmit(_bh1750_handle, &_command, sizeof(_command), 1000 / portTICK_PERIOD_MS); err = i2c_master_transmit(_bh1750_handle, &_command, sizeof(_command), 1000 / portTICK_PERIOD_MS);
#endif #endif
if (esp_err != ESP_OK) if (err != ESP_OK)
{ {
ESP_LOGE(TAG, "BH1750 read fail. I2C driver error."); ESP_LOGE(TAG, "BH1750 read fail. I2C driver error at line %d.", __LINE__);
return esp_err; return ESP_ERR_INVALID_RESPONSE;
} }
vTaskDelay(_time / portTICK_PERIOD_MS); vTaskDelay(_time / portTICK_PERIOD_MS);
READ: READ:
@ -125,15 +125,15 @@ READ:
i2c_master_read_byte(i2c_cmd_handle, &sensor_data[0], I2C_MASTER_ACK); i2c_master_read_byte(i2c_cmd_handle, &sensor_data[0], I2C_MASTER_ACK);
i2c_master_read_byte(i2c_cmd_handle, &sensor_data[1], I2C_MASTER_NACK); i2c_master_read_byte(i2c_cmd_handle, &sensor_data[1], I2C_MASTER_NACK);
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); 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);
#else #else
esp_err = i2c_master_receive(_bh1750_handle, sensor_data, sizeof(sensor_data), 1000 / portTICK_PERIOD_MS); err = i2c_master_receive(_bh1750_handle, sensor_data, sizeof(sensor_data), 1000 / portTICK_PERIOD_MS);
#endif #endif
if (esp_err != ESP_OK) if (err != ESP_OK)
{ {
ESP_LOGE(TAG, "BH1750 read fail. I2C driver error."); ESP_LOGE(TAG, "BH1750 read fail. I2C driver error at line %d.", __LINE__);
return esp_err; return ESP_ERR_INVALID_RESPONSE;
} }
uint32_t raw_data = sensor_data[0] << 8 | sensor_data[1]; uint32_t raw_data = sensor_data[0] << 8 | sensor_data[1];
if (raw_data == 65535 || raw_data == 0) if (raw_data == 65535 || raw_data == 0)
@ -192,7 +192,7 @@ esp_err_t _adjust(const uint8_t value)
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 err = ESP_OK;
uint8_t sensitivity_data[2] = {value >> 5 | MEASUREMENT_TIME_HIGH_BIT, (value & 0b00011111) | MEASUREMENT_TIME_LOW_BIT}; uint8_t sensitivity_data[2] = {value >> 5 | MEASUREMENT_TIME_HIGH_BIT, (value & 0b00011111) | MEASUREMENT_TIME_LOW_BIT};
#ifdef CONFIG_IDF_TARGET_ESP8266 #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();
@ -200,28 +200,28 @@ esp_err_t _adjust(const uint8_t value)
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, sensitivity_data[0], true); i2c_master_write_byte(i2c_cmd_handle, sensitivity_data[0], 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); 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 at line %d.", __LINE__);
return esp_err; return ESP_ERR_INVALID_RESPONSE;
} }
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, sensitivity_data[1], true); i2c_master_write_byte(i2c_cmd_handle, sensitivity_data[1], 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); 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);
#else #else
esp_err = i2c_master_transmit(_bh1750_handle, &sensitivity_data[0], 1, 1000 / portTICK_PERIOD_MS); err = i2c_master_transmit(_bh1750_handle, &sensitivity_data[0], 1, 1000 / portTICK_PERIOD_MS);
esp_err = i2c_master_transmit(_bh1750_handle, &sensitivity_data[1], 1, 1000 / portTICK_PERIOD_MS); err = i2c_master_transmit(_bh1750_handle, &sensitivity_data[1], 1, 1000 / portTICK_PERIOD_MS);
#endif #endif
if (esp_err != ESP_OK) if (err != ESP_OK)
{ {
ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error."); ESP_LOGE(TAG, "BH1750 adjust fail. I2C driver error at line %d.", __LINE__);
return esp_err; return ESP_ERR_INVALID_RESPONSE;
} }
if (_init_config.work_mode == CONTINUOUSLY) if (_init_config.work_mode == CONTINUOUSLY)
{ {