需要在config中配置lvgl使用malloc申请内存,防止内部ram被使用完
This commit is contained in:
parent
a02b0f8c4b
commit
6481899d82
@ -5,8 +5,8 @@ static SemaphoreHandle_t xSemaphore_frameStream_R;
|
||||
|
||||
uint32_t stream_init(stream_data_t* esp_data_interface,uint32_t max_size)
|
||||
{
|
||||
xSemaphore_frameStream_W = xSemaphoreCreateMutex();// 创建互斥型信号量。
|
||||
xSemaphore_frameStream_R = xSemaphoreCreateMutex();// 创建互斥型信号量。
|
||||
xSemaphore_frameStream_W = xSemaphoreCreateMutex();// 创建互斥型信号量。
|
||||
xSemaphore_frameStream_R = xSemaphoreCreateMutex();// 创建互斥型信号量。
|
||||
esp_data_interface->max_size = max_size;
|
||||
esp_data_interface->buffer = malloc(max_size);
|
||||
if(esp_data_interface->buffer == NULL)
|
||||
@ -21,7 +21,7 @@ void frameStreamWrite(stream_data_t* esp_data_interface,uint8_t *buf, uint32_t l
|
||||
{
|
||||
uint32_t i;
|
||||
uint8_t *p;
|
||||
xSemaphoreTake( xSemaphore_frameStream_W, portMAX_DELAY );//获得资源的使用权
|
||||
xSemaphoreTake( xSemaphore_frameStream_W, portMAX_DELAY );//获得资源的使用权
|
||||
p = &esp_data_interface->buffer[0];
|
||||
|
||||
for (i = 0; i < length; i++)
|
||||
@ -29,14 +29,14 @@ void frameStreamWrite(stream_data_t* esp_data_interface,uint8_t *buf, uint32_t l
|
||||
*(p + (esp_data_interface->write)) = buf[i];
|
||||
esp_data_interface->write = (esp_data_interface->write + 1) % ((esp_data_interface->max_size));
|
||||
}
|
||||
xSemaphoreGive( xSemaphore_frameStream_W );//释放
|
||||
xSemaphoreGive( xSemaphore_frameStream_W );//释放
|
||||
}
|
||||
|
||||
void frameStreamRead(stream_data_t* esp_data_interface,uint8_t *buf, uint32_t length)
|
||||
{
|
||||
uint32_t i;
|
||||
uint8_t *p;
|
||||
xSemaphoreTake( xSemaphore_frameStream_R, portMAX_DELAY );//获得资源的使用权
|
||||
xSemaphoreTake( xSemaphore_frameStream_R, portMAX_DELAY );//获得资源的使用权
|
||||
p = &esp_data_interface->buffer[0];
|
||||
|
||||
for (i = 0; i < length; i++)
|
||||
@ -44,7 +44,7 @@ void frameStreamRead(stream_data_t* esp_data_interface,uint8_t *buf, uint32_t le
|
||||
buf[i] = *(p + (esp_data_interface->read));
|
||||
esp_data_interface->read = (esp_data_interface->read + 1) % ((esp_data_interface->max_size));
|
||||
}
|
||||
xSemaphoreGive( xSemaphore_frameStream_R );//释放
|
||||
xSemaphoreGive( xSemaphore_frameStream_R );//释放
|
||||
}
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ uint32_t frameStreamRead_Get_index(stream_data_t* esp_data_interface)
|
||||
}
|
||||
|
||||
|
||||
uint32_t frameStreamRecLen(stream_data_t* esp_data_interface)//已使用缓存字节数
|
||||
uint32_t frameStreamRecLen(stream_data_t* esp_data_interface)//已使用缓存字节数
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
@ -68,7 +68,7 @@ uint32_t frameStreamRecLen(stream_data_t* esp_data_interface)//
|
||||
return (v);
|
||||
}
|
||||
|
||||
uint32_t frameStreamRecEmptyLen(stream_data_t* esp_data_interface)//剩余空间
|
||||
uint32_t frameStreamRecEmptyLen(stream_data_t* esp_data_interface)//剩余空间
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ dependencies:
|
||||
espressif/esp_lvgl_port:
|
||||
dependencies: []
|
||||
source:
|
||||
path: D:\espressif\WorkSpace\esp32-off-Line-tools\components\espressif__esp_lvgl_port
|
||||
path: /Users/yu/esp/esp32-off-Line-tools/components/espressif__esp_lvgl_port
|
||||
type: local
|
||||
version: 2.5.0
|
||||
espressif/esp_tinyusb:
|
||||
|
||||
@ -157,33 +157,6 @@ static esp_err_t app_lvgl_init(void)
|
||||
|
||||
static void app_main_display(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_obj_set_width(label, EXAMPLE_LCD_H_RES);
|
||||
// lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_CENTER, 0);
|
||||
// #if LVGL_VERSION_MAJOR == 8
|
||||
// lv_label_set_recolor(label, true);
|
||||
// lv_label_set_text(label, "Hello world");
|
||||
// #else
|
||||
// lv_label_set_text(label, LV_SYMBOL_BELL" Hello world Espressif and LVGL "LV_SYMBOL_BELL"\n "LV_SYMBOL_WARNING" For simplier initialization, use BSP "LV_SYMBOL_WARNING);
|
||||
// #endif
|
||||
// lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
|
||||
|
||||
// /* 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);
|
||||
|
||||
|
||||
custom_init(&guider_ui);
|
||||
setup_ui(&guider_ui);
|
||||
|
||||
@ -68,6 +68,9 @@ stream_data_t wifi_interface_data;
|
||||
stream_data_t uart_interface_data;
|
||||
Device_info_t off_line_tool;
|
||||
|
||||
// EXT_RAM_BSS_ATTR Sys_config_t System_Config;
|
||||
Sys_config_t System_Config;
|
||||
|
||||
extern void axp_init(void);
|
||||
extern void axp_info();
|
||||
extern void axp_config();
|
||||
@ -173,7 +176,9 @@ void app_main(void)
|
||||
vTaskDelay(1000/ portTICK_PERIOD_MS);
|
||||
// start_web_server();
|
||||
// xTaskCreate(tcp_server_task, "tcp_server", 4096, (void*)AF_INET, 5, NULL);
|
||||
ESP_LOGI(TAG, "mem free:%ld",esp_get_free_heap_size());
|
||||
ESP_LOGI(TAG, "mem free:%ld %d",esp_get_free_heap_size(),sizeof(Sys_config_t));
|
||||
|
||||
// Write_ESPFlash(0x40,0x00,&System_Config,sizeof(Sys_config_t));
|
||||
|
||||
while (1)
|
||||
{
|
||||
|
||||
@ -46,6 +46,14 @@ typedef struct Device_info_
|
||||
spiffs_list_t directory[10];
|
||||
}Device_info_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Device_info_t Device_info;
|
||||
target_chip_t def_target_chip;
|
||||
|
||||
}Sys_config_t;
|
||||
|
||||
|
||||
extern Device_info_t off_line_tool;
|
||||
|
||||
extern stream_data_t uart_interface_data;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
static QueueHandle_t uart0_queue;
|
||||
|
||||
static const char *TAG = "usb_serial";
|
||||
static uint8_t buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE + 1];
|
||||
static EXT_RAM_BSS_ATTR uint8_t buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE + 1];
|
||||
|
||||
#if CONFIG_IDF_TARGET_ESP32S2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user