|
|
@@ -147,9 +147,14 @@ int g_switch_get_ac_single_s_all_cur_info(void* manger,int saddr,int nNumb,Power
|
|
|
// 解电压数据
|
|
|
val = (data_temp[1 + Index] << 16) | data_temp[0 + Index];
|
|
|
_power[i].voltage = val / 1000.0;
|
|
|
+ if(_power[i].voltage>0 && _power[i].voltage<=1.0f) {
|
|
|
+ _power[i].voltage = 0;
|
|
|
+ }
|
|
|
+
|
|
|
// 解电流数据
|
|
|
val = (data_temp[3 + Index] << 16) | data_temp[2 + Index];
|
|
|
_power[i].current = val / 1000.0;
|
|
|
+
|
|
|
// 解功率数据
|
|
|
val = (data_temp[5 + Index] << 16) | data_temp[4 + Index];
|
|
|
_power[i].power = val / 1000.0;
|
|
|
@@ -1795,6 +1800,10 @@ int g_switch_get_t_ac_all_out_info(void* manger,int saddr,int nNumb,PowerInfo* _
|
|
|
// 解电压数据
|
|
|
float value = (data_temp[1+Index] << 16) + data_temp[0+Index];
|
|
|
_power[i].voltage = value / 1000.0;
|
|
|
+ if(_power[i].voltage>0 && _power[i].voltage<=1.0f) {
|
|
|
+ _power[i].voltage = 0;
|
|
|
+ }
|
|
|
+
|
|
|
// 解电流数据
|
|
|
value = (data_temp[3+Index] << 16) + data_temp[2+Index];
|
|
|
_power[i].current = value / 1000.0;
|