diff --git a/main/GUI/lvgl_task.c b/main/GUI/lvgl_task.c index 0583823..b2d386d 100644 --- a/main/GUI/lvgl_task.c +++ b/main/GUI/lvgl_task.c @@ -25,18 +25,6 @@ void Gui_Task(void *pvParameter) esp_lcd_panel_io_handle_t io_handle = NULL; esp_lcd_panel_io_spi_config_t io_config = st7735_PANEL_IO_SPI_CONFIG(GPIO_NUM_34,GPIO_NUM_38,NULL,NULL); - // { - // .dc_gpio_num = PIN_NUM_LCD_DC, - // .cs_gpio_num = PIN_NUM_LCD_CS, - // .pclk_hz = LCD_PIXEL_CLOCK_HZ, - // .lcd_cmd_bits = LCD_CMD_BITS, - // .lcd_param_bits = LCD_PARAM_BITS, - // .spi_mode = 0, - // .trans_queue_depth = 10, - // .on_color_trans_done = notify_lvgl_flush_ready, - // //.user_ctx = &disp_drv, - // }; - // Attach the LCD to the SPI bus ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)SPI2_HOST, &io_config, &io_handle)); ESP_LOGI(TAG, "Install st7735 panel driver"); @@ -49,23 +37,19 @@ void Gui_Task(void *pvParameter) ESP_ERROR_CHECK(esp_lcd_new_panel_st7735(io_handle, &panel_config, &panel_handle)); ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_handle)); ESP_ERROR_CHECK(esp_lcd_panel_init(panel_handle)); - // ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel_handle, true, true)); - esp_lcd_panel_swap_xy(panel_handle, true); - esp_lcd_panel_mirror(panel_handle, false, true); ESP_LOGI(TAG, "Turn on LCD backlight"); - // gpio_set_level(PIN_NUM_BK_LIGHT, LCD_BK_LIGHT_ON_LEVEL); esp_lcd_panel_swap_xy(panel_handle, false); - esp_lcd_panel_mirror(panel_handle, true, true); + esp_lcd_panel_mirror(panel_handle, false, false); uint8_t* lcd_data; lcd_data = malloc(128*160*2); - memset(&lcd_data[0],0xff,128*240*2); - esp_lcd_panel_draw_bitmap(panel_handle, 0, 0, 128, 160, &lcd_data[0]); - memset(&lcd_data[0],0x00,320*240*2); - esp_lcd_panel_draw_bitmap(panel_handle, 60, 180, 220, 220, &lcd_data[0]); + memset(&lcd_data[0],0x00,128*160*2); + esp_lcd_panel_draw_bitmap(panel_handle, 0, 0, 64, 80, &lcd_data[0]); + memset(&lcd_data[0],0xff,128*160*2); + esp_lcd_panel_draw_bitmap(panel_handle, 30, 80, 128, 160, &lcd_data[0]); vTaskDelete(NULL); } \ No newline at end of file diff --git a/main/main.c b/main/main.c index d0e60b9..ceb9486 100755 --- a/main/main.c +++ b/main/main.c @@ -101,7 +101,7 @@ void app_main(void) // }; // gpio_config(&input_config); - #if 1//CONFIG_IDF_TARGET_ESP32C3 + #if CONFIG_IDF_TARGET_ESP32C3 usb_serial2Uart(NULL); #endif xTaskCreate(&Gui_Task, "Gui_Task", 1024*20, NULL, 12, NULL); diff --git a/sdkconfig b/sdkconfig index 3867b59..19c25dd 100644 --- a/sdkconfig +++ b/sdkconfig @@ -507,7 +507,6 @@ CONFIG_COMPILER_ORPHAN_SECTIONS_PLACE=y # # CONFIG_APPTRACE_DEST_JTAG is not set CONFIG_APPTRACE_DEST_NONE=y -# CONFIG_APPTRACE_DEST_UART0 is not set # CONFIG_APPTRACE_DEST_UART1 is not set CONFIG_APPTRACE_DEST_UART_NONE=y CONFIG_APPTRACE_UART_TASK_PRIO=1 @@ -962,7 +961,7 @@ CONFIG_SPIRAM_BOOT_INIT=y CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=1024 -CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y +# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set @@ -1035,14 +1034,14 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 -# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set -CONFIG_ESP_CONSOLE_USB_CDC=y +CONFIG_ESP_CONSOLE_UART_DEFAULT=y +# CONFIG_ESP_CONSOLE_USB_CDC is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set # CONFIG_ESP_CONSOLE_NONE is not set -CONFIG_ESP_CONSOLE_UART_NUM=-1 -CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=3 -CONFIG_ESP_CONSOLE_USB_CDC_RX_BUF_SIZE=64 -# CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF is not set +CONFIG_ESP_CONSOLE_UART=y +CONFIG_ESP_CONSOLE_UART_NUM=0 +CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=0 +CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_TASK_WDT_EN=y @@ -1406,7 +1405,6 @@ CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4 CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set -# CONFIG_LWIP_WND_SCALE is not set CONFIG_LWIP_TCP_RTO_TIME=1500 # end of TCP @@ -2003,11 +2001,13 @@ CONFIG_ESP32S2_MEMPROT_FEATURE_LOCK=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 -# CONFIG_CONSOLE_UART_DEFAULT is not set +CONFIG_CONSOLE_UART_DEFAULT=y # CONFIG_CONSOLE_UART_CUSTOM is not set # CONFIG_CONSOLE_UART_NONE is not set # CONFIG_ESP_CONSOLE_UART_NONE is not set -CONFIG_CONSOLE_UART_NUM=-1 +CONFIG_CONSOLE_UART=y +CONFIG_CONSOLE_UART_NUM=0 +CONFIG_CONSOLE_UART_BAUDRATE=115200 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_TASK_WDT=y diff --git a/sdkconfig.old b/sdkconfig.old index 37ca9f2..60f643b 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -960,7 +960,7 @@ CONFIG_SPIRAM_BOOT_INIT=y CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=1024 -CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y +# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set @@ -1040,7 +1040,7 @@ CONFIG_ESP_CONSOLE_USB_CDC=y CONFIG_ESP_CONSOLE_UART_NUM=-1 CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=3 CONFIG_ESP_CONSOLE_USB_CDC_RX_BUF_SIZE=64 -CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF=y +# CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF is not set CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_TASK_WDT_EN=y @@ -1404,7 +1404,6 @@ CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4 CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set -# CONFIG_LWIP_WND_SCALE is not set CONFIG_LWIP_TCP_RTO_TIME=1500 # end of TCP