|
|
@@ -118,6 +118,7 @@ const char *SetUints[]= //
|
|
|
|
|
|
BH_SET_GROUP SetGroups[]= //单位符号定义，对应定值
|
|
|
{
|
|
|
+ {SETGROUP_TYPE_BY, 0, 0, GROUP_SET_BY, "备用定值", "备用",},
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_YB_GN, "保护定值", "功能软压板", },
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_YB_YX, "保护定值", "运行软压板", },
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_BHTT, "保护定值", "常规保护控制字", },
|
|
|
@@ -127,8 +128,8 @@ BH_SET_GROUP SetGroups[]= //
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_FAYB, "保护定值", "就地馈线自动化软压板", },
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_FATT, "保护定值", "就地馈线自动化控制字", },
|
|
|
{SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_FADZ, "保护定值", "就地馈线自动化定值", },
|
|
|
- {SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_GOOSETT, "保护定值", "分布式FA控制字", },
|
|
|
- {SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_GOOSEDZ, "保护定值", "分布式FA定值", },
|
|
|
+ {SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_GOOSETT, "保护定值", "智能分布式控制字", },
|
|
|
+ {SETGROUP_TYPE_BH, 1, SET_HYB_BH, GROUP_SET_GOOSEDZ, "保护定值", "智能分布式定值", },
|
|
|
{SETGROUP_TYPE_TQ, 1, SET_HYB_TQ, GROUP_SET_TQHZ, "保护定值", "同期合闸定值", },
|
|
|
{SETGROUP_TYPE_JL, 1, SET_HYB_JL, GROUP_SET_JLTT, "保护定值", "自动解列控制字", },
|
|
|
{SETGROUP_TYPE_JL, 1, SET_HYB_JL, GROUP_SET_JLDZ, "保护定值", "自动解列定值", },
|
|
|
@@ -140,14 +141,14 @@ BH_SET_GROUP SetGroups[]= //
|
|
|
#endif
|
|
|
{SETGROUP_TYPE_JL, 1, 0, GROUP_SET_LA, "保护定值", "线路断线告警", },
|
|
|
#ifdef FUNC_DRIVE
|
|
|
- {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_BTDCD, "保护定值", "不停电传动", },
|
|
|
+ {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_BTDCD, "保护定值", "传动开关定值", },
|
|
|
#endif
|
|
|
#ifdef FUNC_DRIVE_JY
|
|
|
{SETGROUP_TYPE_BH, 1, 0, GROUP_SET_DRIVE, "保护定值", "传动功能", },
|
|
|
#endif
|
|
|
- {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_FSX, "保护定值", "反时限定值", },
|
|
|
+ {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_FSX, "保护定值", "反时限保护", },
|
|
|
{SETGROUP_TYPE_BH, 1, 0, GROUP_SET_DLYX, "保护定值", "电流越限", },
|
|
|
- {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_RECORD, "保护定值", "录波功能", },
|
|
|
+ {SETGROUP_TYPE_BH, 1, 0, GROUP_SET_RECORD, "保护定值", "录波", },
|
|
|
{SETGROUP_TYPE_BH, 1, 0, GROUP_SET_SWSET, "保护定值", "辅助定值", },
|
|
|
#ifdef CUSTOMIZE_BZT //备自投
|
|
|
{SETGROUP_TYPE_BH, 1, 0, GROUP_SET_BZT, "保护定值", "备自投", },
|
|
|
@@ -157,13 +158,13 @@ BH_SET_GROUP SetGroups[]= //
|
|
|
{SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_SCT, "公共定值", "定值区", },
|
|
|
{SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_PUBYB, "公共定值", "运行软压板", },
|
|
|
{SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_PUBSET, "公共定值", "电压参数", },
|
|
|
- {SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_FDL, "公共定值", "非电量", },
|
|
|
+ {SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_FDL, "公共定值", "非电量保护", },
|
|
|
{SETGROUP_TYPE_PUB, 1, 0, GROUP_SET_OTHERS_PUB, "公共定值", "其它", },
|
|
|
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_PROTOCAL, "装置参数", "规约参数", },
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_LINK, "装置参数", "104子站通信", },
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_SERIAL, "装置参数", "串行口通信", },
|
|
|
- {SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_ETHERNET, "装置参数", "以太网参数", },
|
|
|
+ {SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_ETHERNET, "装置参数", "以太网通道", },
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_TIME, "装置参数", "对时", },
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_BATTERY, "装置参数", "电池管理", },
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_RMT, "装置参数", "远动参数", },
|
|
|
@@ -175,11 +176,12 @@ BH_SET_GROUP SetGroups[]= //
|
|
|
{SETGROUP_TYPE_PARA, 1, 0, GROUP_PARA_HISFILE, "装置参数", "历史文件", },
|
|
|
#endif
|
|
|
|
|
|
- {SETGROUP_TYPE_CSTSET ,1, 0, GROUP_CSTSET_PROTECT, "内部定值", "保护逻辑", },
|
|
|
- {SETGROUP_TYPE_CSTSET ,1, 0, GROUP_CSTSET_CALC, "内部定值", "计算功能", },
|
|
|
- {SETGROUP_TYPE_CSTSET ,1, 0, GROUP_CSTSET_COMM, "内部定值", "通信功能", },
|
|
|
- {SETGROUP_TYPE_CSTSET ,1, 0, GROUP_CSTSET_FA, "内部定值", "FA功能", },
|
|
|
- {SETGROUP_TYPE_CSTSET ,1, 0, GROUP_CSTSET_OTHERS, "内部定值", "辅助定值", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_PROTECT, "内部定值", "保护功能", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_CALC, "内部定值", "计算功能", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_COMM, "内部定值", "通讯功能", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_FA, "内部定值", "馈线自动化", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_RECORD, "内部定值", "录波功能", },
|
|
|
+ {SETGROUP_TYPE_CSTSET, 1, 0, GROUP_CSTSET_OTHERS, "内部定值", "辅助定值", },
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -480,6 +482,21 @@ const SET_LIST WFList[]= //录
|
|
|
};
|
|
|
#define WFListNum sizeof(WFList)/sizeof(SET_LIST)
|
|
|
|
|
|
+const SET_LIST LB_VOL_List[]=
|
|
|
+{
|
|
|
+ {"第一组", 0},
|
|
|
+ {"第二组", 1},
|
|
|
+ {"全 部", 2},
|
|
|
+};
|
|
|
+#define LB_VOL_ListNum sizeof(LB_VOL_List)/sizeof(SET_LIST)
|
|
|
+
|
|
|
+const SET_LIST RCL_List[]=
|
|
|
+{
|
|
|
+ {"中 文", 0},
|
|
|
+ {"英 文", 1},
|
|
|
+};
|
|
|
+#define RCL_ListNum sizeof(RCL_List)/sizeof(SET_LIST)
|
|
|
+
|
|
|
const SET_LIST FA_List[]=
|
|
|
{
|
|
|
{"自适应综合型 ",0,},
|
|
|
@@ -1282,6 +1299,10 @@ const TSETTABLE tCstSetTable[] =
|
|
|
|
|
|
{SETTYPE_LABEL, SET_NULL, 0, 0, 0, 0, 0, GROUP_CSTSET_RECORD, 0x0000, NULL_R, "录波功能"},
|
|
|
{SETTYPE_LIST, SET_NULL, 0, WFListNum - 1, 1, WFList, WFListNum, GROUP_CSTSET_RECORD, 0x0000, UINT_R, "文件格式"},
|
|
|
+ {SETTYPE_LIST, SET_NULL, 0, LB_VOL_ListNum - 1, 0, LB_VOL_List,LB_VOL_ListNum, GROUP_CSTSET_RECORD, 0x0000, UINT_R, "电压选择"},
|
|
|
+ {SETTYPE_LIST, SET_NULL, 0, TTListNum - 1, 0, TTList, TTListNum, GROUP_CSTSET_RECORD, 0x0000, BOOL_R, "虚拟遥信记录"},
|
|
|
+ {SETTYPE_LIST, SET_NULL, 0, RCL_ListNum - 1, 0, RCL_List, RCL_ListNum, GROUP_CSTSET_RECORD, 0x0000, BOOL_R, "遥信描述类型"},
|
|
|
+ {SETTYPE_UINT, SET_NULL, 1, 32, 1, 0, 0, GROUP_CSTSET_RECORD, 0x0000, UINT_R, "本开关间隔号"},
|
|
|
|
|
|
{SETTYPE_LABEL, SET_NULL, 0, 0, 0, 0, 0, GROUP_CSTSET_OTHERS, 0x0000, NULL_R, "辅助定值"},
|
|
|
{SETTYPE_UINT, SET_S, 1, 30, 20, 0, 0, GROUP_CSTSET_OTHERS, 0x0000, UINT_R, "未储能告警时间"},
|
|
|
@@ -1820,6 +1841,8 @@ struct _list_item g_list_all[] =
|
|
|
{Net_Eth_List, sizeof(Net_Eth_List) / sizeof(SET_LIST),},
|
|
|
{FA_List, sizeof(FA_List) / sizeof(SET_LIST),},
|
|
|
{WFList, sizeof(WFList) / sizeof(SET_LIST),},
|
|
|
+ {LB_VOL_List, sizeof(LB_VOL_List) / sizeof(SET_LIST),},
|
|
|
+ {RCL_List, sizeof(RCL_List) / sizeof(SET_LIST),},
|
|
|
{JMList, sizeof(JMList) / sizeof(SET_LIST),},
|
|
|
{JDTYPE, sizeof(JDTYPE) / sizeof(SET_LIST),},
|
|
|
{XDLQDList, sizeof(XDLQDList) / sizeof(SET_LIST),},
|
|
|
@@ -2490,7 +2513,11 @@ bool MakeRunSet(bool bFirst)
|
|
|
ptSet->bTT_goose_send_after = (((WORD)psetbuf[CSTSET_GOOSE_SEND_FAULT].ff == 1) ? true : false); // goose发布在故障确认后
|
|
|
|
|
|
// 录波
|
|
|
- g_wave_filetype = (int)psetbuf[CSTSET_WAVE_FILETYPE].ff; // 录波文件格式
|
|
|
+ g_wave_filetype = (int)psetbuf[CSTSET_WAVE_FILETYPE].ff; // 录波文件格式
|
|
|
+ ptSet->lb_vol_type = (WORD)psetbuf[CSTSET_WAVE_VOL_TYPE].ff; // 录波 电压选择 0 第一组 1第二组 2全部
|
|
|
+ ptSet->lb_xyx = (((WORD)psetbuf[CSTSET_WAVE_XNYX].ff == 1) ? true : false); // 虚拟遥信记录
|
|
|
+ ptSet->lb_yx_type = (((WORD)psetbuf[CSTSET_WAVE_YXDES_TYPE].ff == 1) ? true : false); // 遥信描述类型
|
|
|
+ ptSet->lb_sw_num = (WORD)psetbuf[CSTSET_WAVE_SWNUM].ff; // 本开关间隔号
|
|
|
|
|
|
ptSet->dWCN_T = GetSetTIME(psetbuf[CSTSET_WCNALARM_T].ff); // 未储能告警时间
|
|
|
ptSet->dSDYX_T = GetSetTIME(psetbuf[CSTSET_SD_YX_T].ff); // 失电闭锁遥信时间
|
|
|
@@ -3053,8 +3080,6 @@ bool MakeRunSet(bool bFirst)
|
|
|
|
|
|
ptSet->tSwSet[sw].dT_chz_bs = GetSetTIME(psetbuf[SET_CHBS_T + sw * SW_SET_NUMBER].ff);
|
|
|
ptSet->tSwSet[sw].dT_chz_ok = (bch2 || bch3) ? ptSet->tSwSet[sw].dT_chz_ok : T_1s * 15; // 只投一次重合闸的时候，重合闸确认时间强制为15S 2020-7-25
|
|
|
- dp_info_nt_rt("ptSet->tSwSet[sw].dT_chz_cd = %d", ptSet->tSwSet[sw].dT_chz_cd);
|
|
|
- dp_info_nt_rt("ptSet->tSwSet[sw].dT_chz_ok = %d", ptSet->tSwSet[sw].dT_chz_ok);
|
|
|
if (bch3)
|
|
|
ptSet->tSwSet[sw].d_chz_times = 3;
|
|
|
else if (bch2)
|
lch