diff --git a/.config b/.config index cab8fd8..df8be68 100644 --- a/.config +++ b/.config @@ -546,9 +546,9 @@ CONFIG_PKG_CJSON_VER="v1.7.17" # CONFIG_PKG_USING_LVGL=y CONFIG_PKG_LVGL_PATH="/packages/multimedia/LVGL/LVGL" -CONFIG_PKG_LVGL_THREAD_PRIO=20 +CONFIG_PKG_LVGL_THREAD_PRIO=25 CONFIG_PKG_LVGL_THREAD_STACK_SIZE=4096 -CONFIG_PKG_LVGL_DISP_REFR_PERIOD=30 +CONFIG_PKG_LVGL_DISP_REFR_PERIOD=10 # CONFIG_PKG_USING_LVGL_SQUARELINE is not set # CONFIG_PKG_LVGL_USING_EXAMPLES is not set CONFIG_PKG_LVGL_USING_DEMOS=y diff --git a/.settings/.rtmenus b/.settings/.rtmenus index 8819bc3..d3b29c8 100644 Binary files a/.settings/.rtmenus and b/.settings/.rtmenus differ diff --git a/applications/SCCM_link.c b/applications/SCCM_link.c index 008bec7..2854755 100644 --- a/applications/SCCM_link.c +++ b/applications/SCCM_link.c @@ -89,7 +89,7 @@ void uart_thread_entry(void *parameter) int start_uart_thread(void) { - rt_thread_t tid = rt_thread_create("sccm",uart_thread_entry,RT_NULL,2048,21,10); + rt_thread_t tid = rt_thread_create("sccm",uart_thread_entry,RT_NULL,2048,11,10); if (tid != RT_NULL) { rt_thread_startup(tid); diff --git a/applications/data/DATA_comm.c b/applications/data/DATA_comm.c index f123ca0..909d091 100644 --- a/applications/data/DATA_comm.c +++ b/applications/data/DATA_comm.c @@ -123,7 +123,7 @@ void pasre_DAT(const char *api, const char *json_str) cJSON_AddItemToObject(dat,"SYSKEY",cJSON_CreateString(machine_ID)); cJSON_AddItemToObject(dat,"Groups",cJSON_CreateString(machine_ID)); } - if (strcmp(api, "SC801") == 0) + else if (strcmp(api, "SC801") == 0) {// 处理 SC801系统信息 char systime[18] = {0}; // 初始化为 0 rt_snprintf(systime, sizeof(systime),"%d-%d-%d_%d:%d:%d", @@ -416,6 +416,7 @@ void pasre_DAT(const char *api, const char *json_str) cJSON_AddItemToObject(dat,"Process",cJSON_CreateString(Process)); cJSON_AddItemToObject(dat,"Step",cJSON_CreateString(Step)); cJSON_AddItemToObject(dat,"User",cJSON_CreateBool(MACHINE_USER)); + cJSON_AddItemToObject(dat,"UserB",cJSON_CreateString("False")); cJSON_AddItemToObject(dat,"InfoS",cJSON_CreateNumber(UserInfoStart)); cJSON_AddItemToObject(dat,"Info",cJSON_CreateString(Info)); cJSON_AddItemToObject(dat,"RUN",cJSON_CreateNumber(RUN)); @@ -549,15 +550,8 @@ void proc_thread_entry(void *parameter) }else { p += strlen("]"); } - //清空输入队列 - for(int16_t i=0;iinput[i]=0; - } - //处理指令分析 pasre_DAT(DATA_api,p); - // 回复 int16_t total_len = strlen(machine_ID) + strlen(json_buffer) + 8; char t_buffer[total_len]; @@ -566,7 +560,11 @@ void proc_thread_entry(void *parameter) }else{ req->output_len=0; } - + //清空输入队列 + for(int16_t i=0;iinput[i]=0; + } // 通知 UART 线程可以发送了 if (req->sem) { diff --git a/applications/wdt.c b/applications/wdt.c index 7ef05f3..82cb6b2 100644 --- a/applications/wdt.c +++ b/applications/wdt.c @@ -69,4 +69,4 @@ static int wdt_sample() return ret; } -INIT_APP_EXPORT(wdt_sample); +//INIT_APP_EXPORT(wdt_sample); diff --git a/drivers/include/drv_sdio.h b/drivers/include/drv_sdio.h index 09d8af5..e3c6ac0 100644 --- a/drivers/include/drv_sdio.h +++ b/drivers/include/drv_sdio.h @@ -44,7 +44,7 @@ #endif #ifndef SDIO_MAX_FREQ -#define SDIO_MAX_FREQ (50 * 1000 * 1000) +#define SDIO_MAX_FREQ (25 * 1000 * 1000) #endif #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) diff --git a/drivers/ltdc.c b/drivers/ltdc.c index 13c603a..7b06df5 100644 --- a/drivers/ltdc.c +++ b/drivers/ltdc.c @@ -458,7 +458,7 @@ int ltdc_init(void) lcdltdc.pwidth = 1024; lcdltdc.pheight = 600; lcdltdc.hsw = 20; lcdltdc.hbp = 160; lcdltdc.hfp = 160; lcdltdc.vsw = 3; lcdltdc.vbp = 23; lcdltdc.vfp = 12; - ltdc_clk_set(128, 40, 5); + ltdc_clk_set(128, 32, 6); } else if (lcdid == 0X7018) { diff --git a/rtconfig.h b/rtconfig.h index 879cbb6..62f6700 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -263,9 +263,9 @@ /* LVGL: powerful and easy-to-use embedded GUI library */ #define PKG_USING_LVGL -#define PKG_LVGL_THREAD_PRIO 20 +#define PKG_LVGL_THREAD_PRIO 25 #define PKG_LVGL_THREAD_STACK_SIZE 4096 -#define PKG_LVGL_DISP_REFR_PERIOD 30 +#define PKG_LVGL_DISP_REFR_PERIOD 10 #define PKG_LVGL_USING_DEMOS #define PKG_LVGL_USING_V080311 #define PKG_LVGL_VER_NUM 0x080311