From d8fb30c930ba10ed7054d5f8669a230d95053245 Mon Sep 17 00:00:00 2001 From: devsaurus Date: Sat, 7 Jan 2017 13:14:40 +0100 Subject: [PATCH] i2c: fix i2c_get_period name rename i2s_get_period to i2c_get_period --- components/driver/i2c.c | 2 +- components/driver/include/driver/i2c.h | 2 +- docs/api/i2c.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/driver/i2c.c b/components/driver/i2c.c index 311f01516..39eb87734 100644 --- a/components/driver/i2c.c +++ b/components/driver/i2c.c @@ -494,7 +494,7 @@ esp_err_t i2c_set_period(i2c_port_t i2c_num, int high_period, int low_period) return ESP_OK; } -esp_err_t i2s_get_period(i2c_port_t i2c_num, int* high_period, int* low_period) +esp_err_t i2c_get_period(i2c_port_t i2c_num, int* high_period, int* low_period) { I2C_CHECK(i2c_num < I2C_NUM_MAX, I2C_NUM_ERROR_STR, ESP_ERR_INVALID_ARG); I2C_ENTER_CRITICAL(&i2c_spinlock[i2c_num]); diff --git a/components/driver/include/driver/i2c.h b/components/driver/include/driver/i2c.h index 69b80b1e6..960ec61d2 100644 --- a/components/driver/include/driver/i2c.h +++ b/components/driver/include/driver/i2c.h @@ -401,7 +401,7 @@ esp_err_t i2c_set_period(i2c_port_t i2c_num, int high_period, int low_period); * - ESP_OK Success * - ESP_ERR_INVALID_ARG Parameter error */ -esp_err_t i2s_get_period(i2c_port_t i2c_num, int* high_period, int* low_period); +esp_err_t i2c_get_period(i2c_port_t i2c_num, int* high_period, int* low_period); /** * @brief set I2C master start signal timing diff --git a/docs/api/i2c.rst b/docs/api/i2c.rst index 1186e0583..2f89681f1 100644 --- a/docs/api/i2c.rst +++ b/docs/api/i2c.rst @@ -68,7 +68,7 @@ Functions .. doxygenfunction:: i2c_slave_write_buffer .. doxygenfunction:: i2c_slave_read .. doxygenfunction:: i2c_set_period -.. doxygenfunction:: i2s_get_period +.. doxygenfunction:: i2c_get_period .. doxygenfunction:: i2c_set_start_timing .. doxygenfunction:: i2c_get_start_timing .. doxygenfunction:: i2c_set_stop_timing