Sfoglia il codice sorgente

[Improve][Modularization][Module_OcppBackend / Module_OcppBackend20]

2021.07.14 / Folus Wen

Actions:
1. CheckSystemValue() call condition add system mode at SYS_MODE_BOOTING.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 anni fa
parent
commit
2fe16ed536

+ 16 - 11
EVSE/Modularization/ocpp20/MessageHandler.c

@@ -5641,12 +5641,13 @@ void CheckSystemValue(void)
 
 					}
 
-			#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
+				#if 1 // for TempStopTransaction
+					if(((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
 					{
 						checkTempStopTransaction(gun_index);
 					}
-			#endif
+				#endif
 				}
 			}
 		}
@@ -5691,12 +5692,13 @@ void CheckSystemValue(void)
 						}
 					}
 
-			#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
+				#if 1 // for TempStopTransaction
+					if(((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
 					{
 						checkTempStopTransaction(gun_index);
 					}
-			#endif
+				#endif
 				}
 			}
 		}
@@ -5742,7 +5744,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
+					if(((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -5785,7 +5788,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_IDLE) && (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
+					if(((ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -5834,12 +5838,13 @@ void CheckSystemValue(void)
 						}
 					}
 
-			#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
+				#if 1 // for TempStopTransaction
+					if(((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq == OFF))
 					{
 						checkTempStopTransaction(gun_index);
 					}
-			#endif
+				#endif
 				}
 			}// END
 

+ 10 - 5
EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -3024,7 +3024,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
+					if(((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -3079,7 +3080,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
+					if(((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -3135,7 +3137,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
+					if(((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -3183,7 +3186,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_IDLE) && (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
+					if(((ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.ConnectorInfo[index].GeneralChargingData.SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
 					{
 						checkTempStopTransaction(gun_index);
 					}
@@ -3239,7 +3243,8 @@ void CheckSystemValue(void)
 					}
 
 				#if 1 // for TempStopTransaction
-					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_IDLE) && (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
+					if(((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_BOOTING) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == SYS_MODE_IDLE)) &&
+					   (ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq == 0))
 					{
 						checkTempStopTransaction(gun_index);
 					}