2021-05-14 / Eason Yang

Action:
1. Fixed : Query_Power_Consumption() function change uint32_t -> uint64_t.
2. Renake : Remake project.

File:
1. As follow as commit history.

Version : D0.51.XX.XXXX.XX

EVSE/Projects/AW-CCS/Apps/Module_InternalComm.c

@@ -989,18 +989,18 @@ unsigned char Query_Power_Consumption(unsigned char fd, unsigned char targetAddr
 		   (rx[3] == tx[3]))
 		{
 #ifndef SIMULATION
-			Ret_Buf_T-> power_consumption = ((uint32_t)rx[6] | (((uint32_t)rx[7])<<8) | (((uint32_t)rx[8])<<16) | (((uint32_t)rx[9])<<24) | (((uint32_t)rx[10])<<32) | (((uint32_t)rx[11])<<40) | (((uint32_t)rx[12])<<48) | (((uint32_t)rx[13])<<56));
-			Ret_Buf_L1-> power_consumption = ((uint32_t)rx[14] | (((uint32_t)rx[15])<<8) | (((uint32_t)rx[16])<<16) | (((uint32_t)rx[17])<<24) | (((uint32_t)rx[18])<<32) | (((uint32_t)rx[19])<<40) | (((uint32_t)rx[20])<<48) | (((uint32_t)rx[21])<<56));
+			Ret_Buf_T-> power_consumption = ((uint64_t)rx[6] | (((uint64_t)rx[7])<<8) | (((uint64_t)rx[8])<<16) | (((uint64_t)rx[9])<<24) | (((uint64_t)rx[10])<<32) | (((uint64_t)rx[11])<<40) | (((uint64_t)rx[12])<<48) | (((uint64_t)rx[13])<<56));
+			Ret_Buf_L1-> power_consumption = ((uint64_t)rx[14] | (((uint64_t)rx[15])<<8) | (((uint64_t)rx[16])<<16) | (((uint64_t)rx[17])<<24) | (((uint64_t)rx[18])<<32) | (((uint64_t)rx[19])<<40) | (((uint64_t)rx[20])<<48) | (((uint64_t)rx[21])<<56));
 			if(ShmSysConfigAndInfo->SysConfig.AcPhaseCount == 3)
 			{
-				Ret_Buf_L2-> power_consumption = ((uint32_t)rx[22] | (((uint32_t)rx[23])<<8) | (((uint32_t)rx[24])<<16) | (((uint32_t)rx[25])<<24) | (((uint32_t)rx[26])<<32) | (((uint32_t)rx[27])<<40) | (((uint32_t)rx[28])<<48) | (((uint32_t)rx[29])<<56));
-				Ret_Buf_L3-> power_consumption = ((uint32_t)rx[30] | (((uint32_t)rx[31])<<8) | (((uint32_t)rx[32])<<16) | (((uint32_t)rx[33])<<24) | (((uint32_t)rx[34])<<32) | (((uint32_t)rx[35])<<40) | (((uint32_t)rx[36])<<48) | (((uint32_t)rx[37])<<56));
+				Ret_Buf_L2-> power_consumption = ((uint64_t)rx[22] | (((uint64_t)rx[23])<<8) | (((uint64_t)rx[24])<<16) | (((uint64_t)rx[25])<<24) | (((uint64_t)rx[26])<<32) | (((uint64_t)rx[27])<<40) | (((uint64_t)rx[28])<<48) | (((uint64_t)rx[29])<<56));
+				Ret_Buf_L3-> power_consumption = ((uint64_t)rx[30] | (((uint64_t)rx[31])<<8) | (((uint64_t)rx[32])<<16) | (((uint64_t)rx[33])<<24) | (((uint64_t)rx[34])<<32) | (((uint64_t)rx[35])<<40) | (((uint64_t)rx[36])<<48) | (((uint64_t)rx[37])<<56));
 			}
 
 #else	//SIMULATION
 			tsNow = current_timestamp();
 			tmpPowerConsumption += (ShmSysConfigAndInfo->SysInfo.AcChargingData[0].PresentChargingVoltage*ShmSysConfigAndInfo->SysInfo.AcChargingData[0].PresentChargingCurrent)*((tsNow-tsLast)/36000000.0);
-			Ret_Buf_T-> power_consumption = (uint32_t)tmpPowerConsumption;
+			Ret_Buf_T-> power_consumption = (uint64_t)tmpPowerConsumption;
 			tsLast = tsNow;
 #endif	//SIMULATION
 			result = PASS;