Преглед на файлове

修改 : 定值的大小范围;

lch преди 4 месеца
родител
ревизия
da57f81f16
променени са 4 файла, в които са добавени 31 реда и са изтрити 28 реда
  1. 2 1
      README.md
  2. 1 0
      app_public/fuxi_public/rt_lite/include/rt_log.h
  3. 1 0
      app_public/fuxi_public/rt_lite/source/rt_log.c
  4. 27 27
      dtu/dtu_main_t536/app/set.c

+ 2 - 1
README.md

@@ -81,4 +81,5 @@
 05. 修改 : 录波文件记录虚拟遥信;
 06. 修改 : 录波文件记录遥信中英文可选;
 07. 修改 : 开放故障遥信保持时间,修改默认时间3s;
-08. 修改 : 将定值修改位置放到log_fixset.txt文件之中;
+08. 修改 : 将定值修改位置放到log_fixset.txt文件之中;
+09. 修改 : 定值的大小范围;

+ 1 - 0
app_public/fuxi_public/rt_lite/include/rt_log.h

@@ -18,6 +18,7 @@
 #define LOG_YX			3
 #define LOG_PRINTF		4
 #define LOG_FIXSET		5
+#define LOG_AUTH		5
 
 
 #define LOG_SEM_FOR_THREAD		0	// Ï̼߳äµÄÐźÅÁ¿

+ 1 - 0
app_public/fuxi_public/rt_lite/source/rt_log.c

@@ -20,6 +20,7 @@ struct log_file g_log_file[] =
         {"/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},
+	    // {"/app/data/log_auth.txt",    10 * 1024, 0, 0},
 };
 
 #define LOG_FILE_NUM ((int)(sizeof(g_log_file) / sizeof(g_log_file[0])))

+ 27 - 27
dtu/dtu_main_t536/app/set.c

@@ -752,8 +752,8 @@ const TSETTABLE tPubSetTable[]=
     {SETTYPE_5INT,  SET_U,	    0,      1000,               100,    0,          0,              GROUP_SET_EQPPARA,  0x5006, FLOAT_R, "电源侧PT额定二次值"},
     {SETTYPE_5INT,  SET_U, 	    0,      99999,              10000,  0,          0,              GROUP_SET_EQPPARA,  0x5007, FLOAT_R, "负荷侧PT额定一次值"},
     {SETTYPE_5INT,  SET_U, 	    0,      1000,               100,    0,          0,              GROUP_SET_EQPPARA,  0x5008, FLOAT_R, "负荷侧PT额定二次值"},
-	{SETTYPE_LIST,	SET_NULL,   0,      TPT_TypeNum - 1,    1,      TPT_Type,	TPT_TypeNum,    GROUP_SET_EQPPARA,  0x0000, UINT_R,	"A侧PT接线方式"},
-	{SETTYPE_LIST,	SET_NULL,   0,      TPT_TypeNum - 1,    1,		TPT_Type,	TPT_TypeNum,    GROUP_SET_EQPPARA,  0x0000, UINT_R,	"B侧PT接线方式"},
+	{SETTYPE_LIST,	SET_NULL,   0,      TPT_TypeNum - 1,    2,      TPT_Type,	TPT_TypeNum,    GROUP_SET_EQPPARA,  0x0000, UINT_R,	"A侧PT接线方式"},
+	{SETTYPE_LIST,	SET_NULL,   0,      TPT_TypeNum - 1,    2,		TPT_Type,	TPT_TypeNum,    GROUP_SET_EQPPARA,  0x0000, UINT_R,	"B侧PT接线方式"},
 
     {SETTYPE_LABEL, SET_NULL,   0,      0,                  0,  	0,          0,              GROUP_SET_SCT,      0x0000, NULL_R,	"定值区"},
 #ifdef FIXAREA_VERSION_T
@@ -769,23 +769,23 @@ const TSETTABLE tPubSetTable[]=
 
 	{SETTYPE_LABEL,	SET_NULL,   0,      0,				    0, 		0,			0,				GROUP_SET_PUBSET,   0x0000, NULL_R,	"电压参数"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TTListNum - 1,		0,		TTList,		TTListNum,		GROUP_SET_PUBSET,   0x0000, BOOL_R,	"过电压投退"},
-	{SETTYPE_F,		SET_U,      10.0,   440.0,			    110.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "过电压定值"},
-	{SETTYPE_F,		SET_S,      0,      10000.0,			600.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "过电压时间"},
+	{SETTYPE_F,		SET_U,      10.0,   380.0,			    110.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "过电压定值"},
+	{SETTYPE_F,		SET_S,      0,      999.0,			    999.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "过电压时间"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TTListNum - 1,		0,		TTList,		TTListNum,		GROUP_SET_PUBSET,   0x0000, BOOL_R,	"低电压投退"},
-	{SETTYPE_F,		SET_U,      10.0,  	440.0,			    90.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "低电压定值"},
-	{SETTYPE_F,		SET_S,      0,    	10000.0,			600.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "低电压时间"},
+	{SETTYPE_F,		SET_U,      10.0,  	380.0,			    90.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "低电压定值"},
+	{SETTYPE_F,		SET_S,      0,    	999.0,			    999.0, 	0,			0,				GROUP_SET_PUBSET,   0x0000, FLOAT_R, "低电压时间"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TTListNum - 1,		0,	    TTList,	    TTListNum,		GROUP_SET_PUBSET,   0x0000, BOOL_R,	"线路有压投退"},
-	{SETTYPE_F, 	SET_U,      10.0,   100.0,			    85.0,   0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "有压定值"},
-	{SETTYPE_F, 	SET_S,      0,      100.0,			    0.1,    0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "有压时间"},
+	{SETTYPE_F, 	SET_U,      10.0,   380.0,			    70.0,   0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "有压定值"},
+	{SETTYPE_F, 	SET_S,      0,      999.0,			    0.1,    0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "有压时间"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TTListNum - 1,		0,	    TTList,	    TTListNum,		GROUP_SET_PUBSET,   0x0000, BOOL_R,	"线路无压投退"},
-	{SETTYPE_F, 	SET_U,      10.0,   100.0,			    65.0,   0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "无压定值"},
-	{SETTYPE_F, 	SET_S,      0,      100.0,			    0.1,    0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "无压时间"},
+	{SETTYPE_F, 	SET_U,      10.0,   380.0,			    30.0,   0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "无压定值"},
+	{SETTYPE_F, 	SET_S,      0,      999.0,			    0.1,    0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "无压时间"},
 	{SETTYPE_LIST,	SET_NULL,	0,      TTListNum - 1,		0,		TTList,     TTListNum,	    GROUP_SET_PUBSET,   0x0000, BOOL_R,	"直流电压1告警投退"},
-	{SETTYPE_F, 	SET_U,		10.0,   60.0,			    20.0, 	0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压1告警定值"},
-	{SETTYPE_F, 	SET_S,	    0.1,    100.0,			    100.0,  0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压1告警时间"},
+	{SETTYPE_F, 	SET_U,		10.0,   100.0,			    20.0, 	0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压1告警定值"},
+	{SETTYPE_F, 	SET_S,	    0.1,    999.0,			    999.0,  0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压1告警时间"},
 	{SETTYPE_LIST,	SET_NULL,	0,      TTListNum - 1,		0,		TTList,     TTListNum,	    GROUP_SET_PUBSET,   0x0000, BOOL_R,	"直流电压2告警投退"},
-	{SETTYPE_F, 	SET_U,		10.0,   60.0,			    20.0, 	0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压2告警定值"},
-	{SETTYPE_F, 	SET_S,	    0.1,    100.0,			    100.0,  0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压2告警时间"},
+	{SETTYPE_F, 	SET_U,		10.0,   100.0,			    20.0, 	0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压2告警定值"},
+	{SETTYPE_F, 	SET_S,	    0.1,    999.0,			    999.0,  0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "直流电压2告警时间"},
 #ifdef	CUSTOMIZE_BZT //备自投
 	{SETTYPE_LIST,	SET_NULL,	0,      TTListNum - 1,		0,		TTList, 	TTListNum,	    GROUP_SET_PUBSET,   0x0000, BOOL_R, "失压分闸投退"},
 	{SETTYPE_F, 	SET_U,	    0.0, 	220.0,			    66.0, 	0,			0,			    GROUP_SET_PUBSET,   0x0000, FLOAT_R, "失压分闸定值"},
@@ -799,12 +799,12 @@ const TSETTABLE tPubSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,   0,      TZCKListNum - 1,    0,		TZCKList,   TZCKListNum,    GROUP_SET_FDL,      0x0000, UINT_R,	"非电量4保护"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TZCKListNum - 1,    0,		TZCKList,   TZCKListNum,    GROUP_SET_FDL,      0x0000, UINT_R,	"非电量5保护"},
 	{SETTYPE_LIST,	SET_NULL,   0,      TZCKListNum - 1,    0,		TZCKList,   TZCKListNum,    GROUP_SET_FDL,      0x0000, UINT_R,	"非电量6保护"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量1时间"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量2时间"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量3时间"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量4时间"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量5时间"},
-	{SETTYPE_F,		SET_S, 		0,    	100.0,			    1.0,    0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量6时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量1时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量2时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量3时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量4时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量5时间"},
+	{SETTYPE_F,		SET_S, 		0,    	999.0,			    999.0,  0,			0,				GROUP_SET_FDL,      0x0000, FLOAT_R, "非电量6时间"},
 
     {SETTYPE_LABEL,	SET_NULL,	0,      0,				    0, 		0,			0,			    GROUP_SET_OTHERS_PUB, 	0x0000, NULL_R,	"其它"},
 	{SETTYPE_LIST,	SET_NULL,	0,      TTListNum - 1,	    1,		TTList,     TTListNum,	    GROUP_SET_OTHERS_PUB, 	0x0000, NULL_R,	"经高阻接地方式"},
@@ -1226,17 +1226,17 @@ const TSETTABLE tCstSetTable[] =
     {SETTYPE_LABEL, SET_NULL,   0,      0,                  0,      0,          0,              GROUP_CSTSET_PROTECT,   0x0000, NULL_R, "保护功能"},
 #ifdef XDL_ZT
     {SETTYPE_F,     SET_U,      0,      220.0,              220.0,  0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压1定值"},
-    {SETTYPE_F,     SET_S,      0,      100.0,              0.04,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压1时间"},
+    {SETTYPE_F,     SET_S,      0,      99.0,               0.04,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压1时间"},
     {SETTYPE_F,     SET_U,      0,      220.0,              220.0,  0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压2定值"},
-    {SETTYPE_F,     SET_S,      0,      100.0,              0.04,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压2时间"},
+    {SETTYPE_F,     SET_S,      0,      99.0,               0.04,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "小电流零压2时间"},
 #endif
 
     {SETTYPE_F,     SET_NULL,   0,      65536.0,            1.2,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "幅值加速滤波系数"},
     {SETTYPE_F,     SET_A,      0.01,   25.0,               2.0,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "突变量定值"},
     {SETTYPE_F,     SET_A,      0,      5.0,                0.1,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "无流定值"},
     {SETTYPE_F,     SET_S,      0.2,    60.0,               5.0,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "整组复归时间"},
-    {SETTYPE_F,     SET_S,      0.05,   10.0,               0.15,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "跳闸失败时间"},
-    {SETTYPE_F,     SET_S,      0.05,   10.0,               2.0,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "合闸失败时间"},
+    {SETTYPE_F,     SET_S,      0.01,   10.0,               0.15,   0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "跳闸失败时间"},
+    {SETTYPE_F,     SET_S,      0.01,   10.0,               2.0,    0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "合闸失败时间"},
 #ifndef DISP_CHZOKCHR_2_SW
     {SETTYPE_F,     SET_S,      15.0,   300.0,              180.0,  0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "二次重合充电时间"},
     {SETTYPE_F,     SET_S,      0.3,    999.0,              180.0,  0,          0,              GROUP_CSTSET_PROTECT,   0x0000, FLOAT_R, "重合确认时间"},
@@ -1467,8 +1467,8 @@ const TSETTABLE tEquipParaTable[] = // min 	max 			default
     {SETTYPE_F,     SET_PER,    0.0,    100.0,              1.0,    0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "功率因数死区"},
 #endif
     {SETTYPE_LINT,  SET_MS,     0.0,    60000.0,            20.0,   0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "遥信防抖时间"},
-    {SETTYPE_LINT,  SET_MS,     0.0,    50000.0,            200.0,  0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "分闸脉冲"},
-    {SETTYPE_LINT,  SET_MS,     0.0,    50000.0,            200.0,  0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "合闸脉冲"},
+    {SETTYPE_LINT,  SET_MS,     0.0,    60000.0,            200.0,  0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "分闸脉冲"},
+    {SETTYPE_LINT,  SET_MS,     0.0,    60000.0,            200.0,  0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "合闸脉冲"},
     {SETTYPE_F,     SET_U,      0,      20.0,               5,      0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "电压零漂"},
     {SETTYPE_F,     SET_A,      0,      1.0,                0.25,   0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "相电流零漂"},
     {SETTYPE_F,     SET_A,      0,      1.0,                0.04,   0,          0,              GROUP_PARA_RMT,             0x0000, FLOAT_R, "零序电流零漂"},
@@ -1477,7 +1477,7 @@ const TSETTABLE tEquipParaTable[] = // min 	max 			default
 #endif
 
     {SETTYPE_LABEL, SET_NULL,   0,      0,                  0,      0,          0,              GROUP_PARA_OTHERS,          0x0000, NULL_R, "其它"},
-    {SETTYPE_LINT,  SET_MS,     0.0,    50000.0,            200.0,  0,          0,              GROUP_PARA_OTHERS,          0x0000, FLOAT_R, "合分闸脉冲"},
+    {SETTYPE_LINT,  SET_MS,     0.0,    60000.0,            200.0,  0,          0,              GROUP_PARA_OTHERS,          0x0000, FLOAT_R, "合分闸脉冲"},
     {SETTYPE_LIST,  SET_NULL,   0,      TTListNum - 1,      0,      TTList,     TTListNum,      GROUP_PARA_OTHERS,          0x0000, BOOL_R, "信号自动复归投退"},
     {SETTYPE_5INT,  SET_MIN,    0,      3000,               2880,   0,          0,              GROUP_PARA_OTHERS,          0x0000, FLOAT_R, "信号自动复归时间"},