|
|
@@ -1336,10 +1336,10 @@ void CResistAlarmMng::JudgeAlarm(CResistAlarmMng* pService, RETENSION_FORCE_DROP
|
|
|
if (nOldVal != 0)
|
|
|
{
|
|
|
//Ͻµ20%»òÉÏÉý40% ½øÐÐÔ¤¾¯
|
|
|
- if (pConstRetensionForceWaveInfo->dw_alarm_low_drop != INT_MIN && nRatio <= (100 - pConstRetensionForceWaveInfo->dw_alarm_low_drop))
|
|
|
+ if (pConstRetensionForceWaveInfo->alarm_low_percent != INT_MIN && nRatio <= (100 - pConstRetensionForceWaveInfo->alarm_low_percent))
|
|
|
{
|
|
|
loworhigh = eLowHigh::LH_LOW;
|
|
|
- alarm_refer = nOldVal * (100 - pConstRetensionForceWaveInfo->dw_alarm_low_drop) / 100;
|
|
|
+ alarm_refer = nOldVal * (100 - pConstRetensionForceWaveInfo->alarm_low_percent) / 100;
|
|
|
}
|
|
|
else if (nRatio >= (100 + pConstRetensionForceWaveInfo->alarm_high_percent))
|
|
|
{
|
shenchunzhong