diff --git a/applications/INI/config.c b/applications/INI/config.c index 97a9df8..e0ca627 100644 --- a/applications/INI/config.c +++ b/applications/INI/config.c @@ -12,7 +12,7 @@ #include "ini.h" #include "Variable.h" -#define INI_config "/sys/828config.ini" +#define INI_config "/828config.ini" #define DBG_TAG "INI.config" #define DBG_LVL DBG_LOG @@ -74,7 +74,7 @@ int read_sample(void) return -1; } } - LOG_I("read config"); + LOG_D("read config"); // 读取各种类型的值 strncpy(machine_ID, ini_get_value(ini, "CONFIG", "ID","99"),sizeof(machine_ID)); strncpy(machine_name, ini_get_value(ini, "CONFIG", "NAME","SC828"),sizeof(machine_name)); @@ -83,4 +83,4 @@ int read_sample(void) return 0; } -INIT_APP_EXPORT(read_sample); +//INIT_APP_EXPORT(read_sample); diff --git a/applications/INI/config.h b/applications/INI/config.h index 57eee9a..2055f4f 100644 --- a/applications/INI/config.h +++ b/applications/INI/config.h @@ -11,5 +11,6 @@ #define APPLICATIONS_INI_CONFIG_H_ extern void write_sample(void); +extern int read_sample(void); #endif /* APPLICATIONS_INI_CONFIG_H_ */ diff --git a/applications/disk/QSPI_elmfatfs.c b/applications/disk/QSPI_elmfatfs.c index add9767..0299cf5 100644 --- a/applications/disk/QSPI_elmfatfs.c +++ b/applications/disk/QSPI_elmfatfs.c @@ -96,7 +96,7 @@ int spi_flash_init(void) LOG_I("MTD device 'sysdata' created."); return RT_EOK; } -INIT_DEVICE_EXPORT(spi_flash_init); +//INIT_DEVICE_EXPORT(spi_flash_init); int qspi_fal(void) { @@ -125,4 +125,4 @@ int qspi_fal(void) } return RT_EOK; } -INIT_COMPONENT_EXPORT(qspi_fal); +//INIT_COMPONENT_EXPORT(qspi_fal); diff --git a/applications/disk/SDIO_elmfatfs.c b/applications/disk/SDIO_elmfatfs.c index 8d116d2..7a8059b 100644 --- a/applications/disk/SDIO_elmfatfs.c +++ b/applications/disk/SDIO_elmfatfs.c @@ -24,11 +24,11 @@ void sd_mount(void *parameter) { if (rt_device_find("sd") != RT_NULL) { - LOG_I("Create file path /sddisk"); - mkdir("/sddisk", 0777); - if (dfs_mount("sd", "/sddisk", "elm", 0, NULL) == RT_EOK) + LOG_I("Create file path /disk"); + //mkdir("/sddisk", 0777); + if (dfs_mount("sd", "/", "elm", 0, NULL) == RT_EOK) { - LOG_I("SD card mounted to '/sddisk' successfully"); + LOG_I("SD card mounted to 'disk' successfully"); // 挂载成功,释放信号量 if (mount_sem != RT_NULL) { diff --git a/applications/disk/TMPFS_root.c b/applications/disk/TMPFS_root.c index 2f6ba05..5f2d958 100644 --- a/applications/disk/TMPFS_root.c +++ b/applications/disk/TMPFS_root.c @@ -39,4 +39,4 @@ int init_tmpfs_root(void) } /* 在应用初始化阶段运行(确保系统已就绪) */ -INIT_DEVICE_EXPORT(init_tmpfs_root); +//INIT_DEVICE_EXPORT(init_tmpfs_root); diff --git a/applications/main.c b/applications/main.c index aa2029d..b24f000 100644 --- a/applications/main.c +++ b/applications/main.c @@ -11,6 +11,7 @@ #include #include #include "DB_SQLite.h" +#include "INI/config.h" #include "Variable.h" #include "ltdc.h" @@ -24,7 +25,8 @@ extern int wdt_sample(); int main(void) { rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成,最多等待 5 秒 - thread_DB_SQLite(); + read_sample();//读配置文件 + thread_DB_SQLite();//启动数据库 thread_RUN_LED();//运行指示灯线程 rt_snprintf(sys_var, sizeof(sys_var),"0.0.01a"); diff --git a/applications/sql/DB_SQLite.c b/applications/sql/DB_SQLite.c index c2098fe..261c785 100644 --- a/applications/sql/DB_SQLite.c +++ b/applications/sql/DB_SQLite.c @@ -16,7 +16,7 @@ #include //#include "libcsv.h" -#define DB_NAME "/sddisk/SC828.db" +#define DB_NAME "/SC828.db" int db_HelperInit; rt_mq_t db_mq = RT_NULL; // struct db_command cmd;