|
|
@@ -417,6 +417,7 @@ static void* power_thread(void* arg)
|
|
|
GlobalTreeACManager *_pTreeACPowerPhData = NULL;
|
|
|
memset(&_globalPowerInfo._power_info, 0, sizeof(_globalPowerInfo._power_info));
|
|
|
int k = 0;
|
|
|
+
|
|
|
list_for_each_entry(_pTreeACPowerMangerTemp, &_globalPowerMangerTemp->list_Tree_AC, list_Tree_AC)
|
|
|
{
|
|
|
//筛选控制中的数据
|
|
|
@@ -439,6 +440,7 @@ static void* power_thread(void* arg)
|
|
|
_globalPowerInfo._power_info.factor = _pTreeACPowerMangerTemp->_PowerInfo.factor;
|
|
|
//
|
|
|
pTreeAPowerInfo = NULL;
|
|
|
+ _globalTotalPowerInfo._power_info.voltage = _globalPowerInfo._power_info.voltage*sqrt(3);
|
|
|
list_for_each_entry(pTreeAPowerInfo, &_globalDeviceManager->_globalPowerManger.list_Tree_AC, list_Tree_AC)
|
|
|
{
|
|
|
int nTreeACType = pTreeAPowerInfo->product_ph_type;
|
|
|
@@ -1372,7 +1374,7 @@ static void* power_thread(void* arg)
|
|
|
}
|
|
|
if (__globalDeviceManage._globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_One_B)
|
|
|
{
|
|
|
- _pTreeACPowerMangerTemp = NULL;
|
|
|
+ _pTreeACPowerMangerTemp = NULL;
|
|
|
list_for_each_entry(_pTreeACPowerMangerTemp, &_globalDeviceManager->_globalPowerManger.list_Tree_AC, list_Tree_AC)
|
|
|
{
|
|
|
int nTreeACType = _pTreeACPowerMangerTemp->product_ph_type;
|