|
|
@@ -336,7 +336,7 @@ static bool fa_check_all_s_bs(int sw)
|
|
|
#ifdef YK_FA_ENBLE
|
|
|
||soe_check(EV_YK_BS_FA+sw*EV_SW_NUM) // 遥控闭锁FA
|
|
|
#endif
|
|
|
- #ifndef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+ #ifndef PRO_AL_RESET_FA
|
|
|
|| g_tRelay[sw].tPLJL.bLed //解裂动作后需闭锁合闸
|
|
|
#endif
|
|
|
|| g_tRelay[sw].tDYJL.bLed; //解裂动作后需闭锁合闸
|
|
|
@@ -1117,7 +1117,7 @@ static bool fa_check_s_bs_hz(int sw)
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-#ifndef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+#ifndef PRO_AL_RESET_FA
|
|
|
if(g_tRelay[sw].tPLJL.bLed==true)
|
|
|
{
|
|
|
return true;
|
|
|
@@ -1626,7 +1626,7 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
float freq0,freq1;
|
|
|
#endif
|
|
|
|
|
|
-#ifdef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+#ifdef PRO_AL_RESET_FA
|
|
|
static bool bLockHZ=false;
|
|
|
#endif
|
|
|
|
|
|
@@ -1710,7 +1710,7 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
ResetTR(&pSW->tFREQSBC25ms);
|
|
|
#endif
|
|
|
|
|
|
- #ifdef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+ #ifdef PRO_AL_RESET_FA
|
|
|
if(pR->tPLJL.sta.bFlag.bTz || bLockHZ)
|
|
|
{//中山局要求频率解列后需判掉电再上电的过程才允许得电合闸
|
|
|
fa_uf_clear(sw,false);
|
|
|
@@ -1822,7 +1822,7 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
||(pSW->uSdhz_S.bFlag.bUBCYY&&((pSW->uSdhz_S.bFlag.bUBCFlash||pSW->uSdhz_S.bFlag.bUbcflashDI)&&soe_check(EV_BS_UF_L+sw*EV_SW_NUM)))
|
|
|
)
|
|
|
{
|
|
|
- #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MEIZHOU_2021//中山局、广东二次指导意见要求残压经过解锁时间才能解锁
|
|
|
+ #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020//中山局、广东二次指导意见要求残压经过解锁时间才能解锁
|
|
|
RunTR(&pSW->tOnJSTime, TRUE , dStep); //js时间计数
|
|
|
if(!pSW->tOnJSTime.boolTrip)
|
|
|
break;
|
|
|
@@ -1852,7 +1852,7 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
|
|
|
case S_XTIME:
|
|
|
{
|
|
|
- #ifdef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+ #ifdef PRO_AL_RESET_FA
|
|
|
if(pR->tPLJL.sta.bFlag.bTz)
|
|
|
{ //X计时过程中频率解列跳闸后回到INIT状态
|
|
|
fa_s_state_change(sw,S_INIT);
|
|
|
@@ -1948,14 +1948,6 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
|
|
|
if (pSW->uSdhz_S.bFlag.bPowerZ&&pR->tSWST.uSWST.bFlag.bFAWL) //如果两侧失压且无流,停电Z
|
|
|
{
|
|
|
- #if defined GD_AREA_ECZD_MEIZHOU_2021
|
|
|
- if(!pSW->tOnYSTime.boolTrip)//肇庆封开县要求X上电计时的Y时间内失压为残压
|
|
|
- {
|
|
|
- fa_s_state_change(sw,S_BSFLASH);//
|
|
|
- pSW->uSdhz_S.bFlag.bSNChange=pSW->uSdhz_S.bFlag.bPower;
|
|
|
- break;
|
|
|
- }
|
|
|
- #endif
|
|
|
#if defined GD_AREA_ZHONGSHAN_2020 //X上电计时的Y时间内失压为残压,否则返回初始状态 2020-12-3
|
|
|
if(!pSW->tOnYSTime.boolTrip)
|
|
|
{
|
|
|
@@ -2231,7 +2223,7 @@ static void fa_s_status_run(int sw, DWORD dStep)
|
|
|
|
|
|
case S_YTIME:
|
|
|
{
|
|
|
- #ifdef GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+ #ifdef PRO_AL_RESET_FA
|
|
|
if(pR->tPLJL.sta.bFlag.bTz)
|
|
|
{ //Y计时过程中频率解列跳闸后回到INIT状态
|
|
|
fa_s_state_change(sw,S_INIT);
|
|
|
@@ -4354,12 +4346,10 @@ static void fa_s_run(int sw, DWORD dStep)
|
|
|
//rcd_start(sw,RECORD_WAVE_TYPE_TZ, RECORD_LEN_TZQD); //录波类型：跳闸类
|
|
|
soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 1, Us1,Us2,0 );
|
|
|
|
|
|
- #if defined GD_AREA_ECZD_MEIZHOU_2021
|
|
|
if(pSW->uSdhz_S.bFlag.bPower)
|
|
|
soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM, 1, Us1,Us2,0 );
|
|
|
else
|
|
|
- soe_record_ev(EV_FA_HZ_P+sw*EV_SW_NUM, 1, Us1,Us2,0 );
|
|
|
- #endif
|
|
|
+ soe_record_ev(EV_FA_HZ_P+sw*EV_SW_NUM, 1, Us1,Us2,0 );
|
|
|
pSW->uSdhz_S.bFlag.bHZEvent = true;
|
|
|
pSW->uSdhz_S.bFlag.bRLONFLAG = false;
|
|
|
}
|
|
|
@@ -4368,13 +4358,11 @@ static void fa_s_run(int sw, DWORD dStep)
|
|
|
{
|
|
|
if(pSW->uSdhz_S.bFlag.bHZEvent)
|
|
|
{
|
|
|
- soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 0, 0,0,0 );
|
|
|
- #if defined GD_AREA_ECZD_MEIZHOU_2021
|
|
|
+ soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 0, 0,0,0 );
|
|
|
if(pSW->uSdhz_S.bFlag.bPower)
|
|
|
soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM,0, 0,0,0 );
|
|
|
else
|
|
|
soe_record_ev(EV_FA_HZ_P+sw*EV_SW_NUM, 0, 0,0,0 );
|
|
|
- #endif
|
|
|
pSW->uSdhz_S.bFlag.bHZEvent = false;
|
|
|
}
|
|
|
|
lch