修改 : 将定值修改位置放到log_fixset.txt文件之中；

README.md

@@ -80,4 +80,5 @@
 04. 修改 : 录波记录电压可选哪一组；
 05. 修改 : 录波文件记录虚拟遥信；
 06. 修改 : 录波文件记录遥信中英文可选；
-07. 修改 : 开放故障遥信保持时间，修改默认时间3s；
+07. 修改 : 开放故障遥信保持时间，修改默认时间3s；
+08. 修改 : 将定值修改位置放到log_fixset.txt文件之中；

app_public/fuxi_public/rt_lite/include/rt_log.h

@@ -16,8 +16,8 @@
 #define LOG_OPERATE		1
 #define LOG_SOE			2
 #define LOG_YX			3
-#define LOG_AUTH		4
-#define LOG_PRINTF		5
+#define LOG_PRINTF		4
+#define LOG_FIXSET		5
 
 
 #define LOG_SEM_FOR_THREAD		0	// Ï̼߳äµÄÐźÅÁ¿

app_public/fuxi_public/rt_lite/source/rt_log.c

@@ -19,6 +19,7 @@ struct log_file g_log_file[] =
         {"/app/data/log_soe.txt",       50 * 1024, 0, 0},
         {"/app/data/log_yx.txt",        50 * 1024, 0, 0},
         {"/app/data/log_printf.txt",    100 * 1024, 0, 0},
+	    {"/app/data/log_fixset.txt",    50 * 1024, 0, 0},
 };
 
 #define LOG_FILE_NUM ((int)(sizeof(g_log_file) / sizeof(g_log_file[0])))

dtu/dtu_main_t536/app/IEC101_FILE.c

@@ -77,17 +77,41 @@ int printf_file101(void);
 
 struct file_item g_file_item[] =
     {
+        {KO_FILE_NAME_1, "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
+        {"m", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+
+        {"equ_res.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_BRD, _file_save_app},
         {"equ_cfg.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_CFG, _file_save_app},
-        {"set_data.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_SET, _file_save_app},
+        {"e2prom.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+        {"brd_res.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"iectable.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_TABLE, _file_save_app},
-        {"equ_res.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_BRD, _file_save_app},
-        {"f306.ko", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
-        {"f308.ko", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
-        {KO_FILE_NAME_1, "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
+        {FILE_NAME_PPL_CFG, "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_PPL, _file_save_app},
+        {"fixset.csv", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},  // 固定参数文件
+        {"pcolcfg.ini", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app}, // 级联规约文件
+        {"vol_status.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+
+        {"set_data.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_SET, _file_save_app},
         {FILE_NAME_RSC, "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {FILE_NAME_PPL_RSC, "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {FILE_NAME_PPL_CFG, "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_PPL, _file_save_app},
         {FILE_NAME_SET_DESC, "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+        {"env.dat", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+        {"instu.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+
+        {"log_err.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
+        {"log_operate.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
+        {"log_soe.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
+        {"log_yx.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
+        {"log_fixset.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_GPRS, _file_save_app},
+        {"log_gprs.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_GPRS, _file_save_app},
+
+        {"logcfg.xml", "/app/IEC61850/cfg/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+        {"osicfg.xml", "/app/IEC61850/cfg/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+
+        {"file_list.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+
+#if (0)
+        {"f306.ko", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
+        {"f308.ko", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_MAINAPP, _file_save_app},
         {"u-boot.bin", "/tmp/", ATTR_DOWN, FILETYPE_SYS, _file_save_app},      // 引导程序
         {"uImage", "/tmp/", ATTR_DOWN, FILETYPE_SYS, _file_save_app},          // 内核程序
         {"app.jffs2", "/tmp/", ATTR_DOWN, FILETYPE_SYS, _file_save_app},       // 应用系统
@@ -96,22 +120,13 @@ struct file_item g_file_item[] =
         {"innergprs.ini", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_INNERGPRS, _file_save_app},
         {FILE_NAME_GPRSDRIVER, "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_GPRSDRIVER, _file_save_app},
         {"gprs_app", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_GPRSAPP, _file_save_app},
-        {"e2prom.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"brd_res.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"log_err.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
-        {"log_operate.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
-        {"log_soe.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
-        {"log_yx.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_APP, _file_save_app},
-        {"log_gprs.txt", "/app/data/", ATTR_UP, FILETYPE_LOG_GPRS, _file_save_app},
         {"rec_wave.dat", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"F308_HMI.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_F308_HMI, _file_save_app},
         {"DTU-DIDO.elf.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_CHILDPRO, _file_save_app},
         {"changelog.txt", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"m", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         // {"acfactor.bin", 	"/app/data/", 	ATTR_UP,			FILETYPE_OTHER, 	_file_save_app},
         // {"dcfactor.bin", 	"/app/data/", 	ATTR_UP,			FILETYPE_OTHER, 	_file_save_app},
         {"hzk.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"vol_status.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"sm2key0.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"sm2key1.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"sm2key2.bin", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
@@ -125,16 +140,9 @@ struct file_item g_file_item[] =
         {"sysm2_1.cer", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"sysm2_2.cer", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"sysm2_3.cer", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"fixset.csv", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},  // 固定参数文件
-        {"pcolcfg.ini", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app}, // 级联规约文件
-        {"env.dat", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"instu.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"file_list.bin", "/tmp/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"master_slave_equ_sync", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"factor_modify", "/app/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"mainImage.lcd", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"logcfg.xml", "/app/IEC61850/cfg/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
-        {"osicfg.xml", "/app/IEC61850/cfg/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"lcd_menu.csv", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {"vir_mix_table.csv", "/app/data/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
 
@@ -146,6 +154,7 @@ struct file_item g_file_item[] =
         {wave_name[5], "/app/data/rec_wave/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {wave_name[6], "/app/data/rec_wave/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
         {wave_name[7], "/app/data/rec_wave/", ATTR_UP | ATTR_DOWN, FILETYPE_OTHER, _file_save_app},
+#endif
 };
 const int FILE_LIST_NUM = (sizeof(g_file_item) / sizeof(struct file_item));
 #define FILE_ITEM_NUM (sizeof(g_file_item) / sizeof(struct file_item))

dtu/dtu_main_t536/app/MmiData.c

@@ -8045,7 +8045,7 @@ void log_operate_set_change(const TSETTABLE *pTable, u16 setno, long v1, long v2
         return;
     }
 
-    log_str_time(LOG_OPERATE, namestr, 0, 0);
+    log_str_time(LOG_FIXSET, namestr, 0, 0);
 }
 void para_change_check_soe(float *pf, DWORD wAddr, WORD num, const TSETTABLE *pTable)
 {

dtu/dtu_main_t536/main_mod.c

@@ -493,7 +493,7 @@ int main(void)
 
     SystemInit_finish_flag = false;
 
-    // 停止喂狗,让程序复位.在命令行中输入insmod f306.ko m_reset=1
+    // 停止喂狗,让程序复位 m_reset=1
     if (m_reset == 1)
     {
         rt_printf("watchdog_m_reset(1)...\n");