diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,2 +1,2 @@ -idf_component_register(SRCS "main.c" "wifi.c" "usb_cdc.c" "can.c" "display.c" +idf_component_register(SRCS "main.c" "wifi.c" "usb_cdc.c" "can.c" "display.c" "ui_helpers.c" INCLUDE_DIRS .) diff --git a/main/display.c b/main/display.c --- a/main/display.c +++ b/main/display.c @@ -15,251 +15,509 @@ #include "esp_lvgl_port.h" - - -#include "esp_lcd_touch_tt21100.h" +#include +#include "esp_timer.h" +#include "esp_heap_caps.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "ui_helpers.h" -/* LCD size */ -#define EXAMPLE_LCD_H_RES (320) -#define EXAMPLE_LCD_V_RES (240) +static const char *TAG = "LVGL_SETUP"; +static void lvgl_timer_task(void *arg); + +static lv_obj_t *ui_Screen1; +static lv_obj_t *ui_redsquare; + +static lv_obj_t *meter; +static lv_obj_t *ue_img_logo; +static lv_obj_t *esp_img_logo; -/* LCD settings */ -#define EXAMPLE_LCD_SPI_NUM (SPI3_HOST) -#define EXAMPLE_LCD_PIXEL_CLK_HZ (40 * 1000 * 1000) -#define EXAMPLE_LCD_CMD_BITS (8) -#define EXAMPLE_LCD_PARAM_BITS (8) -#define EXAMPLE_LCD_COLOR_SPACE (ESP_LCD_COLOR_SPACE_BGR) -#define EXAMPLE_LCD_BITS_PER_PIXEL (16) -#define EXAMPLE_LCD_DRAW_BUFF_DOUBLE (1) -#define EXAMPLE_LCD_DRAW_BUFF_HEIGHT (50) -#define EXAMPLE_LCD_BL_ON_LEVEL (1) +static lv_obj_t *ui_Dropdown2; + +LV_IMG_DECLARE(ue_logo) +LV_IMG_DECLARE(esp_logo) +LV_IMG_DECLARE(red_square) + +#define BSP_NULL_CHECK(x, ret) assert(x) + +static SemaphoreHandle_t lvgl_mux; // LVGL mutex +static SemaphoreHandle_t touch_mux; // Touch mutex + +static void bsp_touchpad_read(lv_indev_drv_t *drv, lv_indev_data_t *data) +{ + uint16_t touchpad_x[1] = {0}; + uint16_t touchpad_y[1] = {0}; + uint8_t touchpad_cnt = 0; -/* LCD pins */ -#define EXAMPLE_LCD_GPIO_SCLK (GPIO_NUM_7) -#define EXAMPLE_LCD_GPIO_MOSI (GPIO_NUM_6) -#define EXAMPLE_LCD_GPIO_RST (GPIO_NUM_48) -#define EXAMPLE_LCD_GPIO_DC (GPIO_NUM_4) -#define EXAMPLE_LCD_GPIO_CS (GPIO_NUM_5) -#define EXAMPLE_LCD_GPIO_BL (GPIO_NUM_45) + /* Read data from touch controller into memory */ + if (xSemaphoreTake(touch_mux, 0) == pdTRUE) + { + esp_lcd_touch_read_data(drv->user_data); + } + /* Get coordinates */ + bool touchpad_pressed = esp_lcd_touch_get_coordinates(drv->user_data, touchpad_x, touchpad_y, NULL, &touchpad_cnt, 1); + + if (touchpad_pressed && touchpad_cnt > 0) + { + data->point.x = touchpad_x[0]; + data->point.y = touchpad_y[0]; + data->state = LV_INDEV_STATE_PRESSED; + printf("data->point.x = %u \n", data->point.x); + printf("data->point.y = %u \n", data->point.y); + } + else + { + data->state = LV_INDEV_STATE_RELEASED; + } +} -/* Touch settings */ -#define EXAMPLE_TOUCH_I2C_NUM (0) -#define EXAMPLE_TOUCH_I2C_CLK_HZ (400000) +static void touch_callback(esp_lcd_touch_handle_t tp) +{ + BaseType_t xHigherPriorityTaskWoken = pdFALSE; + xSemaphoreGiveFromISR(touch_mux, &xHigherPriorityTaskWoken); + + if (xHigherPriorityTaskWoken) + { + portYIELD_FROM_ISR(); + } +} -/* LCD touch pins */ -#define EXAMPLE_TOUCH_I2C_SCL (GPIO_NUM_18) -#define EXAMPLE_TOUCH_I2C_SDA (GPIO_NUM_8) -#define EXAMPLE_TOUCH_GPIO_INT (GPIO_NUM_20) +static void set_value(void *indic, int32_t v) +{ + lv_meter_set_indicator_end_value(meter, indic, v); +} -static const char *TAG = "EXAMPLE"; +static bool example_notify_lvgl_flush_ready(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx) +{ + lv_disp_drv_t *disp_driver = (lv_disp_drv_t *)user_ctx; + lv_disp_flush_ready(disp_driver); + return false; +} -/* LCD IO and panel */ -static esp_lcd_panel_io_handle_t lcd_io = NULL; -static esp_lcd_panel_handle_t lcd_panel = NULL; -static esp_lcd_touch_handle_t touch_handle = NULL; +static void example_lvgl_flush_cb(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map) +{ + esp_lcd_panel_handle_t panel_handle = (esp_lcd_panel_handle_t)drv->user_data; + int offsetx1 = area->x1; + int offsetx2 = area->x2; + int offsety1 = area->y1; + int offsety2 = area->y2; + // copy a buffer's content to a specific area of the display + esp_lcd_panel_draw_bitmap(panel_handle, offsetx1, offsety1, offsetx2 + 1, offsety2 + 1, color_map); +} -/* LVGL display and touch */ -static lv_disp_t *lvgl_disp = NULL; -static lv_indev_t *lvgl_touch_indev = NULL; +static void example_increase_lvgl_tick(void *arg) +{ + /* Tell LVGL how many milliseconds has elapsed */ + lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS); +} + +void display_init() +{ + static lv_disp_draw_buf_t disp_buf; // contains internal graphic buffer(s) called draw buffer(s) + static lv_disp_drv_t disp_drv; // contains callback functions + + gpio_config_t pwr_gpio_config = + { + .mode = GPIO_MODE_OUTPUT, + .pin_bit_mask = 1ULL << EXAMPLE_PIN_NUM_POWER}; + ESP_ERROR_CHECK(gpio_config(&pwr_gpio_config)); + gpio_set_level(EXAMPLE_PIN_NUM_POWER, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL); + gpio_config_t input_conf = + { + .mode = GPIO_MODE_INPUT, + .pull_up_en = GPIO_PULLUP_ENABLE, + .pin_bit_mask = 1ULL << PIN_LCD_RD}; + ESP_ERROR_CHECK(gpio_config(&input_conf)); -static esp_err_t __lcd_init(void) -{ - esp_err_t ret = ESP_OK; + gpio_config_t bk_gpio_config = + { + .mode = GPIO_MODE_OUTPUT, + .pin_bit_mask = 1ULL << EXAMPLE_PIN_NUM_BK_LIGHT}; + ESP_ERROR_CHECK(gpio_config(&bk_gpio_config)); + gpio_set_level(EXAMPLE_PIN_NUM_BK_LIGHT, EXAMPLE_LCD_BK_LIGHT_ON_LEVEL); - /* LCD backlight */ - gpio_config_t bk_gpio_config = { - .mode = GPIO_MODE_OUTPUT, - .pin_bit_mask = 1ULL << EXAMPLE_LCD_GPIO_BL + ESP_LOGI(TAG, "Initialize Intel 8080 bus"); + esp_lcd_i80_bus_handle_t i80_bus = NULL; + esp_lcd_i80_bus_config_t bus_config = { + .clk_src = LCD_CLK_SRC_DEFAULT, + .dc_gpio_num = EXAMPLE_PIN_NUM_DC, + .wr_gpio_num = EXAMPLE_PIN_NUM_PCLK, + .data_gpio_nums = { + EXAMPLE_PIN_NUM_DATA0, + EXAMPLE_PIN_NUM_DATA1, + EXAMPLE_PIN_NUM_DATA2, + EXAMPLE_PIN_NUM_DATA3, + EXAMPLE_PIN_NUM_DATA4, + EXAMPLE_PIN_NUM_DATA5, + EXAMPLE_PIN_NUM_DATA6, + EXAMPLE_PIN_NUM_DATA7, + }, + .bus_width = 8, + .max_transfer_bytes = LVGL_LCD_BUF_SIZE * sizeof(uint16_t) + //.psram_trans_align = EXAMPLE_PSRAM_DATA_ALIGNMENT, + //.sram_trans_align = 4, }; - ESP_ERROR_CHECK(gpio_config(&bk_gpio_config)); + ESP_ERROR_CHECK(esp_lcd_new_i80_bus(&bus_config, &i80_bus)); + esp_lcd_panel_io_handle_t io_handle = NULL; + esp_lcd_panel_io_i80_config_t io_config = { + .cs_gpio_num = EXAMPLE_PIN_NUM_CS, + .pclk_hz = EXAMPLE_LCD_PIXEL_CLOCK_HZ, + .trans_queue_depth = 20, + .dc_levels = { + .dc_idle_level = 0, + .dc_cmd_level = 0, + .dc_dummy_level = 0, + .dc_data_level = 1, + }, - /* LCD initialization */ - ESP_LOGD(TAG, "Initialize SPI bus"); - const spi_bus_config_t buscfg = { - .sclk_io_num = EXAMPLE_LCD_GPIO_SCLK, - .mosi_io_num = EXAMPLE_LCD_GPIO_MOSI, - .miso_io_num = GPIO_NUM_NC, - .quadwp_io_num = GPIO_NUM_NC, - .quadhd_io_num = GPIO_NUM_NC, - .max_transfer_sz = EXAMPLE_LCD_H_RES * EXAMPLE_LCD_DRAW_BUFF_HEIGHT * sizeof(uint16_t), - }; - ESP_RETURN_ON_ERROR(spi_bus_initialize(EXAMPLE_LCD_SPI_NUM, &buscfg, SPI_DMA_CH_AUTO), TAG, "SPI init failed"); - - ESP_LOGD(TAG, "Install panel IO"); - const esp_lcd_panel_io_spi_config_t io_config = { - .dc_gpio_num = EXAMPLE_LCD_GPIO_DC, - .cs_gpio_num = EXAMPLE_LCD_GPIO_CS, - .pclk_hz = EXAMPLE_LCD_PIXEL_CLK_HZ, + .on_color_trans_done = example_notify_lvgl_flush_ready, + .user_ctx = &disp_drv, .lcd_cmd_bits = EXAMPLE_LCD_CMD_BITS, .lcd_param_bits = EXAMPLE_LCD_PARAM_BITS, - .spi_mode = 0, - .trans_queue_depth = 10, + }; + ESP_ERROR_CHECK(esp_lcd_new_panel_io_i80(i80_bus, &io_config, &io_handle)); + + esp_lcd_panel_handle_t panel_handle = NULL; + + ESP_LOGI(TAG, "Install LCD driver of st7789"); + esp_lcd_panel_dev_config_t panel_config = { + .reset_gpio_num = EXAMPLE_PIN_NUM_RST, + .rgb_endian = ESP_LCD_COLOR_SPACE_RGB, + .bits_per_pixel = 16, }; - ESP_GOTO_ON_ERROR(esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)EXAMPLE_LCD_SPI_NUM, &io_config, &lcd_io), err, TAG, "New panel IO failed"); + ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(io_handle, &panel_config, &panel_handle)); + + esp_lcd_panel_reset(panel_handle); + esp_lcd_panel_init(panel_handle); + esp_lcd_panel_invert_color(panel_handle, true); + + esp_lcd_panel_swap_xy(panel_handle, true); + + esp_lcd_panel_mirror(panel_handle, false, true); + + // the gap is LCD panel specific, even panels with the same driver IC, can have different gap value + esp_lcd_panel_set_gap(panel_handle, 0, 35); + + esp_lcd_panel_io_tx_param(io_handle, 0xF2, (uint8_t[]){0}, 1); // 3Gamma function disable + esp_lcd_panel_io_tx_param(io_handle, 0x26, (uint8_t[]){1}, 1); // Gamma curve 1 selected + esp_lcd_panel_io_tx_param(io_handle, 0xE0, (uint8_t[]){ // Set positive gamma + 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00}, + 15); + esp_lcd_panel_io_tx_param(io_handle, 0xE1, (uint8_t[]){// Set negative gamma + 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F}, + 15); + + ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_handle, true)); + +#if USE_TOUCH_DISPLAY + // CST816 TOUCH TESTING FUNCTION + esp_lcd_touch_handle_t tp = NULL; + esp_lcd_panel_io_handle_t tp_io_handle = NULL; + + i2c_config_t i2c_conf = { + .mode = I2C_MODE_MASTER, + .sda_io_num = EXAMPLE_I2C_SDA, + .scl_io_num = EXAMPLE_I2C_SCL, + .sda_pullup_en = GPIO_PULLUP_ENABLE, + .scl_pullup_en = GPIO_PULLUP_ENABLE, + .master.clk_speed = 400000, + }; + ESP_LOGI(TAG, "Initializing I2C for display touch"); + /* Initialize I2C */ + ESP_ERROR_CHECK(i2c_param_config(EXAMPLE_I2C_NUM, &i2c_conf)); + ESP_ERROR_CHECK(i2c_driver_install(EXAMPLE_I2C_NUM, i2c_conf.mode, 0, 0, 0)); + + i2c_cmd_handle_t cmd; + for (int i = 0; i < 0x7f; i++) + { + cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, (i << 1) | I2C_MASTER_WRITE, true); + i2c_master_stop(cmd); + if (i2c_master_cmd_begin(EXAMPLE_I2C_NUM, cmd, portMAX_DELAY) == ESP_OK) + { + ESP_LOGW("I2C_TEST", "%02X", i); + } + i2c_cmd_link_delete(cmd); + } + + esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG(); - ESP_LOGD(TAG, "Install LCD driver"); - const esp_lcd_panel_dev_config_t panel_config = { - .reset_gpio_num = EXAMPLE_LCD_GPIO_RST, - .color_space = EXAMPLE_LCD_COLOR_SPACE, - .bits_per_pixel = EXAMPLE_LCD_BITS_PER_PIXEL, + ESP_LOGI(TAG, "esp_lcd_new_panel_io_i2c"); + ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c((esp_lcd_i2c_bus_handle_t)EXAMPLE_I2C_NUM, &tp_io_config, &tp_io_handle)); + + esp_lcd_touch_config_t tp_cfg = { + .x_max = 170, + .y_max = 320, + .rst_gpio_num = 21, + .int_gpio_num = 16, + .levels = { + .reset = 0, + .interrupt = 0, + }, + .flags = { + .swap_xy = 1, + .mirror_x = 0, + .mirror_y = 1, + }, + .interrupt_callback = touch_callback, }; - ESP_GOTO_ON_ERROR(esp_lcd_new_panel_st7789(lcd_io, &panel_config, &lcd_panel), err, TAG, "New panel failed"); + + ESP_LOGI(TAG, "esp_lcd_touch_new_i2c_cst816s"); + esp_lcd_touch_new_i2c_cst816s(tp_io_handle, &tp_cfg, &tp); + // END OF CST816 TOUCH TESTING FUNCTION +#endif + + lv_init(); + + lvgl_mux = xSemaphoreCreateMutex(); + BSP_NULL_CHECK(lvgl_mux, NULL); + + touch_mux = xSemaphoreCreateBinary(); + BSP_NULL_CHECK(touch_mux, NULL); + + // it's recommended to choose the size of the draw buffer(s) to be at least 1/10 screen sized + lv_color_t *buf1 = heap_caps_malloc(LVGL_LCD_BUF_SIZE * sizeof(lv_color_t), MALLOC_CAP_DMA); + assert(buf1); + lv_disp_draw_buf_init(&disp_buf, buf1, NULL, LVGL_LCD_BUF_SIZE); + + ESP_LOGI(TAG, "Register display driver to LVGL"); + lv_disp_drv_init(&disp_drv); + disp_drv.hor_res = EXAMPLE_LCD_H_RES; + disp_drv.ver_res = EXAMPLE_LCD_V_RES; + disp_drv.flush_cb = example_lvgl_flush_cb; + disp_drv.draw_buf = &disp_buf; + disp_drv.user_data = panel_handle; + disp_drv.sw_rotate = 1; + lv_disp_t *disp = lv_disp_drv_register(&disp_drv); + + ESP_LOGI(TAG, "Install LVGL tick timer"); + // Tick interface for LVGL (using esp_timer to generate 2ms periodic event) + const esp_timer_create_args_t lvgl_tick_timer_args = { + .callback = &example_increase_lvgl_tick, + .name = "lvgl_tick"}; + esp_timer_handle_t lvgl_tick_timer = NULL; + ESP_ERROR_CHECK(esp_timer_create(&lvgl_tick_timer_args, &lvgl_tick_timer)); + ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_timer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000)); + +#if USE_TOUCH_DISPLAY + static lv_indev_drv_t indev_drv; // Input device driver (Touch) + lv_indev_t *indev_touchpad; + lv_indev_drv_init(&indev_drv); + indev_drv.type = LV_INDEV_TYPE_POINTER; + indev_drv.disp = disp; + indev_drv.read_cb = bsp_touchpad_read; + indev_drv.user_data = tp; + indev_touchpad = lv_indev_drv_register(&indev_drv); + BSP_NULL_CHECK(indev_touchpad, ESP_ERR_NO_MEM); +#endif + + xTaskCreatePinnedToCore(lvgl_timer_task, "lvgl Timer", 10000, NULL, 4, NULL, 1); +} - esp_lcd_panel_reset(lcd_panel); - esp_lcd_panel_init(lcd_panel); - esp_lcd_panel_mirror(lcd_panel, true, true); - esp_lcd_panel_disp_on_off(lcd_panel, true); +static void lvgl_timer_task(void *arg) +{ + ESP_LOGI(TAG, "Starting LVGL task"); + while (1) + { + bsp_display_lock(0); + uint32_t task_delay_ms = lv_timer_handler(); + bsp_display_unlock(); + if (task_delay_ms > 500) + { + task_delay_ms = 500; + } + else if (task_delay_ms < 5) + { + task_delay_ms = 5; + } + vTaskDelay(pdMS_TO_TICKS(task_delay_ms)); + } +} + +void display_meter() +{ + meter = lv_meter_create(lv_scr_act()); + lv_obj_center(meter); + lv_obj_set_size(meter, 170, 170); + + /*Remove the circle from the middle*/ + lv_obj_remove_style(meter, NULL, LV_PART_INDICATOR); + + /*Add a scale first*/ + lv_meter_scale_t *scale = lv_meter_add_scale(meter); + lv_meter_set_scale_ticks(meter, scale, 11, 2, 10, lv_palette_main(LV_PALETTE_GREY)); + lv_meter_set_scale_major_ticks(meter, scale, 1, 2, 15, lv_color_hex3(0xeee), 10); + lv_meter_set_scale_range(meter, scale, 0, 100, 270, 90); + + /*Add a three arc indicator*/ + lv_meter_indicator_t *indic1 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x00F), 0); + // lv_meter_indicator_t *indic2 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x0F0), -10); + // lv_meter_indicator_t *indic3 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0xF00), -20); - /* LCD backlight on */ - ESP_ERROR_CHECK(gpio_set_level(EXAMPLE_LCD_GPIO_BL, EXAMPLE_LCD_BL_ON_LEVEL)); + /*Create an animation to set the value*/ + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_exec_cb(&a, set_value); + lv_anim_set_values(&a, 0, 100); + lv_anim_set_repeat_delay(&a, 100); + lv_anim_set_playback_delay(&a, 2000); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); + + lv_anim_set_time(&a, 2000); + lv_anim_set_playback_time(&a, 500); + lv_anim_set_var(&a, indic1); + lv_anim_start(&a); + + /* + lv_anim_set_time(&a, 1000); + lv_anim_set_playback_time(&a, 1000); + lv_anim_set_var(&a, indic2); + lv_anim_start(&a); - return ret; + lv_anim_set_time(&a, 1000); + lv_anim_set_playback_time(&a, 2000); + lv_anim_set_var(&a, indic3); + lv_anim_start(&a); + */ + /* page 3 */ +} + +static void dropdown_event_handler(lv_event_t *e) +{ + lv_event_code_t code = lv_event_get_code(e); + lv_obj_t *obj = lv_event_get_target(e); + if (code == LV_EVENT_VALUE_CHANGED) + { + char buf[32]; + lv_dropdown_get_selected_str(obj, buf, sizeof(buf)); + LV_LOG_USER("Option: %s", buf); + } +} -err: - if (lcd_panel) { - esp_lcd_panel_del(lcd_panel); - } - if (lcd_io) { - esp_lcd_panel_io_del(lcd_io); - } - spi_bus_free(EXAMPLE_LCD_SPI_NUM); - return ret; +/** + * @brief dispaly dropdown is rotated 180 degrees (USB to the right is the orentation) + * + */ +void display_dropdown() +{ + lv_disp_t *dispp = lv_disp_get_default(); + ui_Dropdown2 = lv_dropdown_create(lv_scr_act()); + lv_dropdown_set_options(ui_Dropdown2, "Apple\n" + "Banana\n" + "Orange\n" + "Melon\n" + "Grape\n" + "Raspberry"); + lv_obj_set_width(ui_Dropdown2, 150); + lv_obj_set_height(ui_Dropdown2, LV_SIZE_CONTENT); /// 1 + lv_obj_set_x(ui_Dropdown2, 0); + lv_obj_set_y(ui_Dropdown2, -20); + lv_obj_set_align(ui_Dropdown2, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_Dropdown2, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags + lv_obj_add_event_cb(ui_Dropdown2, dropdown_event_handler, LV_EVENT_ALL, NULL); +} + +void display_window() +{ + lv_obj_t *win = lv_win_create(lv_scr_act(), 40); + assert(win); + lv_win_add_title(win, "test123!"); +} + +void display_image() +{ + esp_img_logo = lv_img_create(lv_scr_act()); + lv_img_set_src(esp_img_logo, &esp_logo); + lv_obj_center(esp_img_logo); +} + +void display_red_square() +{ + // ui_Screen1 = lv_obj_create(NULL); + // lv_obj_clear_flag(ui_Screen1, LV_OBJ_FLAG_SCROLLABLE); /// Flags + + ui_redsquare = lv_img_create(lv_scr_act()); + lv_img_set_src(ui_redsquare, &red_square); + lv_obj_set_width(ui_redsquare, LV_SIZE_CONTENT); /// 1 + lv_obj_set_height(ui_redsquare, LV_SIZE_CONTENT); /// 1 + lv_obj_set_align(ui_redsquare, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_redsquare, LV_OBJ_FLAG_ADV_HITTEST); /// Flags + lv_obj_clear_flag(ui_redsquare, LV_OBJ_FLAG_SCROLLABLE); /// Flags +} + +static void slider_event_cb(lv_event_t *e); +static lv_obj_t *slider_label; + +void display_slider() +{ + lv_disp_t *dispp = lv_disp_get_default(); + /*Create a slider in the center of the display*/ + lv_obj_t *slider = lv_slider_create(lv_scr_act()); + lv_obj_set_x(slider, 0); + lv_obj_set_y(slider, -40); + lv_obj_set_align(slider, LV_ALIGN_CENTER); + lv_obj_add_event_cb(slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL); + + /*Create a label below the slider*/ + slider_label = lv_label_create(lv_scr_act()); + lv_label_set_text(slider_label, "0%"); + lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); +} + +static void slider_event_cb(lv_event_t *e) +{ + lv_obj_t *slider = lv_event_get_target(e); + char buf[8]; + lv_snprintf(buf, sizeof(buf), "%d%%", (int)lv_slider_get_value(slider)); + lv_label_set_text(slider_label, buf); + lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); +} + +void get_img_color() +{ + lv_color_t pixel_color = lv_img_buf_get_px_color(&red_square, 50, 50, lv_color_make(0, 0, 0)); + uint32_t c32 = lv_color_to32(pixel_color); + printf("Pixel color: %lu \n", c32); +} + +bool bsp_display_lock(uint32_t timeout_ms) +{ + BSP_NULL_CHECK(lvgl_mux, NULL); + const TickType_t timeout_ticks = (timeout_ms == 0) ? portMAX_DELAY : pdMS_TO_TICKS(timeout_ms); + return xSemaphoreTake(lvgl_mux, timeout_ticks) == pdTRUE; +} + +void bsp_display_unlock(void) +{ + BSP_NULL_CHECK(lvgl_mux, NULL); + xSemaphoreGive(lvgl_mux); } -// static esp_err_t app_touch_init(void) -// { -// /* Initilize I2C */ -// const i2c_config_t i2c_conf = { -// .mode = I2C_MODE_MASTER, -// .sda_io_num = EXAMPLE_TOUCH_I2C_SDA, -// .sda_pullup_en = GPIO_PULLUP_DISABLE, -// .scl_io_num = EXAMPLE_TOUCH_I2C_SCL, -// .scl_pullup_en = GPIO_PULLUP_DISABLE, -// .master.clk_speed = EXAMPLE_TOUCH_I2C_CLK_HZ -// }; -// ESP_RETURN_ON_ERROR(i2c_param_config(EXAMPLE_TOUCH_I2C_NUM, &i2c_conf), TAG, "I2C configuration failed"); -// ESP_RETURN_ON_ERROR(i2c_driver_install(EXAMPLE_TOUCH_I2C_NUM, i2c_conf.mode, 0, 0, 0), TAG, "I2C initialization failed"); + + -// /* Initialize touch HW */ -// const esp_lcd_touch_config_t tp_cfg = { -// .x_max = EXAMPLE_LCD_H_RES, -// .y_max = EXAMPLE_LCD_V_RES, -// .rst_gpio_num = GPIO_NUM_NC, // Shared with LCD reset -// .int_gpio_num = EXAMPLE_TOUCH_GPIO_INT, -// .levels = { -// .reset = 0, -// .interrupt = 0, -// }, -// .flags = { -// .swap_xy = 0, -// .mirror_x = 1, -// .mirror_y = 0, -// }, -// }; -// esp_lcd_panel_io_handle_t tp_io_handle = NULL; -// const esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_TT21100_CONFIG(); -// ESP_RETURN_ON_ERROR(esp_lcd_new_panel_io_i2c((esp_lcd_i2c_bus_handle_t)EXAMPLE_TOUCH_I2C_NUM, &tp_io_config, &tp_io_handle), TAG, ""); -// return esp_lcd_touch_new_i2c_tt21100(tp_io_handle, &tp_cfg, &touch_handle); -// } -static esp_err_t __lvgl_init(void) +void display_process(void) { - /* Initialize LVGL */ - const lvgl_port_cfg_t lvgl_cfg = { - .task_priority = 4, /* LVGL task priority */ - .task_stack = 4096, /* LVGL task stack size */ - .task_affinity = -1, /* LVGL task pinned to core (-1 is no affinity) */ - .task_max_sleep_ms = 500, /* Maximum sleep in LVGL task */ - .timer_period_ms = 5 /* LVGL timer tick period in ms */ - }; - ESP_RETURN_ON_ERROR(lvgl_port_init(&lvgl_cfg), TAG, "LVGL port initialization failed"); + + bsp_display_lock(0); + // display_slider(); + //Call one at a time to see examples + display_meter(); + // display_image(); + // display_window(); + //display_dropdown(); - /* Add LCD screen */ - ESP_LOGD(TAG, "Add LCD screen"); - const lvgl_port_display_cfg_t disp_cfg = { - .io_handle = lcd_io, - .panel_handle = lcd_panel, - .buffer_size = EXAMPLE_LCD_H_RES * EXAMPLE_LCD_DRAW_BUFF_HEIGHT * sizeof(uint16_t), - .double_buffer = EXAMPLE_LCD_DRAW_BUFF_DOUBLE, - .hres = EXAMPLE_LCD_H_RES, - .vres = EXAMPLE_LCD_V_RES, - .monochrome = false, - /* Rotation values must be same as used in esp_lcd for initial settings of the screen */ - .rotation = { - .swap_xy = false, - .mirror_x = true, - .mirror_y = true, - }, - .flags = { - .buff_dma = true, - } - }; - lvgl_disp = lvgl_port_add_disp(&disp_cfg); - - /* Add touch input (for selected screen) */ - // const lvgl_port_touch_cfg_t touch_cfg = { - // .disp = lvgl_disp, - // .handle = touch_handle, - // }; - // lvgl_touch_indev = lvgl_port_add_touch(&touch_cfg); - - return ESP_OK; + + bsp_display_unlock(); + while(1){} } -static void _app_button_cb(lv_event_t *e) -{ - lv_disp_rot_t rotation = lv_disp_get_rotation(lvgl_disp); - rotation++; - if (rotation > LV_DISP_ROT_270) { - rotation = LV_DISP_ROT_NONE; - } - /* LCD HW rotation */ - lv_disp_set_rotation(lvgl_disp, rotation); -} - -static void show_stuff(void) -{ - lv_obj_t *scr = lv_scr_act(); - - /* Task lock */ - lvgl_port_lock(0); - - /* Your LVGL objects code here .... */ - /* Label */ - lv_obj_t *label = lv_label_create(scr); - lv_label_set_recolor(label, true); - lv_obj_set_width(label, EXAMPLE_LCD_H_RES); - lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_CENTER, 0); - lv_label_set_text(label, "#FF0000 "LV_SYMBOL_BELL" Hello world Espressif and LVGL "LV_SYMBOL_BELL"#\n#FF9400 "LV_SYMBOL_WARNING" For simplier initialization, use BSP "LV_SYMBOL_WARNING" #"); - lv_obj_align(label, LV_ALIGN_CENTER, 0, -30); - - /* Button */ - lv_obj_t *btn = lv_btn_create(scr); - label = lv_label_create(btn); - lv_label_set_text_static(label, "Rotate screen"); - lv_obj_align(btn, LV_ALIGN_BOTTOM_MID, 0, -30); - lv_obj_add_event_cb(btn, _app_button_cb, LV_EVENT_CLICKED, NULL); - /* Task unlock */ - lvgl_port_unlock(); -} -void display_init(void) -{ - /* LCD HW initialization */ - ESP_ERROR_CHECK(__lcd_init()); - - /* Touch initialization */ -// ESP_ERROR_CHECK(app_touch_init()); - - /* LVGL initialization */ - ESP_ERROR_CHECK(__lvgl_init()); - - /* Show LVGL objects */ - show_stuff(); -} \ No newline at end of file diff --git a/main/display.h b/main/display.h --- a/main/display.h +++ b/main/display.h @@ -1,6 +1,80 @@ #ifndef _DISPLAY_H_ #define _DISPLAY_H_ + + + +#include "lvgl.h" +#include "esp_lcd_panel_io.h" +#include "esp_lcd_panel_vendor.h" +#include "esp_lcd_panel_ops.h" +#include "driver/gpio.h" +#include "driver/i2c.h" +// #include "esp_lcd_touch_cst816s.h" + + +//CST816 defines +#define EXAMPLE_I2C_SCL 17 +#define EXAMPLE_I2C_SDA 18 +#define PIN_TOUCH_RES 21 +#define EXAMPLE_I2C_NUM 0 // I2C number + + +#define EXAMPLE_LCD_PIXEL_CLOCK_HZ (10 * 1000 * 1000) + +#define EXAMPLE_LCD_BK_LIGHT_ON_LEVEL 1 +#define EXAMPLE_LCD_BK_LIGHT_OFF_LEVEL !EXAMPLE_LCD_BK_LIGHT_ON_LEVEL +#define EXAMPLE_PIN_NUM_DATA0 39 // 6 +#define EXAMPLE_PIN_NUM_DATA1 40 // 7 +#define EXAMPLE_PIN_NUM_DATA2 41 // 8 +#define EXAMPLE_PIN_NUM_DATA3 42 // 9 +#define EXAMPLE_PIN_NUM_DATA4 45 // 10 +#define EXAMPLE_PIN_NUM_DATA5 46 // 11 +#define EXAMPLE_PIN_NUM_DATA6 47 // 12 +#define EXAMPLE_PIN_NUM_DATA7 48 // 13 +#define EXAMPLE_PIN_NUM_PCLK 8 // 5 +#define EXAMPLE_PIN_NUM_CS 6 // 3 +#define EXAMPLE_PIN_NUM_DC 7 // 4 +#define EXAMPLE_PIN_NUM_RST 5 // 2 +#define EXAMPLE_PIN_NUM_BK_LIGHT 38 // 1 +#define EXAMPLE_PIN_NUM_POWER 15 +#define PIN_LCD_RD 9 + +// The pixel number in horizontal and vertical +#define EXAMPLE_LCD_H_RES 320 +#define EXAMPLE_LCD_V_RES 170 +#define LVGL_LCD_BUF_SIZE (EXAMPLE_LCD_H_RES * EXAMPLE_LCD_V_RES) +// Bit number used to represent command and parameter +#define EXAMPLE_LCD_CMD_BITS 8 +#define EXAMPLE_LCD_PARAM_BITS 8 + +#define EXAMPLE_LVGL_TICK_PERIOD_MS 2 + +// Supported alignment: 16, 32, 64. A higher alignment can enables higher burst transfer size, thus a higher i80 bus throughput. +#define EXAMPLE_PSRAM_DATA_ALIGNMENT 32 + +//Change this to 0 if you do not wish to use Touch. +#define USE_TOUCH_DISPLAY 0 + + +void display_meter(); +void display_window(); +void display_image(); +void display_slider(); +void display_red_square(); +void display_dropdown(); + +void get_img_color(); + +void bsp_display_unlock(void); +bool bsp_display_lock(uint32_t timeout_ms); + + + + + void display_init(void); +void display_process(void); + #endif \ No newline at end of file diff --git a/main/main.c b/main/main.c --- a/main/main.c +++ b/main/main.c @@ -38,12 +38,17 @@ void app_main(void) // Connect to wifi - wifi_init(); + //wifi_init(); // Initialize canbus - can_init(); + //can_init(); // Initialize display display_init(); + while(1) + { + display_process(); + } + } diff --git a/main/ui_helpers.c b/main/ui_helpers.c new file mode 100644 --- /dev/null +++ b/main/ui_helpers.c @@ -0,0 +1,226 @@ +// This file was generated by SquareLine Studio +// SquareLine Studio version: SquareLine Studio 1.3.0 +// LVGL version: 8.3.6 +// Project name: SquareLine_Project + +#include "ui_helpers.h" + +void _ui_bar_set_property(lv_obj_t * target, int id, int val) +{ + if(id == _UI_BAR_PROPERTY_VALUE_WITH_ANIM) lv_bar_set_value(target, val, LV_ANIM_ON); + if(id == _UI_BAR_PROPERTY_VALUE) lv_bar_set_value(target, val, LV_ANIM_OFF); +} + +void _ui_basic_set_property(lv_obj_t * target, int id, int val) +{ + if(id == _UI_BASIC_PROPERTY_POSITION_X) lv_obj_set_x(target, val); + if(id == _UI_BASIC_PROPERTY_POSITION_Y) lv_obj_set_y(target, val); + if(id == _UI_BASIC_PROPERTY_WIDTH) lv_obj_set_width(target, val); + if(id == _UI_BASIC_PROPERTY_HEIGHT) lv_obj_set_height(target, val); +} + +void _ui_dropdown_set_property(lv_obj_t * target, int id, int val) +{ + if(id == _UI_DROPDOWN_PROPERTY_SELECTED) lv_dropdown_set_selected(target, val); +} + +void _ui_image_set_property(lv_obj_t * target, int id, uint8_t * val) +{ + if(id == _UI_IMAGE_PROPERTY_IMAGE) lv_img_set_src(target, val); +} + +void _ui_label_set_property(lv_obj_t * target, int id, const char * val) +{ + if(id == _UI_LABEL_PROPERTY_TEXT) lv_label_set_text(target, val); +} + +void _ui_roller_set_property(lv_obj_t * target, int id, int val) +{ + if(id == _UI_ROLLER_PROPERTY_SELECTED_WITH_ANIM) lv_roller_set_selected(target, val, LV_ANIM_ON); + if(id == _UI_ROLLER_PROPERTY_SELECTED) lv_roller_set_selected(target, val, LV_ANIM_OFF); +} + +void _ui_slider_set_property(lv_obj_t * target, int id, int val) +{ + if(id == _UI_SLIDER_PROPERTY_VALUE_WITH_ANIM) lv_slider_set_value(target, val, LV_ANIM_ON); + if(id == _UI_SLIDER_PROPERTY_VALUE) lv_slider_set_value(target, val, LV_ANIM_OFF); +} + +void _ui_screen_change(lv_obj_t * target, lv_scr_load_anim_t fademode, int spd, int delay) +{ + lv_scr_load_anim(target, fademode, spd, delay, false); +} + +void _ui_arc_increment(lv_obj_t * target, int val) +{ + int old = lv_arc_get_value(target); + lv_arc_set_value(target, old + val); + lv_event_send(target, LV_EVENT_VALUE_CHANGED, 0); +} + +void _ui_bar_increment(lv_obj_t * target, int val, int anm) +{ + int old = lv_bar_get_value(target); + lv_bar_set_value(target, old + val, anm); +} + +void _ui_slider_increment(lv_obj_t * target, int val, int anm) +{ + int old = lv_slider_get_value(target); + lv_slider_set_value(target, old + val, anm); + lv_event_send(target, LV_EVENT_VALUE_CHANGED, 0); +} + +void _ui_keyboard_set_target(lv_obj_t * keyboard, lv_obj_t * textarea) +{ + lv_keyboard_set_textarea(keyboard, textarea); +} + +void _ui_flag_modify(lv_obj_t * target, int32_t flag, int value) +{ + if(value == _UI_MODIFY_FLAG_TOGGLE) { + if(lv_obj_has_flag(target, flag)) lv_obj_clear_flag(target, flag); + else lv_obj_add_flag(target, flag); + } + else if(value == _UI_MODIFY_FLAG_ADD) lv_obj_add_flag(target, flag); + else lv_obj_clear_flag(target, flag); +} +void _ui_state_modify(lv_obj_t * target, int32_t state, int value) +{ + if(value == _UI_MODIFY_STATE_TOGGLE) { + if(lv_obj_has_state(target, state)) lv_obj_clear_state(target, state); + else lv_obj_add_state(target, state); + } + else if(value == _UI_MODIFY_STATE_ADD) lv_obj_add_state(target, state); + else lv_obj_clear_state(target, state); +} + +void _ui_opacity_set(lv_obj_t * target, int val) +{ + lv_obj_set_style_opa(target, val, 0); +} + +void _ui_anim_callback_free_user_data(lv_anim_t * a) +{ + lv_mem_free(a->user_data); + a->user_data = NULL; +} + +void _ui_anim_callback_set_x(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_obj_set_x(usr->target, v); +} + +void _ui_anim_callback_set_y(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_obj_set_y(usr->target, v); +} + +void _ui_anim_callback_set_width(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_obj_set_width(usr->target, v); +} + +void _ui_anim_callback_set_height(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_obj_set_height(usr->target, v); +} + +void _ui_anim_callback_set_opacity(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_obj_set_style_opa(usr->target, v, 0); +} + +void _ui_anim_callback_set_image_zoom(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_img_set_zoom(usr->target, v); +} + +void _ui_anim_callback_set_image_angle(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + lv_img_set_angle(usr->target, v); +} + +void _ui_anim_callback_set_image_frame(lv_anim_t * a, int32_t v) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + usr->val = v; + if(v < 0) v = 0; + if(v >= usr->imgset_size) v = usr->imgset_size - 1; + lv_img_set_src(usr->target, usr->imgset[v]); +} + +int32_t _ui_anim_callback_get_x(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_obj_get_x_aligned(usr->target); +} + +int32_t _ui_anim_callback_get_y(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_obj_get_y_aligned(usr->target); +} + +int32_t _ui_anim_callback_get_width(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_obj_get_width(usr->target); +} + +int32_t _ui_anim_callback_get_height(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_obj_get_height(usr->target); +} + +int32_t _ui_anim_callback_get_opacity(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_obj_get_style_opa(usr->target, 0); +} + +int32_t _ui_anim_callback_get_image_zoom(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_img_get_zoom(usr->target); +} + +int32_t _ui_anim_callback_get_image_angle(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return lv_img_get_angle(usr->target); +} + +int32_t _ui_anim_callback_get_image_frame(lv_anim_t * a) +{ + ui_anim_user_data_t * usr = (ui_anim_user_data_t *)a->user_data; + return usr->val; +} + +void _ui_arc_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * prefix, const char * postfix) +{ + char buf[_UI_TEMPORARY_STRING_BUFFER_SIZE]; + lv_snprintf(buf, sizeof(buf), "%s%d%s", prefix, (int)lv_arc_get_value(src), postfix); + lv_label_set_text(trg, buf); +} + +void _ui_slider_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * prefix, const char * postfix) +{ + char buf[_UI_TEMPORARY_STRING_BUFFER_SIZE]; + lv_snprintf(buf, sizeof(buf), "%s%d%s", prefix, (int)lv_slider_get_value(src), postfix); + lv_label_set_text(trg, buf); +} +void _ui_checked_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * txt_on, const char * txt_off) +{ + if(lv_obj_has_state(src, LV_STATE_CHECKED)) lv_label_set_text(trg, txt_on); + else lv_label_set_text(trg, txt_off); +} + diff --git a/main/ui_helpers.h b/main/ui_helpers.h new file mode 100644 --- /dev/null +++ b/main/ui_helpers.h @@ -0,0 +1,116 @@ +// This file was generated by SquareLine Studio +// SquareLine Studio version: SquareLine Studio 1.3.0 +// LVGL version: 8.3.6 +// Project name: SquareLine_Project + +#ifndef _SQUARELINE_PROJECT_UI_HELPERS_H +#define _SQUARELINE_PROJECT_UI_HELPERS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "lvgl.h" + +#define _UI_TEMPORARY_STRING_BUFFER_SIZE 32 +#define _UI_BAR_PROPERTY_VALUE 0 +#define _UI_BAR_PROPERTY_VALUE_WITH_ANIM 1 +void _ui_bar_set_property(lv_obj_t * target, int id, int val); + +#define _UI_BASIC_PROPERTY_POSITION_X 0 +#define _UI_BASIC_PROPERTY_POSITION_Y 1 +#define _UI_BASIC_PROPERTY_WIDTH 2 +#define _UI_BASIC_PROPERTY_HEIGHT 3 +void _ui_basic_set_property(lv_obj_t * target, int id, int val); + +#define _UI_DROPDOWN_PROPERTY_SELECTED 0 +void _ui_dropdown_set_property(lv_obj_t * target, int id, int val); + +#define _UI_IMAGE_PROPERTY_IMAGE 0 +void _ui_image_set_property(lv_obj_t * target, int id, uint8_t * val); + +#define _UI_LABEL_PROPERTY_TEXT 0 +void _ui_label_set_property(lv_obj_t * target, int id, const char * val); + +#define _UI_ROLLER_PROPERTY_SELECTED 0 +#define _UI_ROLLER_PROPERTY_SELECTED_WITH_ANIM 1 +void _ui_roller_set_property(lv_obj_t * target, int id, int val); + +#define _UI_SLIDER_PROPERTY_VALUE 0 +#define _UI_SLIDER_PROPERTY_VALUE_WITH_ANIM 1 +void _ui_slider_set_property(lv_obj_t * target, int id, int val); + +void _ui_screen_change(lv_obj_t * target, lv_scr_load_anim_t fademode, int spd, int delay); + +void _ui_arc_increment(lv_obj_t * target, int val); + +void _ui_bar_increment(lv_obj_t * target, int val, int anm); + +void _ui_slider_increment(lv_obj_t * target, int val, int anm); + +void _ui_keyboard_set_target(lv_obj_t * keyboard, lv_obj_t * textarea); + +#define _UI_MODIFY_FLAG_ADD 0 +#define _UI_MODIFY_FLAG_REMOVE 1 +#define _UI_MODIFY_FLAG_TOGGLE 2 +void _ui_flag_modify(lv_obj_t * target, int32_t flag, int value); + +#define _UI_MODIFY_STATE_ADD 0 +#define _UI_MODIFY_STATE_REMOVE 1 +#define _UI_MODIFY_STATE_TOGGLE 2 +void _ui_state_modify(lv_obj_t * target, int32_t state, int value); + +void _ui_opacity_set(lv_obj_t * target, int val); + +/** Describes an animation*/ +typedef struct _ui_anim_user_data_t { + lv_obj_t * target; + lv_img_dsc_t ** imgset; + int32_t imgset_size; + int32_t val; +} ui_anim_user_data_t; +void _ui_anim_callback_free_user_data(lv_anim_t * a); + +void _ui_anim_callback_set_x(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_y(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_width(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_height(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_opacity(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_image_zoom(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_image_angle(lv_anim_t * a, int32_t v); + +void _ui_anim_callback_set_image_frame(lv_anim_t * a, int32_t v); + +int32_t _ui_anim_callback_get_x(lv_anim_t * a); + +int32_t _ui_anim_callback_get_y(lv_anim_t * a); + +int32_t _ui_anim_callback_get_width(lv_anim_t * a); + +int32_t _ui_anim_callback_get_height(lv_anim_t * a); + +int32_t _ui_anim_callback_get_opacity(lv_anim_t * a); + +int32_t _ui_anim_callback_get_image_zoom(lv_anim_t * a); + +int32_t _ui_anim_callback_get_image_angle(lv_anim_t * a); + +int32_t _ui_anim_callback_get_image_frame(lv_anim_t * a); + +void _ui_arc_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * prefix, const char * postfix); + +void _ui_slider_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * prefix, const char * postfix); + +void _ui_checked_set_text_value(lv_obj_t * trg, lv_obj_t * src, const char * txt_on, const char * txt_off); + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif diff --git a/main/usb_cdc.c b/main/usb_cdc.c --- a/main/usb_cdc.c +++ b/main/usb_cdc.c @@ -31,8 +31,8 @@ static void __cdc_rx_callback(int itf, c } /* write back */ - tinyusb_cdcacm_write_queue(itf, buf, rx_size); - tinyusb_cdcacm_write_flush(itf, 0); + //tinyusb_cdcacm_write_queue(itf, buf, rx_size); + //tinyusb_cdcacm_write_flush(itf, 0); }