Pull in display code and test.
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
#include <driver/i2c_master.h>
|
||||
|
||||
/// Tag used for ESP logging.
|
||||
static const char* TAG = "I2C component";
|
||||
static const char* I2C_TAG = "I2C component";
|
||||
|
||||
/**
|
||||
* Construct an ESP I2C master bus given a specific ESP I2C configuration.
|
||||
@@ -22,10 +22,10 @@ static const char* TAG = "I2C component";
|
||||
*
|
||||
* @param config ESP I2C master bus configuration.
|
||||
*/
|
||||
inline void init_config_i2c(const i2c_master_bus_config_t config)
|
||||
inline void I2C_config_init(const i2c_master_bus_config_t config)
|
||||
{
|
||||
i2c_master_bus_handle_t i2c;
|
||||
ESP_LOGI(TAG, "Initializing new master I2C bus");
|
||||
ESP_LOGI(I2C_TAG, "Initializing new master I2C bus");
|
||||
ESP_ERROR_CHECK(i2c_new_master_bus(&config, &i2c));
|
||||
}
|
||||
|
||||
@@ -36,9 +36,9 @@ inline void init_config_i2c(const i2c_master_bus_config_t config)
|
||||
* @param sda GPIO pin for SDA
|
||||
* @param scl GPIO pin for SCL
|
||||
*/
|
||||
inline void init_i2c(gpio_num_t sda, gpio_num_t scl)
|
||||
inline void I2C_init(gpio_num_t sda, gpio_num_t scl)
|
||||
{
|
||||
return init_config_i2c((i2c_master_bus_config_t){
|
||||
return I2C_config_init((i2c_master_bus_config_t){
|
||||
.i2c_port = I2C_BUS_PORT,
|
||||
.sda_io_num = sda,
|
||||
.scl_io_num = scl,
|
||||
@@ -55,12 +55,11 @@ inline void init_i2c(gpio_num_t sda, gpio_num_t scl)
|
||||
* ESP I2C master bus handle getter.
|
||||
* This will fail if an I2C instance was never constructed.
|
||||
*/
|
||||
static i2c_master_bus_handle_t get()
|
||||
static i2c_master_bus_handle_t I2C_get()
|
||||
{
|
||||
i2c_master_bus_handle_t i2c = NULL;
|
||||
ESP_ERROR_CHECK(i2c_master_get_bus_handle(0, &i2c));
|
||||
return i2c;
|
||||
}
|
||||
|
||||
|
||||
#endif //I2C_H
|
||||
|
||||
Reference in New Issue
Block a user