Просмотр исходного кода

1、暂时屏蔽两次控制板数据获取不到,数据归零的检测逻辑。后续优化。

liyuezong 1 год назад
Родитель
Сommit
453569eae2
1 измененных файлов с 10 добавлено и 8 удалено
  1. 10 8
      pro/src/app.c

+ 10 - 8
pro/src/app.c

@@ -171,10 +171,11 @@ static void* power_thread(void* arg)
                                                 _globalDeviceManager->pCtrlBoard[i].product_number,
                                                 _globalDeviceManager->pCtrlBoard[i]._PowerInfo,
                                                 _globalDeviceManager->pCtrlBoard[i]._PowerWarninginfo);
-                if(ret <0 )
-                {
-                    memset(&_globalDeviceManager->pCtrlBoard[i]._PowerInfo, 0, sizeof(PowerInfo)*AC_SINGLE_S_MAX_CHN_NUM );
-                }
+               //暂时屏蔽,可能导致采集数据为0,后续需要优化处理逻辑或等E235控制板串口性能提升后再放开处理逻辑
+               // if(ret <0 )
+              //  {
+                 //   memset(&_globalDeviceManager->pCtrlBoard[i]._PowerInfo, 0, sizeof(PowerInfo)*AC_SINGLE_S_MAX_CHN_NUM );
+                //}
             }
             // 输入总信息(三相)(后续应同步所有类型)
             if (_globalDeviceManager->pCtrlBoard[i].product_saddr != 0 && (_globalDeviceManager->pCtrlBoard[i].product_type == TREE_AC_TYPE||_globalDeviceManager->pCtrlBoard[i].product_type ==DOUBLE_AC_TYPE))
@@ -191,10 +192,11 @@ static void* power_thread(void* arg)
                                                     _globalDeviceManager->pCtrlBoard[i].product_saddr, // saadr
                                                     _globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo,
                                                     _globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerWarninginfo);
-                    if(ret <0 )
-                    {
-                        memset(&_globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo, 0, sizeof(PowerInfo) *3);
-                    }
+                    //暂时屏蔽,可能导致采集数据为0,后续需要优化处理逻辑或等E235控制板串口性能提升后再放开处理逻辑
+                    //if(ret <0 )
+                   // {
+                     //   memset(&_globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo, 0, sizeof(PowerInfo) *3);
+                   // }
                 }
                 //计算控制板每相输入总功率因数