diff --git a/.config b/.config index 7ec812e..a1d517c 100644 --- a/.config +++ b/.config @@ -325,8 +325,37 @@ CONFIG_RT_USING_POSIX_FS=y # # Utilities # -# CONFIG_RT_USING_RYM is not set -# CONFIG_RT_USING_ULOG is not set +CONFIG_RT_USING_RYM=y +CONFIG_YMODEM_USING_CRC_TABLE=y +CONFIG_YMODEM_USING_FILE_TRANSFER=y +CONFIG_RT_USING_ULOG=y +# CONFIG_ULOG_OUTPUT_LVL_A is not set +# CONFIG_ULOG_OUTPUT_LVL_E is not set +# CONFIG_ULOG_OUTPUT_LVL_W is not set +# CONFIG_ULOG_OUTPUT_LVL_I is not set +CONFIG_ULOG_OUTPUT_LVL_D=y +CONFIG_ULOG_OUTPUT_LVL=7 +# CONFIG_ULOG_USING_ISR_LOG is not set +CONFIG_ULOG_ASSERT_ENABLE=y +CONFIG_ULOG_LINE_BUF_SIZE=128 +# CONFIG_ULOG_USING_ASYNC_OUTPUT is not set + +# +# log format +# +# CONFIG_ULOG_OUTPUT_FLOAT is not set +CONFIG_ULOG_USING_COLOR=y +CONFIG_ULOG_OUTPUT_TIME=y +CONFIG_ULOG_TIME_USING_TIMESTAMP=y +CONFIG_ULOG_OUTPUT_LEVEL=y +CONFIG_ULOG_OUTPUT_TAG=y +CONFIG_ULOG_OUTPUT_THREAD_NAME=y +# end of log format + +CONFIG_ULOG_BACKEND_USING_CONSOLE=y +CONFIG_ULOG_BACKEND_USING_FILE=y +# CONFIG_ULOG_USING_FILTER is not set +# CONFIG_ULOG_USING_SYSLOG is not set # CONFIG_RT_USING_UTEST is not set # CONFIG_RT_USING_VAR_EXPORT is not set # CONFIG_RT_USING_RESOURCE_ID is not set @@ -1047,6 +1076,7 @@ CONFIG_PKG_LITTLEFS_VER="v2.11.2" # CONFIG_PKG_USING_P3T1755 is not set # CONFIG_PKG_USING_QMI8658 is not set # CONFIG_PKG_USING_ICM20948 is not set +# CONFIG_PKG_USING_SCD4X is not set # end of sensors drivers # @@ -1173,6 +1203,7 @@ CONFIG_PKG_RS485_VER="v1.06" # CONFIG_PKG_USING_IKUNLED is not set # CONFIG_PKG_USING_INS5T8025 is not set # CONFIG_PKG_USING_ST7305 is not set +# CONFIG_PKG_USING_TM1668 is not set # CONFIG_PKG_USING_SPI_TOOLS is not set # end of peripheral libraries and drivers diff --git a/.cproject b/.cproject index b1a4b45..2a17e73 100644 --- a/.cproject +++ b/.cproject @@ -172,6 +172,9 @@ + + + @@ -359,6 +362,9 @@ + + + @@ -518,6 +524,9 @@ + + + @@ -683,6 +692,9 @@ + + + @@ -841,6 +853,9 @@ + + + @@ -1008,6 +1023,9 @@ + + + @@ -1175,6 +1193,9 @@ + + + @@ -1343,6 +1364,9 @@ + + + @@ -1498,6 +1522,9 @@ + + + @@ -1516,7 +1543,7 @@ - + diff --git a/.settings/.rtmenus b/.settings/.rtmenus index bc06717..b21dba3 100644 Binary files a/.settings/.rtmenus and b/.settings/.rtmenus differ diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 87b2450..d8b4f9c 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/applications/lvgl/ui_data_labels.c b/applications/lvgl/ui_data_labels.c index 2636ba0..c9b447d 100644 --- a/applications/lvgl/ui_data_labels.c +++ b/applications/lvgl/ui_data_labels.c @@ -447,7 +447,7 @@ void UI_pname_row(void) lv_table_set_col_width(guider_ui.screen_pname_row, 0, 430); lv_table_set_col_width(guider_ui.screen_pname_row, 1, 80); lv_table_set_col_width(guider_ui.screen_pname_row, 2, 200); - rt_kprintf("row : %d\n",select_row); + if(select_row >0 && select_row <255) { //有多少工艺 diff --git a/rt-thread/components/utilities/ymodem/ry_sy.c b/rt-thread/components/utilities/ymodem/ry_sy.c index 89664f1..df4bdcf 100644 --- a/rt-thread/components/utilities/ymodem/ry_sy.c +++ b/rt-thread/components/utilities/ymodem/ry_sy.c @@ -46,10 +46,10 @@ static enum rym_code _rym_recv_begin( rt_size_t len) { struct custom_ctx *cctx = (struct custom_ctx *)ctx; - struct stat file_buf; + //struct stat file_buf; char insert_0 = '\0'; char *ret; - rt_err_t err; + //rt_err_t err; ret = strchr(cctx->fpath,insert_0); if(ret) { diff --git a/rtconfig.h b/rtconfig.h index 7f6435c..a1c5946 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -199,6 +199,26 @@ /* Utilities */ +#define RT_USING_RYM +#define YMODEM_USING_CRC_TABLE +#define YMODEM_USING_FILE_TRANSFER +#define RT_USING_ULOG +#define ULOG_OUTPUT_LVL_D +#define ULOG_OUTPUT_LVL 7 +#define ULOG_ASSERT_ENABLE +#define ULOG_LINE_BUF_SIZE 128 + +/* log format */ + +#define ULOG_USING_COLOR +#define ULOG_OUTPUT_TIME +#define ULOG_TIME_USING_TIMESTAMP +#define ULOG_OUTPUT_LEVEL +#define ULOG_OUTPUT_TAG +#define ULOG_OUTPUT_THREAD_NAME +/* end of log format */ +#define ULOG_BACKEND_USING_CONSOLE +#define ULOG_BACKEND_USING_FILE /* end of Utilities */ /* end of RT-Thread Components */