浏览代码

修正三相读取报警功能位置偏移问题

chenyuanjie 2 年之前
父节点
当前提交
adda486ce6
共有 1 个文件被更改,包括 10 次插入 和 10 次删除
  1. 10 10
      pro/src/switch_ctrl.c

+ 10 - 10
pro/src/switch_ctrl.c

@@ -1624,11 +1624,11 @@ int g_switch_get_t_ac_out_info(void* manger,int saddr,unsigned char chn,PowerInf
     offset = _SWITCH_T_AC_OUT_ERROR+ chn;
     memset(data_temp,0,sizeof(data_temp));
     ret = g_modbus_read_x_reg(manger,saddr,offset, 2,data_temp);
-    _warning->w_voltage_up      = data_temp[0] & ENABLE_TAC_V_UP;
-    _warning->w_voltage_down    = data_temp[0] & ENABLE_TAC_V_DOWN;
-    _warning->w_current         = data_temp[0] & ENABLE_TAC_A_UP;
-    _warning->w_power           = data_temp[0] & ENABLE_TAC_W_UP;
-    _warning->w_consumption     = data_temp[0] & ENABLE_TAC_P_UP;
+    _warning->w_voltage_up      = data_temp[0] & BIT_00;
+    _warning->w_voltage_down    = data_temp[0] & BIT_01;
+    _warning->w_current         = data_temp[0] & BIT_02;
+    _warning->w_power           = data_temp[0] & BIT_03;
+    _warning->w_consumption     = data_temp[0] & BIT_04;
 
     return ret;
 }
@@ -1733,11 +1733,11 @@ int g_switch_get_t_ac_all_out_info(void* manger,int saddr,int nNumb,PowerInfo* _
     for (size_t i = 0; i < nNumb; i++)
     {
         int Index = i * 2;
-        _warning[i].w_voltage_up      = data_temp[0+Index] & ENABLE_TAC_V_UP;
-        _warning[i].w_voltage_down    = data_temp[0+Index] & ENABLE_TAC_V_DOWN;
-        _warning[i].w_current         = data_temp[0+Index] & ENABLE_TAC_A_UP;
-        _warning[i].w_power           = data_temp[0+Index] & ENABLE_TAC_W_UP;
-        _warning[i].w_consumption     = data_temp[0+Index] & ENABLE_TAC_P_UP;
+        _warning[i].w_voltage_up      = data_temp[0+Index] & BIT_00;
+        _warning[i].w_voltage_down    = data_temp[0+Index] & BIT_01;
+        _warning[i].w_current         = data_temp[0+Index] & BIT_02;
+        _warning[i].w_power           = data_temp[0+Index] & BIT_03;
+        _warning[i].w_consumption     = data_temp[0+Index] & BIT_04;
     }
     return ret;
 }