mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge d7be7c45e1
into 46acfdce96
This commit is contained in:
commit
577eb6a30f
@ -944,9 +944,6 @@ esp_err_t i2c_new_master_bus(const i2c_master_bus_config_t *bus_config, i2c_mast
|
|||||||
i2c_master->base->sda_num = bus_config->sda_io_num;
|
i2c_master->base->sda_num = bus_config->sda_io_num;
|
||||||
i2c_master->base->pull_up_enable = bus_config->flags.enable_internal_pullup;
|
i2c_master->base->pull_up_enable = bus_config->flags.enable_internal_pullup;
|
||||||
|
|
||||||
if (i2c_master->base->pull_up_enable == false) {
|
|
||||||
ESP_LOGW(TAG, "Please check pull-up resistances whether be connected properly. Otherwise unexpected behavior would happen. For more detailed information, please read docs");
|
|
||||||
}
|
|
||||||
ESP_GOTO_ON_ERROR(i2c_param_master_config(i2c_master->base, bus_config), err, TAG, "i2c configure parameter failed");
|
ESP_GOTO_ON_ERROR(i2c_param_master_config(i2c_master->base, bus_config), err, TAG, "i2c configure parameter failed");
|
||||||
|
|
||||||
if (!i2c_master->base->is_lp_i2c) {
|
if (!i2c_master->base->is_lp_i2c) {
|
||||||
@ -985,7 +982,6 @@ esp_err_t i2c_new_master_bus(const i2c_master_bus_config_t *bus_config, i2c_mast
|
|||||||
xSemaphoreGive(i2c_master->bus_lock_mux);
|
xSemaphoreGive(i2c_master->bus_lock_mux);
|
||||||
// Initialize the queue
|
// Initialize the queue
|
||||||
if (bus_config->trans_queue_depth) {
|
if (bus_config->trans_queue_depth) {
|
||||||
ESP_LOGW(TAG, "Please note i2c asynchronous is only used for specific scenario currently. It's experimental for other users because user cannot get bus error from API. And It's not compatible with ``i2c_master_probe``. If user makes sure there won't be any error on bus and tested with no problem, this message can be ignored.");
|
|
||||||
i2c_master->async_trans = true;
|
i2c_master->async_trans = true;
|
||||||
i2c_master->sent_all = true;
|
i2c_master->sent_all = true;
|
||||||
i2c_master->trans_finish = true;
|
i2c_master->trans_finish = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user