2020.06.22 / Folus Wen

Actions:
1. EVSE/Modularization/ocppfiles/MessageHandler.c sendStartTransactionRequest() MeterStart content resolution modify to Wh.
2. EVSE/Modularization/ocppfiles/MessageHandler.c sendStopTransactionRequest() MeterStop content resolution modify to Wh.
3. EVSE/Modularization/ocppfiles/MessageHandler.c sendStopTransactionRequest() Transaction.Begin energy modify to 0.
4. EVSE/Modularization/ocppfiles/MessageHandler.c storeTempStopTransaction() MeterStop content resolution modify to Wh.
5. EVSE/Modularization/ocppfiles/MessageHandler.c storeTempStopTransaction() Transaction.Begin energy modify to 0.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -3062,7 +3062,7 @@ int sendStartTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PresentChargedEnergy;
+				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = (int)(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PowerConsumption*1000);
 				ShmOCPP16Data->StartTransaction[gun_index].ReservationId = ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId;
 			}
 		}
@@ -3083,7 +3083,7 @@ int sendStartTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PresentChargedEnergy;
+				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = (int)(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PowerConsumption*1000);
 				ShmOCPP16Data->StartTransaction[gun_index].ReservationId = ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId;
 			}
 		}
@@ -3103,7 +3103,7 @@ int sendStartTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PresentChargedEnergy;
+				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = (int)(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PowerConsumption*1000);
 				ShmOCPP16Data->StartTransaction[gun_index].ReservationId = ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId;
 			}
 		}
@@ -3123,7 +3123,7 @@ int sendStartTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StartTransaction[gun_index].MeterStart = (int)(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption*1000);
 				ShmOCPP16Data->StartTransaction[gun_index].ReservationId = ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId;
 			}
 		}
@@ -3553,7 +3553,7 @@ int sendStopTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF CHAdeMO_QUANTITY
 	}
@@ -3572,7 +3572,7 @@ int sendStopTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF CCS_QUANTITY
 
@@ -3592,7 +3592,7 @@ int sendStopTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF GB_QUANTITY
 	}
@@ -3611,7 +3611,7 @@ int sendStopTransactionRequest(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF AC_QUANTITY
 	}
@@ -3640,9 +3640,9 @@ int sendStopTransactionRequest(int gun_index)
 	//=================================
 	// Transaction_Begin
 	//=================================
-	//============================================ Energy.Active.Export.Interval ================================
+	//============================================ Energy.Active.Import.Interval ================================
     //idx_sample=0;
-	sprintf((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Value, "%.1f",(float)(ShmOCPP16Data->StartTransaction[gun_index].MeterStart)); // MeterStart is 0~6553.5 kWh
+	sprintf((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Value, "%.1f", 0); // MeterStart is 0~6553.5 kWh
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Context,ReadingContextStr[ReadingContext_Transaction_Begin]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Format,ValueFormatStr[Raw]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Measurand,MeasurandStr[Energy_Active_Import_Interval]);//MeasurandStr[Energy_Active_Export_Interval/*Energy_Reactive_Export_Register*/]);
@@ -3854,7 +3854,7 @@ int sendStopTransactionRequest(int gun_index)
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[2].Location,LocationStr[Location_Outlet]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[2].Unit,UnitOfMeasureStr[UnitOfMeasure_kWh]);
 
-	//=================================== Power.Active.Export ==================================================
+	//=================================== Power.Active.Import ==================================================
 	//idx_sample=3;
 	//J: CHAdeMO  U: CCS1 combo  E: CCS2 combo  G: GBT DC
 	if(gunType[gun_index] == 'J')
@@ -15343,7 +15343,7 @@ void storeTempStopTransaction(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF CHAdeMO_QUANTITY
 	}
@@ -15362,7 +15362,7 @@ void storeTempStopTransaction(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF CCS_QUANTITY
 
@@ -15382,7 +15382,7 @@ void storeTempStopTransaction(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF GB_QUANTITY
 	}
@@ -15401,7 +15401,7 @@ void storeTempStopTransaction(int gun_index)
 		{
 			if (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].Index == tempIndex)
 			{
-				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption;
+				ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (int)(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].PowerConsumption*1000);
 			}
 		}// END OF AC_QUANTITY
 	}
@@ -15433,7 +15433,7 @@ void storeTempStopTransaction(int gun_index)
 	//=================================
 	//============================== Energy.Active.Import.Interval ===========================================
     //idx_sample=0;
-	sprintf((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Value, "%.1f",(float)(ShmOCPP16Data->StartTransaction[gun_index].MeterStart)); // MeterStart is 0~6553.5 kWh
+	sprintf((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Value, "%.1f", 0); // MeterStart is 0~6553.5 kWh
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Context,ReadingContextStr[ReadingContext_Transaction_Begin]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Format,ValueFormatStr[Raw]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[0].Measurand,MeasurandStr[Energy_Active_Import_Interval]);//MeasurandStr[Energy_Active_Export_Interval/*Energy_Reactive_Export_Register*/]);
@@ -15647,7 +15647,7 @@ void storeTempStopTransaction(int gun_index)
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[2].Location,LocationStr[Location_Outlet]);
 	strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].TransactionData[0].SampledValue[2].Unit,UnitOfMeasureStr[UnitOfMeasure_kWh]);
 
-	//2.3====================================== Power.Active.Export =========================================
+	//2.3====================================== Power.Active.Import =========================================
 	//idx_sample=3;
 	//J: CHAdeMO  U: CCS1 combo  E: CCS2 combo  G: GBT DC
 	if(gunType[gun_index] == 'J')