From ece77252c8a00c809ae18fcfac4a6577e661d9e0 Mon Sep 17 00:00:00 2001 From: C47D Date: Sat, 16 Jan 2021 23:33:56 -0600 Subject: [PATCH] SSD1306: Replace hardcoded I2C port --- lvgl_tft/ssd1306.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lvgl_tft/ssd1306.c b/lvgl_tft/ssd1306.c index a1801fa..ca02eae 100644 --- a/lvgl_tft/ssd1306.c +++ b/lvgl_tft/ssd1306.c @@ -8,12 +8,13 @@ *********************/ #include "ssd1306.h" #include "driver/i2c.h" -#include "disp_spi.h" #include "driver/gpio.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#include "lvgl_i2c_conf.h" + /********************* * DEFINES *********************/ @@ -130,7 +131,7 @@ void ssd1306_init() i2c_master_write_byte(cmd, OLED_CMD_DISPLAY_ON, true); i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 10/portTICK_PERIOD_MS); + ret = i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10/portTICK_PERIOD_MS); if (ret == ESP_OK) { ESP_LOGI(TAG, "OLED configured successfully"); } else { @@ -174,7 +175,7 @@ void ssd1306_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t i2c_master_write_byte(cmd, row1, true); i2c_master_write_byte(cmd, row2, true); i2c_master_stop(cmd); - i2c_master_cmd_begin(I2C_NUM_0, cmd, 10/portTICK_PERIOD_MS); + i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10/portTICK_PERIOD_MS); i2c_cmd_link_delete(cmd); cmd = i2c_cmd_link_create(); @@ -217,7 +218,7 @@ void ssd1306_sleep_in() i2c_master_write_byte(cmd, OLED_CMD_DISPLAY_OFF, true); i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 10/portTICK_PERIOD_MS); + ret = i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10/portTICK_PERIOD_MS); if (ret != ESP_OK) { ESP_LOGE(TAG, "ssd1306_display_off configuration failed. code: 0x%.2X", ret); } @@ -235,7 +236,7 @@ void ssd1306_sleep_out() i2c_master_write_byte(cmd, OLED_CMD_DISPLAY_ON, true); i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 10/portTICK_PERIOD_MS); + ret = i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10/portTICK_PERIOD_MS); if (ret != ESP_OK) { ESP_LOGE(TAG, "ssd1306_display_on configuration failed. code: 0x%.2X", ret); }