|
|
@@ -1115,8 +1115,10 @@ static void* power_thread(void* arg)
|
|
|
c_data += (_globalDeviceManager->triphasic_mmap->i_total.pw_i_total[i].i_total_consumption);
|
|
|
p_data += (_globalDeviceManager->triphasic_mmap->i_total.pw_i_total[i].i_total_power);
|
|
|
}
|
|
|
- __globalDeviceManage.north_user.total_elec_energy = c_data / 100;
|
|
|
- __globalDeviceManage.north_user.total_power = p_data / 10;
|
|
|
+ float c_a = (float)c_data /1000.0;
|
|
|
+ float p_a = (float)p_data /1000.0;
|
|
|
+ __globalDeviceManage.north_user.total_elec_energy = c_a * 100;
|
|
|
+ __globalDeviceManage.north_user.total_power = p_a / 10;
|
|
|
__globalDeviceManage.north_user.frequency = _globalDeviceManager->_globalPowerManger._PowerInfo.freq * 100;
|
|
|
#endif
|
|
|
}
|