2021-11-08 / Simon Xue

Action
    1. Delete location: EVCCID_Authorize, AutoAuth_Disable
File
    1. As follow commit history

Image version : V1.17.XX.XXXX.XX

EVSE/Projects/DD360/Apps/CSU/Primary.c

@@ -223,7 +223,7 @@ static void checkChargingInfoByDC(uint8_t systemStatus)
             destroySelGun(pSysInfo->CurGunSelected);
             
         } else {
-            if( pSysConfig->EVCCID_Authorize && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
+            if( pSysConfig->isAuthrizeByEVCCID && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
                 _evccidlinktimeout(pSysInfo->CurGunSelected);
                 pDcChargingInfo->isEVCCIDVerify = true;
                 break;

EVSE/Projects/DD360/Apps/CSU/main.c

@@ -3783,8 +3783,8 @@ static void autoStartCharging(uint8_t gunIndex)
     if ((pDcChargingInfo->ConnectorPlugIn == YES) &&
             (pDcChargingInfo->SystemStatus == S_IDLE ) 
        ) {
-        if(!pSysConfig->AutoAuth_Disable) {
-            if (pSysConfig->EVCCID_Authorize && !pDcChargingInfo->isEVCCIDVerify &&
+        if(!pSysConfig->AuthorisationMode) {
+            if (pSysConfig->isAuthrizeByEVCCID && !pDcChargingInfo->isEVCCIDVerify &&
                     pDcChargingInfo->Type == _Type_CCS_2)  {
 #ifdef DD360Audi                
                 // LCM show linking pic. & timeout 2 min
@@ -4682,7 +4682,7 @@ int main(void)
                 if (isDetectPlugin()) {
                     /*
                     if(pDcChargingInfo->Type == _Type_CCS_2 &&
-                            pSysConfig->EVCCID_Authorize &&
+                            pSysConfig->isAuthrizeByEVCCID &&
                             strcmp((char *)pDcChargingInfo->EVCCID,(char *)pSysConfig->UserId) != EQUAL )
                         continue;
                         */
@@ -4715,7 +4715,7 @@ int main(void)
                             log_info("index = %d, CardNumber = %s ",
                                      gunIndex,
                                      pDcChargingInfo->StartUserId);
-                            if (pSysConfig->EVCCID_Authorize)
+                            if (pSysConfig->isAuthrizeByEVCCID)
                                 log_info("EVCCID:%s",pDcChargingInfo->EVCCID);
                             strcpy((char *)pSysConfig->UserId, "");
                             // 當前操作的槍號，進入 Preparing
@@ -4748,7 +4748,7 @@ int main(void)
                         ClearDetectPluginFlag();
                         continue;
                     }
-                } else if (pSysConfig->EVCCID_Authorize && pDcChargingInfo->ConnectorPlugIn && 
+                } else if (pSysConfig->isAuthrizeByEVCCID && pDcChargingInfo->ConnectorPlugIn && 
                         pSysInfo->CurGunSelected == gunIndex && !pDcChargingInfo->isEVCCIDVerify) {
                     systemPageRestoreInit();
                     pSysInfo->ConnectorPage = _LCM_PRE_CHARGE;

EVSE/Projects/DD360/Apps/Define/define.h

@@ -501,8 +501,6 @@ struct SysConfigData
 	unsigned char 			AcConnectorCount;			// For DC type
 	unsigned char			SwitchDebugFlag;			// Console Debug
 	unsigned char			AlwaysGfdFlag;
-	unsigned char           AutoAuth_Disable;           //for Auto Authorize, 0:Disable Auto Authorize 1:Auto Authorize
-	unsigned char           EVCCID_Authorize;           //for EVCCID Authorize enable/disable
 	/**************Charging***************/
 	unsigned short			MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh
 	unsigned short			MaxChargingPower;			//0: rating value, 1 ~ RATING_POWER	kW
@@ -541,6 +539,9 @@ struct SysConfigData
 
     /************PowerCabinet************/
     WiringInfoData          WiringInfo;
+
+    unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
+    unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
 };
 
 struct ChargingInfoData

EVSE/Projects/DD360/Apps/ModuleDoComm/DoComm.c

@@ -759,13 +759,13 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
             }
             break;
         case MISC_CMD_AUTH_DISABLE:
-            pSysConfig->AutoAuth_Disable = value;
-            log_info("Auto Authorize Disable:%d", pSysConfig->AutoAuth_Disable);
+            pSysConfig->AuthorisationMode = value;
+            log_info("Auto Authorize Disable:%d", pSysConfig->AuthorisationMode);
             //clearMiscCommand();
         	break;
         case MISC_CMD_EVCCID_ENABLE:
-            pSysConfig->EVCCID_Authorize = value;
-            log_info("Authorize By EVCCID:%d",pSysConfig->EVCCID_Authorize);
+            pSysConfig->isAuthrizeByEVCCID = value;
+            log_info("Authorize By EVCCID:%d",pSysConfig->isAuthrizeByEVCCID);
             //clearMiscCommand();
         	break;
 
@@ -1708,7 +1708,7 @@ static void checkAuthorProcess(int fd, uint8_t plugNum)
 #if defined DD360Audi
     gunID = gDoCommGblData.ConnectorID[pSysInfo->CurGunSelected];
     //gunID = gDoCommGblData.ConnectorID[plugNum];
-    if (pSysConfig->AutoAuth_Disable) {
+    if (pSysConfig->AuthorisationMode) {
         gunID = ID_REGISTER;
         ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance = 0.0;
     }

EVSE/Projects/DD360/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -337,7 +337,7 @@ void CANReceiver(int fd)
                         log_info("Conn %d, Plugin. ", targetGun);
                         pDcChargingInfo->isEVCCIDVerify = false;
 #ifdef DD360Audi                       
-                        if (pSysConfig->EVCCID_Authorize)
+                        if (pSysConfig->isAuthrizeByEVCCID)
                             pSysInfo->CurGunSelected = targetGun;
 #endif                        
                     } else if (frame.data[0] == UNPLUG) {

EVSE/Projects/DD360/Apps/ModuleEvComm/Module_EvTxComm.c

@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
                 }
                 // Set Ev board in communication mode
                 // Get EVCCID for authorize when gun plug-in only for CCS
-                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->EVCCID_Authorize &&
+                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->isAuthrizeByEVCCID &&
                         ShmCcsData->CommProtocol == _CCS_COMM_V2GMessage_DIN70121) {
                     if (Comcont == 1 && evstatus < 15) {
                         GetEVCCIDReq(gunIndex,pDcChargingInfo->Evboard_id);

EVSE/Projects/DD360Audi/Apps/CSU/Primary.c

@@ -223,7 +223,7 @@ static void checkChargingInfoByDC(uint8_t systemStatus)
             destroySelGun(pSysInfo->CurGunSelected);
             
         } else {
-            if( pSysConfig->EVCCID_Authorize && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
+            if( pSysConfig->isAuthrizeByEVCCID && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
                 _evccidlinktimeout(pSysInfo->CurGunSelected);
                 pDcChargingInfo->isEVCCIDVerify = true;
                 break;

EVSE/Projects/DD360Audi/Apps/CSU/main.c

@@ -3783,8 +3783,8 @@ static void autoStartCharging(uint8_t gunIndex)
     if ((pDcChargingInfo->ConnectorPlugIn == YES) &&
             (pDcChargingInfo->SystemStatus == S_IDLE ) 
        ) {
-        if(!pSysConfig->AutoAuth_Disable) {
-            if (pSysConfig->EVCCID_Authorize && !pDcChargingInfo->isEVCCIDVerify &&
+        if(!pSysConfig->AuthorisationMode) {
+            if (pSysConfig->isAuthrizeByEVCCID && !pDcChargingInfo->isEVCCIDVerify &&
                     pDcChargingInfo->Type == _Type_CCS_2)  {
 #ifdef DD360Audi                
                 // LCM show linking pic. & timeout 2 min
@@ -4682,7 +4682,7 @@ int main(void)
                 if (isDetectPlugin()) {
                     /*
                     if(pDcChargingInfo->Type == _Type_CCS_2 &&
-                            pSysConfig->EVCCID_Authorize &&
+                            pSysConfig->isAuthrizeByEVCCID &&
                             strcmp((char *)pDcChargingInfo->EVCCID,(char *)pSysConfig->UserId) != EQUAL )
                         continue;
                         */
@@ -4715,7 +4715,7 @@ int main(void)
                             log_info("index = %d, CardNumber = %s ",
                                      gunIndex,
                                      pDcChargingInfo->StartUserId);
-                            if (pSysConfig->EVCCID_Authorize)
+                            if (pSysConfig->isAuthrizeByEVCCID)
                                 log_info("EVCCID:%s",pDcChargingInfo->EVCCID);
                             strcpy((char *)pSysConfig->UserId, "");
                             // 當前操作的槍號，進入 Preparing
@@ -4748,7 +4748,7 @@ int main(void)
                         ClearDetectPluginFlag();
                         continue;
                     }
-                } else if (pSysConfig->EVCCID_Authorize && pDcChargingInfo->ConnectorPlugIn && 
+                } else if (pSysConfig->isAuthrizeByEVCCID && pDcChargingInfo->ConnectorPlugIn && 
                         pSysInfo->CurGunSelected == gunIndex && !pDcChargingInfo->isEVCCIDVerify) {
                     systemPageRestoreInit();
                     pSysInfo->ConnectorPage = _LCM_PRE_CHARGE;

EVSE/Projects/DD360Audi/Apps/Define/define.h

@@ -501,8 +501,6 @@ struct SysConfigData
 	unsigned char 			AcConnectorCount;			// For DC type
 	unsigned char			SwitchDebugFlag;			// Console Debug
 	unsigned char			AlwaysGfdFlag;
-	unsigned char           AutoAuth_Disable;           //for Auto Authorize, 0:Disable Auto Authorize 1:Auto Authorize
-	unsigned char           EVCCID_Authorize;           //for EVCCID Authorize enable/disable
 	/**************Charging***************/
 	unsigned short			MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh
 	unsigned short			MaxChargingPower;			//0: rating value, 1 ~ RATING_POWER	kW
@@ -541,6 +539,9 @@ struct SysConfigData
 
     /************PowerCabinet************/
     WiringInfoData          WiringInfo;
+
+    unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
+    unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
 };
 
 struct ChargingInfoData

EVSE/Projects/DD360Audi/Apps/ModuleDoComm/DoComm.c

@@ -759,13 +759,13 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
             }
             break;
         case MISC_CMD_AUTH_DISABLE:
-            pSysConfig->AutoAuth_Disable = value;
-            log_info("Auto Authorize Disable:%d", pSysConfig->AutoAuth_Disable);
+            pSysConfig->AuthorisationMode = value;
+            log_info("Auto Authorize Disable:%d", pSysConfig->AuthorisationMode);
             //clearMiscCommand();
         	break;
         case MISC_CMD_EVCCID_ENABLE:
-            pSysConfig->EVCCID_Authorize = value;
-            log_info("Authorize By EVCCID:%d",pSysConfig->EVCCID_Authorize);
+            pSysConfig->isAuthrizeByEVCCID = value;
+            log_info("Authorize By EVCCID:%d",pSysConfig->isAuthrizeByEVCCID);
             //clearMiscCommand();
         	break;
 
@@ -1708,7 +1708,7 @@ static void checkAuthorProcess(int fd, uint8_t plugNum)
 #if defined DD360Audi
     gunID = gDoCommGblData.ConnectorID[pSysInfo->CurGunSelected];
     //gunID = gDoCommGblData.ConnectorID[plugNum];
-    if (pSysConfig->AutoAuth_Disable) {
+    if (pSysConfig->AuthorisationMode) {
         gunID = ID_REGISTER;
         ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance = 0.0;
     }

EVSE/Projects/DD360Audi/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -337,7 +337,7 @@ void CANReceiver(int fd)
                         log_info("Conn %d, Plugin. ", targetGun);
                         pDcChargingInfo->isEVCCIDVerify = false;
 #ifdef DD360Audi                       
-                        if (pSysConfig->EVCCID_Authorize)
+                        if (pSysConfig->isAuthrizeByEVCCID)
                             pSysInfo->CurGunSelected = targetGun;
 #endif                        
                     } else if (frame.data[0] == UNPLUG) {

EVSE/Projects/DD360Audi/Apps/ModuleEvComm/Module_EvTxComm.c

@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
                 }
                 // Set Ev board in communication mode
                 // Get EVCCID for authorize when gun plug-in only for CCS
-                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->EVCCID_Authorize &&
+                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->isAuthrizeByEVCCID &&
                         ShmCcsData->CommProtocol == _CCS_COMM_V2GMessage_DIN70121) {
                     if (Comcont == 1 && evstatus < 15) {
                         GetEVCCIDReq(gunIndex,pDcChargingInfo->Evboard_id);

EVSE/Projects/DD360ComBox/Apps/CSU/Primary.c

@@ -223,7 +223,7 @@ static void checkChargingInfoByDC(uint8_t systemStatus)
             destroySelGun(pSysInfo->CurGunSelected);
             
         } else {
-            if( pSysConfig->EVCCID_Authorize && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
+            if( pSysConfig->isAuthrizeByEVCCID && pSysInfo->ConnectorPage == _LCM_PRE_CHARGE) {
                 _evccidlinktimeout(pSysInfo->CurGunSelected);
                 pDcChargingInfo->isEVCCIDVerify = true;
                 break;

EVSE/Projects/DD360ComBox/Apps/CSU/main.c

@@ -3783,8 +3783,8 @@ static void autoStartCharging(uint8_t gunIndex)
     if ((pDcChargingInfo->ConnectorPlugIn == YES) &&
             (pDcChargingInfo->SystemStatus == S_IDLE ) 
        ) {
-        if(!pSysConfig->AutoAuth_Disable) {
-            if (pSysConfig->EVCCID_Authorize && !pDcChargingInfo->isEVCCIDVerify &&
+        if(!pSysConfig->AuthorisationMode) {
+            if (pSysConfig->isAuthrizeByEVCCID && !pDcChargingInfo->isEVCCIDVerify &&
                     pDcChargingInfo->Type == _Type_CCS_2)  {
 #ifdef DD360Audi                
                 // LCM show linking pic. & timeout 2 min
@@ -4682,7 +4682,7 @@ int main(void)
                 if (isDetectPlugin()) {
                     /*
                     if(pDcChargingInfo->Type == _Type_CCS_2 &&
-                            pSysConfig->EVCCID_Authorize &&
+                            pSysConfig->isAuthrizeByEVCCID &&
                             strcmp((char *)pDcChargingInfo->EVCCID,(char *)pSysConfig->UserId) != EQUAL )
                         continue;
                         */
@@ -4715,7 +4715,7 @@ int main(void)
                             log_info("index = %d, CardNumber = %s ",
                                      gunIndex,
                                      pDcChargingInfo->StartUserId);
-                            if (pSysConfig->EVCCID_Authorize)
+                            if (pSysConfig->isAuthrizeByEVCCID)
                                 log_info("EVCCID:%s",pDcChargingInfo->EVCCID);
                             strcpy((char *)pSysConfig->UserId, "");
                             // 當前操作的槍號，進入 Preparing
@@ -4748,7 +4748,7 @@ int main(void)
                         ClearDetectPluginFlag();
                         continue;
                     }
-                } else if (pSysConfig->EVCCID_Authorize && pDcChargingInfo->ConnectorPlugIn && 
+                } else if (pSysConfig->isAuthrizeByEVCCID && pDcChargingInfo->ConnectorPlugIn && 
                         pSysInfo->CurGunSelected == gunIndex && !pDcChargingInfo->isEVCCIDVerify) {
                     systemPageRestoreInit();
                     pSysInfo->ConnectorPage = _LCM_PRE_CHARGE;

EVSE/Projects/DD360ComBox/Apps/Define/define.h

@@ -501,8 +501,6 @@ struct SysConfigData
 	unsigned char 			AcConnectorCount;			// For DC type
 	unsigned char			SwitchDebugFlag;			// Console Debug
 	unsigned char			AlwaysGfdFlag;
-	unsigned char           AutoAuth_Disable;           //for Auto Authorize, 0:Disable Auto Authorize 1:Auto Authorize
-	unsigned char           EVCCID_Authorize;           //for EVCCID Authorize enable/disable
 	/**************Charging***************/
 	unsigned short			MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh
 	unsigned short			MaxChargingPower;			//0: rating value, 1 ~ RATING_POWER	kW
@@ -541,6 +539,9 @@ struct SysConfigData
 
     /************PowerCabinet************/
     WiringInfoData          WiringInfo;
+
+    unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
+    unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
 };
 
 struct ChargingInfoData

EVSE/Projects/DD360ComBox/Apps/ModuleDoComm/DoComm.c

@@ -759,13 +759,13 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
             }
             break;
         case MISC_CMD_AUTH_DISABLE:
-            pSysConfig->AutoAuth_Disable = value;
-            log_info("Auto Authorize Disable:%d", pSysConfig->AutoAuth_Disable);
+            pSysConfig->AuthorisationMode = value;
+            log_info("Auto Authorize Disable:%d", pSysConfig->AuthorisationMode);
             //clearMiscCommand();
         	break;
         case MISC_CMD_EVCCID_ENABLE:
-            pSysConfig->EVCCID_Authorize = value;
-            log_info("Authorize By EVCCID:%d",pSysConfig->EVCCID_Authorize);
+            pSysConfig->isAuthrizeByEVCCID = value;
+            log_info("Authorize By EVCCID:%d",pSysConfig->isAuthrizeByEVCCID);
             //clearMiscCommand();
         	break;
 
@@ -1708,7 +1708,7 @@ static void checkAuthorProcess(int fd, uint8_t plugNum)
 #if defined DD360Audi
     gunID = gDoCommGblData.ConnectorID[pSysInfo->CurGunSelected];
     //gunID = gDoCommGblData.ConnectorID[plugNum];
-    if (pSysConfig->AutoAuth_Disable) {
+    if (pSysConfig->AuthorisationMode) {
         gunID = ID_REGISTER;
         ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance = 0.0;
     }

EVSE/Projects/DD360ComBox/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -337,7 +337,7 @@ void CANReceiver(int fd)
                         log_info("Conn %d, Plugin. ", targetGun);
                         pDcChargingInfo->isEVCCIDVerify = false;
 #ifdef DD360Audi                       
-                        if (pSysConfig->EVCCID_Authorize)
+                        if (pSysConfig->isAuthrizeByEVCCID)
                             pSysInfo->CurGunSelected = targetGun;
 #endif                        
                     } else if (frame.data[0] == UNPLUG) {

EVSE/Projects/DD360ComBox/Apps/ModuleEvComm/Module_EvTxComm.c

@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
                 }
                 // Set Ev board in communication mode
                 // Get EVCCID for authorize when gun plug-in only for CCS
-                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->EVCCID_Authorize &&
+                if ( pDcChargingInfo->ConnectorPlugIn && pSysConfig->isAuthrizeByEVCCID &&
                         ShmCcsData->CommProtocol == _CCS_COMM_V2GMessage_DIN70121) {
                     if (Comcont == 1 && evstatus < 15) {
                         GetEVCCIDReq(gunIndex,pDcChargingInfo->Evboard_id);