From c0f455e4132d3ec1f60917a524037f42d70e0ecc Mon Sep 17 00:00:00 2001 From: sc <2401809606@qq.com> Date: Sun, 30 Nov 2025 03:08:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E4=BC=98=E5=85=88=E7=BA=A7=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BA=BF=E7=A8=8B=E5=90=AF=E5=8A=A8=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=20=E8=B0=83=E6=95=B4sql=E7=BA=BF=E7=A8=8B=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=B6=88=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/DATA_uart.c | 3 ++- applications/DATA_uart.h | 15 --------------- applications/disk/SDIO_elmfatfs.c | 4 ++-- applications/main.c | 2 -- applications/sql/DB_SQLite.c | 18 ++---------------- applications/sql/DB_SQLite.h | 2 +- packages/freemodbus-v1.6.0 | 1 - .../dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c | 2 +- rtconfig.h | 2 +- 9 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 applications/DATA_uart.h delete mode 160000 packages/freemodbus-v1.6.0 diff --git a/applications/DATA_uart.c b/applications/DATA_uart.c index a312b8f..3803067 100644 --- a/applications/DATA_uart.c +++ b/applications/DATA_uart.c @@ -89,7 +89,7 @@ void uart_thread_entry(void *parameter) int start_uart_thread(void) { - rt_thread_t tid = rt_thread_create("uart1",uart_thread_entry,RT_NULL,2048,20,10); + rt_thread_t tid = rt_thread_create("uart1",uart_thread_entry,RT_NULL,2048,21,10); if (tid != RT_NULL) { rt_thread_startup(tid); @@ -102,3 +102,4 @@ int start_uart_thread(void) return -1; } } +INIT_COMPONENT_EXPORT(start_uart_thread); diff --git a/applications/DATA_uart.h b/applications/DATA_uart.h deleted file mode 100644 index 12e7c93..0000000 --- a/applications/DATA_uart.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-10-20 Administrator the first version - */ -#ifndef APPLICATIONS_DATA_UART_H_ -#define APPLICATIONS_DATA_UART_H_ - -int start_uart_thread(void); - -#endif /* APPLICATIONS_DATA_UART_H_ */ diff --git a/applications/disk/SDIO_elmfatfs.c b/applications/disk/SDIO_elmfatfs.c index 6c53c85..8d116d2 100644 --- a/applications/disk/SDIO_elmfatfs.c +++ b/applications/disk/SDIO_elmfatfs.c @@ -91,5 +91,5 @@ int stm32_sdcard_mount(void) return RT_EOK; } // 使用 INIT_COMPONENTS_INIT 或 INIT_APP_EXPORT 自动启动 -//INIT_COMPONENTS_INIT(stm32_sdcard_mount); // 在组件初始化阶段运行 -INIT_COMPONENT_EXPORT(stm32_sdcard_mount); +//INIT_COMPONENTS_EXPORT(stm32_sdcard_mount); // 在组件初始化阶段运行 +INIT_DEVICE_EXPORT(stm32_sdcard_mount); diff --git a/applications/main.c b/applications/main.c index e62fd35..a03ac51 100644 --- a/applications/main.c +++ b/applications/main.c @@ -12,7 +12,6 @@ #include #include #include "DB_SQLite.h" -#include "DATA_uart.h" #define DBG_TAG "main" #define DBG_LVL DBG_LOG @@ -24,7 +23,6 @@ int main(void) { rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒 thread_DB_SQLite(); - start_uart_thread(); thread_RUN_LED();//运行指示灯线程 return RT_EOK; } diff --git a/applications/sql/DB_SQLite.c b/applications/sql/DB_SQLite.c index 4b9959a..e9758a4 100644 --- a/applications/sql/DB_SQLite.c +++ b/applications/sql/DB_SQLite.c @@ -52,14 +52,6 @@ static const char *sql_upgrade_workorder = "Time TEXT,lock INT,State INT,ProgramID VARCHAR,Machines VARCHAR,color VARCHAR,ColorNumber VARCHAR,Client VARCHAR,ClothWeight VARCHAR," "ClothSpecies VARCHAR,BathRatio VARCHAR,Total VARCHAR,USER VARCHAR,ColorName VARCHAR,Remark TEXT); "; -static const char *sql_upgrade_run_table = - "CREATE TABLE RUN (WorkOrder VARCHAR,DYELOT VARCHAR,ProgramID VARCHAR,Program VARCHAR,ReDye INT DEFAULT (0)," - "Mode VARCHAR,Step INT,StepID VARCHAR,StepName VARCHAR,ParameterName VARCHAR,P1 DOUBLE,P2 DOUBLE,P3 DOUBLE," - "P4 DOUBLE,P5 DOUBLE,P6 INT,P7 INT,P8 INT,P9 INT,P10 INT,Remark VARCHAR,StepTime INT,StepID_S1 VARCHAR," - "StepID_S2 VARCHAR,StepID_S3 VARCHAR,StepName_S1 VARCHAR,StepName_S2 VARCHAR,StepName_S3 VARCHAR,P1_S1 DOUBLE," - "P1_S2 DOUBLE,P1_S3 DOUBLE,P2_S1 DOUBLE,P2_S2 DOUBLE,P2_S3 DOUBLE,P3_S1 DOUBLE,P3_S2 DOUBLE,P3_S3 DOUBLE," - "P4_S1 DOUBLE,P4_S2 DOUBLE,P4_S3 DOUBLE,P5_S1 DOUBLE,P5_S2 DOUBLE,P5_S3 DOUBLE); "; - static const char *sql_upgrade_dyelot_table = "CREATE TABLE Dyelot (WorkOrder VARCHAR,Dyelot VARCHAR,ReDye INT,Machine VARCHAR,Step INT,Tank INT,State INT,ProductCode VARCHAR," "ProductName VARCHAR,ProductType INT,Grams FLOAT,Amount FLOAT,CALL_TIME VARCHAR,DispenseEndTime VARCHAR,Type INT); "; @@ -219,12 +211,6 @@ void db_sqlite_init_full(void) }else{ LOG_E("[DataBASE]WorkOrder Creation failed "); } - if(sqlite3_exec(g_db,sql_upgrade_run_table, 0, 0, 0)==0) - { - LOG_D("[DataBASE]RUN Created successfully "); - }else{ - LOG_E("[DataBASE]RUN Creation failed "); - } if(sqlite3_exec(g_db,sql_upgrade_dyelot_table, 0, 0, 0)==0) { LOG_D("[DataBASE]Dyelot Created successfully "); @@ -409,7 +395,7 @@ rt_err_t db_send_command(enum db_cmd_type type, const char* sql, rt_int32_t time // 等待数据库线程处理完成 rt_err_t result = rt_sem_take(sem, wait_ticks); - //rt_sem_delete(sem); + rt_sem_delete(sem); return result; } @@ -417,7 +403,7 @@ rt_err_t db_send_command(enum db_cmd_type type, const char* sql, rt_int32_t time void thread_DB_SQLite(void) { rt_thread_t tid; - tid = rt_thread_create("db_sql", db_sqlite, RT_NULL, 1024 *48, 20, 10); + tid = rt_thread_create("db_sql", db_sqlite, RT_NULL, 1024 *16, 18, 10); if (tid != RT_NULL) { diff --git a/applications/sql/DB_SQLite.h b/applications/sql/DB_SQLite.h index f580bd1..028337b 100644 --- a/applications/sql/DB_SQLite.h +++ b/applications/sql/DB_SQLite.h @@ -33,7 +33,7 @@ extern "C" { #endif #ifndef DB_QUEUE_SIZE -#define DB_QUEUE_SIZE (8) /**< 消息队列容量（最多缓存 8 条命令） */ +#define DB_QUEUE_SIZE (16) /**< 消息队列容量（最多缓存 8 条命令） */ #endif /* 补充常见错误码（如果 RT-Thread 未定义） */ diff --git a/packages/freemodbus-v1.6.0 b/packages/freemodbus-v1.6.0 deleted file mode 160000 --- a/packages/freemodbus-v1.6.0 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0000000000000000000000000000000000000000 diff --git a/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c b/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c index b6a4034..c87be82 100644 --- a/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c +++ b/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c @@ -494,7 +494,7 @@ int dfs_tmpfs_stat(struct dfs_filesystem *fs, if (d_file == NULL) return -ENOENT; - st->st_dev = fs->dev_id;//(rt_device_t)dfs_filesystem_lookup(fs->path) + st->st_dev = (rt_device_t)dfs_filesystem_lookup(fs->path); st->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH; if (d_file->type == TMPFS_TYPE_DIR) diff --git a/rtconfig.h b/rtconfig.h index 588842e..698c983 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -73,7 +73,7 @@ #define RT_USING_FINSH #define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" -#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_PRIORITY 30 #define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5