2021-04-20 / Eason Yang

Action :
1. Improve : Replace query power consumption into high prioity
2. Make : Remake root file system

File :
1. Module_InternalComm.c
Action 1

2. Project AW-CCS
Action 2

Version : D0.49.XX.XXXX.XX

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

@@ -2265,7 +2265,23 @@ int main(void)
 					else
 						failCount[gun_index] = FAIL_SPEC_COMM;
 				}
-
+				
+				//===============================
+				// Case 10 : Query primary MCU power consumption
+				//===============================
+				if(Query_Power_Consumption(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].powerConsumptionTotal, &ShmCharger->gun_info[gun_index].powerConsumption[0], &ShmCharger->gun_info[gun_index].powerConsumption[1], &ShmCharger->gun_info[gun_index].powerConsumption[2]))
+				{
+					failCount[gun_index] = 0;
+				}
+				else
+				{
+					DEBUG_WARN("MCU-%d get power consumption fail...%d\n", gun_index, failCount[gun_index]);
+					if(failCount[gun_index]<USHRT_MAX)
+						failCount[gun_index]++;
+					else
+						failCount[gun_index] = FAIL_SPEC_COMM;
+				}
+				
 				//==========================================================
 				// High priority polling log print out
 				//==========================================================
@@ -2380,6 +2396,17 @@ int main(void)
 						DEBUG_INFO("*******************************************\n");
 						DEBUG_INFO("MCU-%d get ble central id : %s\n", gun_index, ShmCharger->gun_info[gun_index].bleLoginCentralId.id);
 					}
+					
+					DEBUG_INFO("===========================================\n");
+					DEBUG_INFO("==== High priority polling : Case 10 ====\n");
+					DEBUG_INFO("===========================================\n");
+					DEBUG_INFO("MCU-%d get total power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumptionTotal.power_consumption/100));
+					DEBUG_INFO("MCU-%d get L1N_L12 power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption[0].power_consumption/100));
+					if(ShmSysConfigAndInfo->SysConfig.AcPhaseCount == 3)
+					{
+						DEBUG_INFO("MCU-%d get L2N_L23 power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption[1].power_consumption/100));
+						DEBUG_INFO("MCU-%d get L3N_L31 power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption[2].power_consumption/100));
+					}
 				}
 			}
 			else
@@ -2554,6 +2581,7 @@ int main(void)
 						//===============================
 						// Query primary MCU power consumption
 						//===============================
+						/*
 						if(Query_Power_Consumption(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].powerConsumptionTotal, &ShmCharger->gun_info[gun_index].powerConsumption[0], &ShmCharger->gun_info[gun_index].powerConsumption[1], &ShmCharger->gun_info[gun_index].powerConsumption[2]))
 						{
 							failCount[gun_index] = 0;
@@ -2566,6 +2594,7 @@ int main(void)
 							else
 								failCount[gun_index] = FAIL_SPEC_COMM;
 						}
+						*/
 						break;
 					case 13:
 						//===============================
@@ -2810,6 +2839,7 @@ int main(void)
 							}
 							break;
 						case 6:
+							/*
 							DEBUG_INFO("===========================================\n");
 							DEBUG_INFO("==== Normal priority polling : Case 13 ====\n");
 							DEBUG_INFO("===========================================\n");
@@ -2820,6 +2850,7 @@ int main(void)
 								DEBUG_INFO("MCU-%d get L2N_L23 power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption[1].power_consumption/100));
 								DEBUG_INFO("MCU-%d get L3N_L31 power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption[2].power_consumption/100));
 							}
+							*/
 							break;
 						case 7:
 							if(ShmCharger->gun_info[gun_index].isSetBreatheLedTiming == ON)