Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

esp_lvgl_port: Backport changes for IDF v4.4 #131

Merged
merged 1 commit into from
Feb 17, 2023
Merged

esp_lvgl_port: Backport changes for IDF v4.4 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/esp_lvgl_port/esp_lvgl_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "esp_lcd_touch.h"
#endif

#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 1)
tore-espressif marked this conversation as resolved.
Show resolved Hide resolved
#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 4, 4)) || (ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5, 0, 0))
#define LVGL_PORT_HANDLE_FLUSH_READY 0
#else
#define LVGL_PORT_HANDLE_FLUSH_READY 1
Expand Down
2 changes: 1 addition & 1 deletion components/esp_lvgl_port/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.0.4"
version: "1.0.5"
description: ESP LVGL port
url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lvgl_port
dependencies:
Expand Down
10 changes: 0 additions & 10 deletions esp-box/esp-box.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@ esp_err_t bsp_audio_poweramp_enable(bool enable)
#define LCD_PARAM_BITS 8
#define LCD_LEDC_CH CONFIG_BSP_DISPLAY_BRIGHTNESS_LEDC_CH

static bool bsp_dispaly_flush_ready(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx)
{
lv_disp_t **disp = (lv_disp_t **)user_ctx;

lvgl_port_flush_ready(*disp);
return false;
}

static lv_disp_t *bsp_display_lcd_init(void)
{
ESP_LOGD(TAG, "Initialize SPI bus");
Expand All @@ -164,8 +156,6 @@ static lv_disp_t *bsp_display_lcd_init(void)
.lcd_param_bits = LCD_PARAM_BITS,
.spi_mode = 0,
.trans_queue_depth = 10,
.on_color_trans_done = bsp_dispaly_flush_ready,
.user_ctx = &disp,
};

// Attach the LCD to the SPI bus
Expand Down
2 changes: 1 addition & 1 deletion esp-box/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
public: true

esp_lvgl_port:
version: ^1
version: "^1"
public: true

examples:
Expand Down