|
@@ -157,16 +157,16 @@ int g_switch_get_ac_single_s_all_cur_info(void* manger,int saddr,int nNumb,Power
|
|
|
val = (data_temp[11 + Index] << 16) | data_temp[10 + Index];
|
|
val = (data_temp[11 + Index] << 16) | data_temp[10 + Index];
|
|
|
_power[i].factor = val / 1000.0;
|
|
_power[i].factor = val / 1000.0;
|
|
|
if(_power[i].factor>0 && _power[i].factor<0.1f) {
|
|
if(_power[i].factor>0 && _power[i].factor<0.1f) {
|
|
|
|
|
+ _power[i].power = 0.0f;
|
|
|
|
|
+ _power[i].current = 0.0f;
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
val = (data_temp[3 + Index] << 16) | data_temp[2 + Index];
|
|
val = (data_temp[3 + Index] << 16) | data_temp[2 + Index];
|
|
|
_power[i].current = val / 1000.0;
|
|
_power[i].current = val / 1000.0;
|
|
|
|
|
|
|
|
val = (data_temp[5 + Index] << 16) | data_temp[4 + Index];
|
|
val = (data_temp[5 + Index] << 16) | data_temp[4 + Index];
|
|
|
_power[i].power = val / 1000.0;
|
|
_power[i].power = val / 1000.0;
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
- _power[i].power = 0.0f;
|
|
|
|
|
- _power[i].current = 0.0f;
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
val = (data_temp[7 + Index] << 16) | data_temp[6 + Index];
|
|
val = (data_temp[7 + Index] << 16) | data_temp[6 + Index];
|
|
@@ -1817,6 +1817,10 @@ int g_switch_get_t_ac_all_out_info(void* manger,int saddr,int nNumb,PowerInfo* _
|
|
|
val = (data_temp[15 + Index] << 16) | data_temp[14 + Index];
|
|
val = (data_temp[15 + Index] << 16) | data_temp[14 + Index];
|
|
|
_power[i].factor = val / 1023.0;
|
|
_power[i].factor = val / 1023.0;
|
|
|
if(_power[i].factor>0.0f && _power[i].factor<0.1f) {
|
|
if(_power[i].factor>0.0f && _power[i].factor<0.1f) {
|
|
|
|
|
+ _power[i].power = 0.0f;
|
|
|
|
|
+ _power[i].current = 0.0f;
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
val = (data_temp[3 + Index] << 16) | data_temp[2 + Index];
|
|
val = (data_temp[3 + Index] << 16) | data_temp[2 + Index];
|
|
|
_power[i].current = val / 1000.0;
|
|
_power[i].current = val / 1000.0;
|
|
|
|
|
|
|
@@ -1828,10 +1832,6 @@ int g_switch_get_t_ac_all_out_info(void* manger,int saddr,int nNumb,PowerInfo* _
|
|
|
// 视在功率
|
|
// 视在功率
|
|
|
//val = (data_temp[9+Index] << 16) + data_temp[8+Index];
|
|
//val = (data_temp[9+Index] << 16) + data_temp[8+Index];
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
- _power[i].power = 0.0f;
|
|
|
|
|
- _power[i].current = 0.0f;
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
val = (data_temp[11 + Index] << 16) | data_temp[10+ Index];
|
|
val = (data_temp[11 + Index] << 16) | data_temp[10+ Index];
|