sc/828
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sqlite部分修改

Browse Source
This commit is contained in:
sc committed 2025-10-22 09:07:59 +08:00
1 parent 855a50bfeb
commit aaef920fcc
6 files changed
+92 -176
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.config
+1 -3
View File
@@ -174,9 +174,7 @@ CONFIG_RT_USING_PIN=y
# CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NOR is not set
# CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_MTD_NAND is not set
# CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_PM is not set
CONFIG_RT_USING_RTC=y # CONFIG_RT_USING_RTC is not set
CONFIG_RT_USING_ALARM=y
# CONFIG_RT_USING_SOFT_RTC is not set
CONFIG_RT_USING_SDIO=y CONFIG_RT_USING_SDIO=y
CONFIG_RT_SDIO_STACK_SIZE=1024 CONFIG_RT_SDIO_STACK_SIZE=1024
CONFIG_RT_SDIO_THREAD_PRIORITY=15 CONFIG_RT_SDIO_THREAD_PRIORITY=15
.cproject
+1 -1
View File
@@ -498,7 +498,7 @@
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="//cubemx/Drivers|//cubemx/EWARM|//cubemx/Src/stm32f4xx_it.c|//cubemx/Src/system_stm32f4xx.c|//packages/sqlite-v3.19.3/rtthread_io_methods.c|//packages/sqlite-v3.19.3/rtthread_mutex.c|//packages/sqlite-v3.19.3/rtthread_vfs.c|//packages/sqlite-v3.19.3/shell.c|//packages/sqlite-v3.19.3/student_dao.c|//rt-thread/components/dfs/filesystems/nfs|//rt-thread/components/dfs/filesystems/ramfs|//rt-thread/components/dfs/filesystems/romfs|//rt-thread/components/dfs/filesystems/skeleton|//rt-thread/components/drivers/audio|//rt-thread/components/drivers/can|//rt-thread/components/drivers/cputime|//rt-thread/components/drivers/hwcrypto|//rt-thread/components/drivers/hwtimer|//rt-thread/components/drivers/i2c|//rt-thread/components/drivers/misc/adc.c|//rt-thread/components/drivers/misc/dac.c|//rt-thread/components/drivers/misc/pulse_encoder.c|//rt-thread/components/drivers/misc/rt_drv_pwm.c|//rt-thread/components/drivers/misc/rt_inputcapture.c|//rt-thread/components/drivers/mtd|//rt-thread/components/drivers/phy|//rt-thread/components/drivers/pm|//rt-thread/components/drivers/rtc/soft_rtc.c|//rt-thread/components/drivers/sensors|//rt-thread/components/drivers/serial/serial_v2.c|//rt-thread/components/drivers/spi|//rt-thread/components/drivers/touch|//rt-thread/components/drivers/usb|//rt-thread/components/drivers/watchdog|//rt-thread/components/drivers/wlan|//rt-thread/components/fal|//rt-thread/components/libc/compilers/armlibc|//rt-thread/components/libc/compilers/dlib|//rt-thread/components/libc/cplusplus|//rt-thread/components/libc/posix|//rt-thread/components/lwp|//rt-thread/components/net|//rt-thread/components/utilities|//rt-thread/components/vbus|//rt-thread/components/vmm|//rt-thread/libcpu/aarch64|//rt-thread/libcpu/arc|//rt-thread/libcpu/arm/AT91SAM7S|//rt-thread/libcpu/arm/AT91SAM7X|//rt-thread/libcpu/arm/am335x|//rt-thread/libcpu/arm/arm926|//rt-thread/libcpu/arm/armv6|//rt-thread/libcpu/arm/common/divsi3.S|//rt-thread/libcpu/arm/cortex-a|//rt-thread/libcpu/arm/cortex-m0|//rt-thread/libcpu/arm/cortex-m23|//rt-thread/libcpu/arm/cortex-m3|//rt-thread/libcpu/arm/cortex-m33|//rt-thread/libcpu/arm/cortex-m4/context_iar.S|//rt-thread/libcpu/arm/cortex-m4/context_rvds.S|//rt-thread/libcpu/arm/cortex-m7|//rt-thread/libcpu/arm/cortex-r4|//rt-thread/libcpu/arm/dm36x|//rt-thread/libcpu/arm/lpc214x|//rt-thread/libcpu/arm/lpc24xx|//rt-thread/libcpu/arm/realview-a8-vmm|//rt-thread/libcpu/arm/s3c24x0|//rt-thread/libcpu/arm/s3c44b0|//rt-thread/libcpu/arm/sep4020|//rt-thread/libcpu/arm/zynqmp-r5|//rt-thread/libcpu/avr32|//rt-thread/libcpu/blackfin|//rt-thread/libcpu/c-sky|//rt-thread/libcpu/ia32|//rt-thread/libcpu/m16c|//rt-thread/libcpu/mips|//rt-thread/libcpu/nios|//rt-thread/libcpu/ppc|//rt-thread/libcpu/risc-v|//rt-thread/libcpu/rx|//rt-thread/libcpu/sim|//rt-thread/libcpu/sparc-v8|//rt-thread/libcpu/ti-dsp|//rt-thread/libcpu/unicore32|//rt-thread/libcpu/v850|//rt-thread/libcpu/xilinx|//rt-thread/src/cpu.c|//rt-thread/src/memheap.c|//rt-thread/src/signal.c|//rt-thread/src/slab.c|//rt-thread/tools" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="" /> <entry excluding="//cubemx/Drivers|//cubemx/EWARM|//cubemx/Src/stm32f4xx_it.c|//cubemx/Src/system_stm32f4xx.c|//packages/sqlite-v3.19.3/rtthread_io_methods.c|//packages/sqlite-v3.19.3/rtthread_mutex.c|//packages/sqlite-v3.19.3/rtthread_vfs.c|//packages/sqlite-v3.19.3/shell.c|//packages/sqlite-v3.19.3/student_dao.c|//rt-thread/components/dfs/filesystems/nfs|//rt-thread/components/dfs/filesystems/ramfs|//rt-thread/components/dfs/filesystems/romfs|//rt-thread/components/dfs/filesystems/skeleton|//rt-thread/components/drivers/audio|//rt-thread/components/drivers/can|//rt-thread/components/drivers/cputime|//rt-thread/components/drivers/hwcrypto|//rt-thread/components/drivers/hwtimer|//rt-thread/components/drivers/i2c|//rt-thread/components/drivers/misc/adc.c|//rt-thread/components/drivers/misc/dac.c|//rt-thread/components/drivers/misc/pulse_encoder.c|//rt-thread/components/drivers/misc/rt_drv_pwm.c|//rt-thread/components/drivers/misc/rt_inputcapture.c|//rt-thread/components/drivers/mtd|//rt-thread/components/drivers/phy|//rt-thread/components/drivers/pm|//rt-thread/components/drivers/rtc|//rt-thread/components/drivers/sensors|//rt-thread/components/drivers/serial/serial_v2.c|//rt-thread/components/drivers/spi|//rt-thread/components/drivers/touch|//rt-thread/components/drivers/usb|//rt-thread/components/drivers/watchdog|//rt-thread/components/drivers/wlan|//rt-thread/components/fal|//rt-thread/components/libc/compilers/armlibc|//rt-thread/components/libc/compilers/dlib|//rt-thread/components/libc/cplusplus|//rt-thread/components/libc/posix|//rt-thread/components/lwp|//rt-thread/components/net|//rt-thread/components/utilities|//rt-thread/components/vbus|//rt-thread/components/vmm|//rt-thread/libcpu/aarch64|//rt-thread/libcpu/arc|//rt-thread/libcpu/arm/AT91SAM7S|//rt-thread/libcpu/arm/AT91SAM7X|//rt-thread/libcpu/arm/am335x|//rt-thread/libcpu/arm/arm926|//rt-thread/libcpu/arm/armv6|//rt-thread/libcpu/arm/common/divsi3.S|//rt-thread/libcpu/arm/cortex-a|//rt-thread/libcpu/arm/cortex-m0|//rt-thread/libcpu/arm/cortex-m23|//rt-thread/libcpu/arm/cortex-m3|//rt-thread/libcpu/arm/cortex-m33|//rt-thread/libcpu/arm/cortex-m4/context_iar.S|//rt-thread/libcpu/arm/cortex-m4/context_rvds.S|//rt-thread/libcpu/arm/cortex-m7|//rt-thread/libcpu/arm/cortex-r4|//rt-thread/libcpu/arm/dm36x|//rt-thread/libcpu/arm/lpc214x|//rt-thread/libcpu/arm/lpc24xx|//rt-thread/libcpu/arm/realview-a8-vmm|//rt-thread/libcpu/arm/s3c24x0|//rt-thread/libcpu/arm/s3c44b0|//rt-thread/libcpu/arm/sep4020|//rt-thread/libcpu/arm/zynqmp-r5|//rt-thread/libcpu/avr32|//rt-thread/libcpu/blackfin|//rt-thread/libcpu/c-sky|//rt-thread/libcpu/ia32|//rt-thread/libcpu/m16c|//rt-thread/libcpu/mips|//rt-thread/libcpu/nios|//rt-thread/libcpu/ppc|//rt-thread/libcpu/risc-v|//rt-thread/libcpu/rx|//rt-thread/libcpu/sim|//rt-thread/libcpu/sparc-v8|//rt-thread/libcpu/ti-dsp|//rt-thread/libcpu/unicore32|//rt-thread/libcpu/v850|//rt-thread/libcpu/xilinx|//rt-thread/src/cpu.c|//rt-thread/src/memheap.c|//rt-thread/src/signal.c|//rt-thread/src/slab.c|//rt-thread/tools" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="" />
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>
applications/DBSQL/DB_SQLite.c
+87 -164
View File
@@ -21,10 +21,10 @@ int db_HelperInit;
sqlite3 **db; sqlite3 **db;
static const char *sql_upgrade_workorder_steps = static const char *sql_upgrade_workorder_steps =
"PRAGMA foreign_keys = OFF; " // "PRAGMA foreign_keys = OFF; "
"BEGIN TRANSACTION; " // "BEGIN TRANSACTION; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkorderSteps; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkorderSteps; "
"DROP TABLE WorkorderSteps; " // "DROP TABLE WorkorderSteps; "
"CREATE TABLE WorkorderSteps (" "CREATE TABLE WorkorderSteps ("
"WorkOrder VARCHAR," "WorkOrder VARCHAR,"
"DYELOT VARCHAR," "DYELOT VARCHAR,"
@@ -69,34 +69,13 @@ static const char *sql_upgrade_workorder_steps =
"Parameter5_S1 DOUBLE," "Parameter5_S1 DOUBLE,"
"Parameter5_S2 DOUBLE," "Parameter5_S2 DOUBLE,"
"Parameter5_S3 DOUBLE" "Parameter5_S3 DOUBLE"
"); " "); ";
"INSERT INTO WorkorderSteps ("
"WorkOrder, DYELOT, ProgramID, Program, ReDye, Mode, Step, StepID, StepName, "
"ParameterName, Parameter1, Parameter2, Parameter3, Parameter4, Parameter5, "
"Parameter6, Parameter7, Parameter8, Parameter9, Parameter10, Remark, StepTime, "
"StepID_S1, StepID_S2, StepID_S3, StepName_S1, StepName_S2, StepName_S3, "
"Parameter1_S1, Parameter1_S2, Parameter1_S3, Parameter2_S1, Parameter2_S2, Parameter2_S3, "
"Parameter3_S1, Parameter3_S2, Parameter3_S3, Parameter4_S1, Parameter4_S2, Parameter4_S3, "
"Parameter5_S1, Parameter5_S2, Parameter5_S3"
") "
"SELECT "
"WorkOrder, DYELOT, ProgramID, Program, ReDye, Mode, Step, StepID, StepName, "
"ParameterName, Parameter1, Parameter2, Parameter3, Parameter4, Parameter5, "
"Parameter6, Parameter7, Parameter8, Parameter9, Parameter10, Remark, StepTime, "
"StepID_S1, StepID_S2, StepID_S3, StepName_S1, StepName_S2, StepName_S3, "
"Parameter1_S1, Parameter1_S2, Parameter1_S3, Parameter2_S1, Parameter2_S2, Parameter2_S3, "
"Parameter3_S1, Parameter3_S2, Parameter3_S3, Parameter4_S1, Parameter4_S2, Parameter4_S3, "
"Parameter5_S1, Parameter5_S2, Parameter5_S3 "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_workorder_set = static const char *sql_upgrade_workorder_set =
"PRAGMA foreign_keys = OFF; " // "PRAGMA foreign_keys = OFF; "
"BEGIN TRANSACTION; " // "BEGIN TRANSACTION; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkOrderSet; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkOrderSet; "
"DROP TABLE WorkOrderSet; " // "DROP TABLE WorkOrderSet; "
"CREATE TABLE WorkOrderSet (" "CREATE TABLE WorkOrderSet ("
"WorkOrder VARCHAR," "WorkOrder VARCHAR,"
"ReDye INT DEFAULT (0)," "ReDye INT DEFAULT (0),"
@@ -105,22 +84,13 @@ static const char *sql_upgrade_workorder_set =
"Swing INT," "Swing INT,"
"ClothWheel INT," "ClothWheel INT,"
"Nozzle INT" "Nozzle INT"
"); " "); ";
"INSERT INTO WorkOrderSet ("
"WorkOrder, ReDye, PumpSpeed, Blower, Swing, ClothWheel, Nozzle"
") "
"SELECT "
"WorkOrder, ReDye, PumpSpeed, Blower, Swing, ClothWheel, Nozzle "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_workorder = static const char *sql_upgrade_workorder =
"PRAGMA foreign_keys = OFF; " // "PRAGMA foreign_keys = OFF; "
"BEGIN TRANSACTION; " // "BEGIN TRANSACTION; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkOrder; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM WorkOrder; "
"DROP TABLE WorkOrder; " //// "DROP TABLE WorkOrder; "
"CREATE TABLE WorkOrder (" "CREATE TABLE WorkOrder ("
"WorkOrder VARCHAR," "WorkOrder VARCHAR,"
"Dyelot VARCHAR," "Dyelot VARCHAR,"
@@ -143,26 +113,13 @@ static const char *sql_upgrade_workorder =
"USER VARCHAR," "USER VARCHAR,"
"ColorName VARCHAR," "ColorName VARCHAR,"
"Remark TEXT" "Remark TEXT"
"); " "); ";
"INSERT INTO WorkOrder ("
"WorkOrder, Dyelot, ReDye, ProgramName, StartTime, EndTime, Time, "
"lock, State, ProgramID, Machines, color, ColorNumber, Client, "
"ClothWeight, ClothSpecies, BathRatio, Total, USER, ColorName, Remark"
") "
"SELECT "
"WorkOrder, Dyelot, ReDye, ProgramName, StartTime, EndTime, Time, "
"lock, State, ProgramID, Machines, color, ColorNumber, Client, "
"ClothWeight, ClothSpecies, BathRatio, Total, USER, ColorName, Remark "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_run_table = static const char *sql_upgrade_run_table =
"PRAGMA foreign_keys = OFF; " // "PRAGMA foreign_keys = OFF; "
"BEGIN TRANSACTION; " // "BEGIN TRANSACTION; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM RUN; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM RUN; "
"DROP TABLE RUN; " // "DROP TABLE RUN; "
"CREATE TABLE RUN (" "CREATE TABLE RUN ("
"WorkOrder VARCHAR," "WorkOrder VARCHAR,"
"DYELOT VARCHAR," "DYELOT VARCHAR,"
@@ -208,44 +165,13 @@ static const char *sql_upgrade_run_table =
"Parameter5_S1 DOUBLE," "Parameter5_S1 DOUBLE,"
"Parameter5_S2 DOUBLE," "Parameter5_S2 DOUBLE,"
"Parameter5_S3 DOUBLE" "Parameter5_S3 DOUBLE"
"); " ");";
"INSERT INTO RUN ("
"WorkOrder, DYELOT, ReDye, RUN, Mode, ProgramID, Program, "
"StepID, Step, StepName, ParameterName, "
"Parameter1, Parameter2, Parameter3, Parameter4, Parameter5, "
"Parameter6, Parameter7, Parameter8, Parameter9, Parameter10, "
"Remark, StepTime, "
"StepID_S1, StepID_S2, StepID_S3, "
"StepName_S1, StepName_S2, StepName_S3, "
"Parameter1_S1, Parameter1_S2, Parameter1_S3, "
"Parameter2_S1, Parameter2_S2, Parameter2_S3, "
"Parameter3_S1, Parameter3_S2, Parameter3_S3, "
"Parameter4_S1, Parameter4_S2, Parameter4_S3, "
"Parameter5_S1, Parameter5_S2, Parameter5_S3"
") "
"SELECT "
"WorkOrder, DYELOT, ReDye, RUN, Mode, ProgramID, Program, "
"StepID, Step, StepName, ParameterName, "
"Parameter1, Parameter2, Parameter3, Parameter4, Parameter5, "
"Parameter6, Parameter7, Parameter8, Parameter9, Parameter10, "
"Remark, StepTime, "
"StepID_S1, StepID_S2, StepID_S3, "
"StepName_S1, StepName_S2, StepName_S3, "
"Parameter1_S1, Parameter1_S2, Parameter1_S3, "
"Parameter2_S1, Parameter2_S2, Parameter2_S3, "
"Parameter3_S1, Parameter3_S2, Parameter3_S3, "
"Parameter4_S1, Parameter4_S2, Parameter4_S3, "
"Parameter5_S1, Parameter5_S2, Parameter5_S3 "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_dyelot_table = static const char *sql_upgrade_dyelot_table =
"PRAGMA foreign_keys = OFF; " // "PRAGMA foreign_keys = OFF; "
"BEGIN TRANSACTION; " // "BEGIN TRANSACTION; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM Dyelot; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM Dyelot; "
"DROP TABLE Dyelot; " // "DROP TABLE Dyelot; "
"CREATE TABLE Dyelot (" "CREATE TABLE Dyelot ("
"WorkOrder VARCHAR," "WorkOrder VARCHAR,"
"Dyelot VARCHAR," "Dyelot VARCHAR,"
@@ -262,56 +188,30 @@ static const char *sql_upgrade_dyelot_table =
"CALL_TIME VARCHAR," "CALL_TIME VARCHAR,"
"DispenseEndTime VARCHAR," "DispenseEndTime VARCHAR,"
"Type INT" "Type INT"
"); " "); ";
"INSERT INTO Dyelot ("
"WorkOrder, Dyelot, ReDye, Machine, Step, Tank, State, "
"ProductCode, ProductName, ProductType, Grams, Amount, "
"CALL_TIME, DispenseEndTime, Type"
") "
"SELECT "
"WorkOrder, Dyelot, Redye, Machine, Step, Tank, State, "
"ProductCode, ProductName, ProductType, Grams, Amount, "
"CALL_TIME, DispenseEndTime, Type "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_iolog_table = static const char *sql_upgrade_iolog_table =
"PRAGMA foreign_keys = OFF; " // "CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM IOLog; "
"BEGIN TRANSACTION; " // "DROP TABLE IOLog; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM IOLog; "
"DROP TABLE IOLog; "
"CREATE TABLE IOLog (" "CREATE TABLE IOLog ("
"ID VARCHAR," "ID varchar(32),"
"IOName VARCHAR," "IOName varchar(32),"
"type VARCHAR," "type varchar(32),"
"Value DOUBLE DEFAULT (0)," "Value DOUBLE DEFAULT (0),"
"DIO BOOLEAN," "DIO BOOLEAN,"
"AIO INTEGER DEFAULT (0)," "AIO INTEGER DEFAULT (0),"
"PLC VARCHAR" "PLC varchar(32)"
"); " "); ";
"INSERT INTO IOLog ("
"ID, IOName, type, Value, DIO, AIO, PLC"
") "
"SELECT "
"ID, IOName, type, Value, DIO, AIO, PLC "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
static const char *sql_upgrade_chart_table = static const char *sql_upgrade_chart_table =
"PRAGMA foreign_keys = OFF; " //"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM Chart; "
"BEGIN TRANSACTION; " // "DROP TABLE Chart; "
"CREATE TABLE sqlitestudio_temp_table AS SELECT * FROM Chart; "
"DROP TABLE Chart; "
"CREATE TABLE Chart (" "CREATE TABLE Chart ("
"WorkOrder VARCHAR," "WorkOrder varchar(32),"
"DYELOT VARCHAR," "DYELOT varchar(32),"
"ReDye INT," "ReDye INTEGER ,"
"Name VARCHAR," "Name varchar(32),"
"Time VARCHAR," "Time varchar(32),"
"MTT DOUBLE DEFAULT (0)," "MTT DOUBLE DEFAULT (0),"
"MTL DOUBLE DEFAULT (0)," "MTL DOUBLE DEFAULT (0),"
"STTA DOUBLE DEFAULT (0)," "STTA DOUBLE DEFAULT (0),"
@@ -324,38 +224,61 @@ static const char *sql_upgrade_chart_table =
"MST DOUBLE DEFAULT (0)," "MST DOUBLE DEFAULT (0),"
"MSL DOUBLE DEFAULT (0)," "MSL DOUBLE DEFAULT (0),"
"MUT DOUBLE DEFAULT (0)" "MUT DOUBLE DEFAULT (0)"
"); " "); ";
"INSERT INTO Chart ("
"WorkOrder, DYELOT, ReDye, Name, Time, "
"MTT, MTL, STTA, STLA, STTB, STLB, STTC, STLC, "
"MTH, MST, MSL, MUT"
") "
"SELECT WorkOrder, DYELOT, COALESCE(ReDye, 0), Name, Time, "
"MTT, MTL, STTA, STLA, STTB, STLB, STTC, STLC, "
"MTH, MST, MSL, MUT "
"FROM sqlitestudio_temp_table; "
"DROP TABLE sqlitestudio_temp_table; "
"CREATE UNIQUE INDEX IF NOT EXISTS idx_chart_time_desc ON Chart (Time DESC); "
"PRAGMA foreign_keys = ON; "
"COMMIT;";
void db_sqlite(void *parameter) void db_sqlite(void *parameter)
{ {
if (access(DB_NAME, F_OK) == 0) if (access(DB_NAME, F_OK) == 0)
{ {
rt_kprintf("DB ok\n"); rt_kprintf("DB open\n");
sqlite3_open(DB_NAME, db); if (db_connect(DB_NAME) == RT_EOK){
if(db_table_is_exist("WorkorderSteps")<=0){
if(db_create_database(sql_upgrade_workorder_steps)==0)
{rt_kprintf("WorkorderSteps Created successfully \n");}else{rt_kprintf("WorkorderSteps Creation failed \n");}
}
if(db_table_is_exist("WorkOrderSet")<=0){
if(db_create_database(sql_upgrade_workorder_set)==0)
{rt_kprintf("WorkOrderSet Created successfully \n");}else{rt_kprintf("WorkOrderSet Creation failed \n");}
}
if(db_table_is_exist("WorkOrder")<=0){
if(db_create_database(sql_upgrade_workorder)==0)
{rt_kprintf("WorkOrder Created successfully \n");}else{rt_kprintf("WorkOrder Creation failed \n");}
}
if(db_table_is_exist("RUN")<=0){
if(db_create_database(sql_upgrade_run_table)==0)
{rt_kprintf("RUN Created successfully \n");}else{rt_kprintf("RUN Creation failed \n");}
}
if(db_table_is_exist("Dyelot")<=0){
if(db_create_database(sql_upgrade_dyelot_table)==0)
{rt_kprintf("Dyelot Created successfully \n");}else{rt_kprintf("Dyelot Creation failed \n");}
}
if(db_table_is_exist("IOLog")<=0){
if(db_create_database(sql_upgrade_iolog_table)==0)
{rt_kprintf("IOLog Created successfully \n");}else{rt_kprintf("IOLog Creation failed \n");}
}
if(db_table_is_exist("Chart")<=0){
if(db_create_database(sql_upgrade_chart_table)==0)
{rt_kprintf("Chart Created successfully \n");}else{rt_kprintf("Chart Creation failed \n");}
}
const char *sql = "CREATE TABLE student(id INTEGER PRIMARY KEY AUTOINCREMENT,name varchar(32) NOT NULL,score INT NOT NULL);";
db_create_database(sql);
}else{
rt_kprintf("DB open failed \n");
}
}else{ }else{
rt_kprintf("DB no \n"); rt_kprintf("DB open failed \n");
sqlite3_open(DB_NAME, db); sqlite3_open(DB_NAME, db);
//创建表 //创建表
sqlite3_exec(db, sql_upgrade_workorder_steps, NULL, NULL, NULL); db_create_database(sql_upgrade_workorder_steps);
sqlite3_exec(db, sql_upgrade_workorder_set, NULL, NULL, NULL); db_create_database(sql_upgrade_workorder_set);
sqlite3_exec(db, sql_upgrade_workorder, NULL, NULL, NULL); db_create_database(sql_upgrade_workorder);
sqlite3_exec(db, sql_upgrade_run_table, NULL, NULL, NULL); db_create_database(sql_upgrade_run_table);
sqlite3_exec(db, sql_upgrade_dyelot_table, NULL, NULL, NULL); db_create_database(sql_upgrade_dyelot_table);
sqlite3_exec(db, sql_upgrade_iolog_table, NULL, NULL, NULL); db_create_database(sql_upgrade_iolog_table);
sqlite3_exec(db, sql_upgrade_chart_table, NULL, NULL, NULL); db_create_database(sql_upgrade_chart_table);
} }
@@ -397,7 +320,7 @@ void thread_DB_SQLite(void)
{ {
/* 初始化线程 1，名称是 thread1，入口是 thread1_entry*/ /* 初始化线程 1，名称是 thread1，入口是 thread1_entry*/
rt_thread_t tid; rt_thread_t tid;
tid = rt_thread_create("db_sqlite", db_sqlite, RT_NULL, 1024*64, 3, 10); tid = rt_thread_create("db_sqlite", db_sqlite, RT_NULL, 1024*64, 3, 15);
if (tid != RT_NULL) if (tid != RT_NULL)
{ {
applications/main.c
+3 -5
View File
@@ -27,11 +27,9 @@ int main(void)
{ {
rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒 rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒
thread_RUN_LED();//运行指示灯线程 thread_RUN_LED();//运行指示灯线程
thread_DB_SQLite(); thread_DB_SQLite();//sqlite线程
start_uart_thread();//串口线程
data_comm_init();//数据处理线程
start_uart_thread();
data_comm_init();
drivers/board.h
-1
View File
@@ -250,7 +250,6 @@ extern "C"
* *
*/ */
/*#define BSP_USING_ONCHIP_RTC*/ /*#define BSP_USING_ONCHIP_RTC*/
/*-------------------------- RTC CONFIG END --------------------------*/ /*-------------------------- RTC CONFIG END --------------------------*/
/*-------------------------- SDIO CONFIG BEGIN --------------------------*/ /*-------------------------- SDIO CONFIG BEGIN --------------------------*/
rtconfig.h
-2
View File
@@ -109,8 +109,6 @@
#define RT_SERIAL_USING_DMA #define RT_SERIAL_USING_DMA
#define RT_SERIAL_RB_BUFSZ 64 #define RT_SERIAL_RB_BUFSZ 64
#define RT_USING_PIN #define RT_USING_PIN
#define RT_USING_RTC
#define RT_USING_ALARM
#define RT_USING_SDIO #define RT_USING_SDIO
#define RT_SDIO_STACK_SIZE 1024 #define RT_SDIO_STACK_SIZE 1024
#define RT_SDIO_THREAD_PRIORITY 15 #define RT_SDIO_THREAD_PRIORITY 15