|
|
@@ -155,12 +155,6 @@ const s8 * g_sw_do_name[SW_DO_NUM] =
|
|
|
"开关失灵",
|
|
|
#endif
|
|
|
|
|
|
-#ifdef GD_AREA_YUNAN_LP
|
|
|
- "电源消失开出",
|
|
|
-#else
|
|
|
- "开出14",
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef GD_AREA_PROTECTOR
|
|
|
"装置异常告警动作",
|
|
|
#endif
|
|
|
@@ -639,14 +633,12 @@ const struct mea_desc g_pub_ac_desc[PUB_AC_NUM_ALL] =
|
|
|
#endif
|
|
|
{"直流电压1",UNIT_V050,UNIT_NULL},
|
|
|
{"直流电压2",UNIT_V050,UNIT_NULL},
|
|
|
-#ifdef GD_AREA_YUNAN_LP // 云南涞浦
|
|
|
{"DltUab",UNIT_V100,UNIT_NULL},
|
|
|
{"DltUbc",UNIT_V100,UNIT_NULL},
|
|
|
{"DltUca",UNIT_V100,UNIT_NULL},
|
|
|
{"ArgUab",UNIT_ANG,UNIT_NULL},
|
|
|
{"ArgUbc",UNIT_ANG,UNIT_NULL},
|
|
|
{"ArgUca",UNIT_ANG,UNIT_NULL},
|
|
|
-#endif
|
|
|
{"温度",UNIT_TEMP,UNIT_NULL},
|
|
|
#ifdef TMP_CHIP_AHT20
|
|
|
{"湿度",UNIT_HUMI,UNIT_NULL},
|
|
|
@@ -3818,7 +3810,6 @@ void _sw_cal_average(int cal_num)
|
|
|
g_sw_pub.ac_in_acc[PUB_AC_IN_V_UNBALANCE1] = 0;
|
|
|
g_sw_pub.ac_in_acc[PUB_AC_IN_V_UNBALANCE2] = 0;
|
|
|
|
|
|
-#ifdef GD_AREA_YUNAN_LP // 云南涞浦
|
|
|
g_sw_pub.ac_in[PUB_AC_IN_DLTUAB] =_AbsL(g_ui[PUB_AC_UAB1].e -g_ui[PUB_AC_UAB2].e);
|
|
|
g_sw_pub.ac_in[PUB_AC_IN_DLTUBC] =_AbsL(g_ui[PUB_AC_UBC1].e -g_ui[PUB_AC_UBC2].e);
|
|
|
g_sw_pub.ac_in[PUB_AC_IN_DLTUCA] =_AbsL(g_ui[PUB_AC_UCA1].e -g_ui[PUB_AC_UCA2].e);
|
|
|
@@ -3848,7 +3839,6 @@ void _sw_cal_average(int cal_num)
|
|
|
{
|
|
|
g_sw_pub.ac_in[PUB_AC_IN_ARGUCA]=0;
|
|
|
}
|
|
|
-#endif
|
|
|
//版本号0x00010104
|
|
|
{
|
|
|
g_sw_pub.ac_in[PUB_AC_IN_VER] =((BYTE)((VER_NUM>>0)&0x0f)
|