2022-02-11 / Simon Xue

EVSE/Projects/DD360Tcci/Apps/CSU/RFID.c

@@ -278,17 +278,21 @@ void AuthorizeToCharge()
     if(isAuthorizedComplete())
     {
        // StopSystemTimeoutDet();
-        StartSystemTimeoutDet(Timeout_WaitBalance);
-        if (ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance != FAIL_BALANCE_PRICES) {
-            StopSystemTimeoutDet();
+      //  StartSystemTimeoutDet(Timeout_WaitBalance);
+       // if (ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance != FAIL_BALANCE_PRICES)
+        {
+       //     StopSystemTimeoutDet();
             // 判斷後台回覆狀態
-            if (canStartCharging() && ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] == TRUE) {
+            if (canStartCharging()) {
             // LCM => Authorize complete
             	//pDcChargingInfo->SystemStatus = S_AUTHORIZING;
                 //pSysInfo->SystemPage = _PAGE_PLUGIN;
                 //log_info("Wait Gun(%d) plugin",pSysInfo->CurGunSelected);
-                DetectPluginStart();
-				pSysInfo->SystemPage = _PAGE_PLUGIN;
+            	if (ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] == TRUE) {
+					DetectPluginStart();
+					pSysInfo->SystemPage = _PAGE_PLUGIN;
+					log_info("Authorize Complete can plugin gun");
+            	}
                 //log_info("Gun(%d) Balance: %f",pSysInfo->CurGunSelected,
                 //        ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance);
             } else {
@@ -479,15 +483,20 @@ void CreateRfidFork(void)
 					is_idle = TRUE;
 				}
 
-				if (ShmDcCommonData->StopCharge[gunIndex] == TRUE && ShmDcCommonData->finalcost_flag[gunIndex]) {
-					if (ShmDcCommonData->finalcost[gunIndex] <= 0) {
-
+				if (ShmDcCommonData->finalcost_flag[gunIndex]) {
+					StopGunInfoTimeoutDet(gunIndex); //Timeout_FinalCost
+					pSysInfo->SystemPage = _PAGE_PAYING;
+					if (ShmDcCommonData->finalcost[gunIndex] < 1) {
+						ShmDcCommonData->PreAuth_Config = _CREDITCARD_CANCEL;
+						pSysInfo->SystemPage = _PAGE_COMPLETE;
 					} else {
 						ShmDcCommonData->StopCharge[gunIndex] = FALSE;
-						StopGunInfoTimeoutDet(gunIndex); //Timeout_FinalCost
+
 						PreAuthCompleteToCardReader(fd,gunIndex);
 						ShmDcCommonData->PayFinish[gunIndex] = TRUE;
 					}
+					ShmDcCommonData->finalcost_flag[gunIndex] = FALSE;
+
 				}
 			} // for
 			if (is_idle == TRUE && tm->tm_min%15 == 0 &&
@@ -498,6 +507,7 @@ void CreateRfidFork(void)
 					result = CreditCardPreAuthComplete(fd,(int)ShmDcCommonData->ReAuthComplete.Amount ,"TCC Test",
 															&ShmDcCommonData->ReAuthComplete.VemData[0],
 															&ShmDcCommonData->pCreditCard[0]);
+					sleep(10);
 					if (result > 0) {
 						ShmDcCommonData->ReAuthComplete.DeductResult = YES;
 						ShmDcCommonData->ReAuthComplete.IsUpload = NO;
@@ -514,14 +524,21 @@ void CreateRfidFork(void)
 				}
 			}
             if(ShmDcCommonData->PreAuth_Config == _CREDITCARD_CANCEL) {
+
+        		log_info("PreAuth Cancel ApprovalNo:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].ApprovalNo[0]);
+        		log_info("PreAuth Cancel CardNo:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].CardNo[0]);
+        		log_info("PreAuth Cancel VemData:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].VemData[0]);
+
             	ShmDcCommonData->PreAuth_Result = CreditCardPreAuthCancel(fd,PREAUTHMONEY,"TCC Test",
 					&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].ApprovalNo[0],
 					&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].CardNo[0],
 					&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].VemData[0]);
-
+            	sleep(10);
 				if (ShmDcCommonData->PreAuth_Result > 0 ) {
 					strcpy((char *)pSysConfig->UserId,"");
 					log_info("Credit Card Cancel Stop");
+					ShmDcCommonData->TradeCancel = FALSE;
+					ShmDcCommonData->finalcost_flag[gunIndex] = FALSE;
 					memset(&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected], 0, sizeof(TransInfo));
 				} else if (ShmDcCommonData->PreAuth_Result < 0) {
 					log_info("Credit Card Cancel Fail");
@@ -529,9 +546,15 @@ void CreateRfidFork(void)
 				}
 				ShmDcCommonData->PreAuth_Config = _CREDITCARD_IDLE;
             } else if (ShmDcCommonData->PreAuth_Config == _CREDITCARD_PREAUTH) {
+
         		result = CreditCardPreAuth(fd, PREAUTHMONEY,"TCC Test", &ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected]);
+        		log_info("PreAuth ApprovalNo:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].ApprovalNo[0]);
+        		log_info("PreAuth CardNo:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].CardNo[0]);
+        		log_info("PreAuth VemData:%s",&ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].VemData[0]);
+
 				//result = 1;
 				if (result > 0) {
+					sleep(10);
 					ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] = TRUE;
 					//pSysInfo->SystemPage = _PAGE_PLUGIN;
 					//strncpy((char *)pSysConfig->UserId,ShmDcCommonData->pCreditCard[pSysInfo->CurGunSelected].CardNo,20);

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

@@ -81,8 +81,8 @@ uint8_t bd0_2_status = 0;
 uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
-char *fwVersion = "V2.01.00.0000.00"; // Phihong version
-char* DebugVersion = "v2.01.00";      // Software debug version
+char *fwVersion = "V2.02.00.0000.00"; // Phihong version
+char* DebugVersion = "v2.02.00";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -2480,7 +2480,7 @@ void CreateTimeoutFork(void)
             }
             //if (pSysInfo->SystemTimeoutFlag != 0)
             //log_info("Timeout ***********SystemTimeoutFlag = %d(%d) ********",pSysInfo->SystemTimeoutFlag,
-            //        GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL);
+             //       GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL);
 
             // 系統
             switch (pSysInfo->SystemTimeoutFlag) {
@@ -2617,6 +2617,12 @@ void CreateTimeoutFork(void)
 					ShmDcCommonData->PreAuth_Config = _CREDITCARD_CANCEL;
 				}
 				break;
+			case Timeout_KeepComplete:
+				if (GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL >= TCC_KEEPCOMPLETE_TIMEOUT) {
+					StopSystemTimeoutDet();
+					ShmDcCommonData->KeepComplete[pSysInfo->CurGunSelected] = FALSE;
+				}
+				break;
             }
 
 
@@ -4270,7 +4276,6 @@ CheckStatus:
                         if (pDcChargingInfo->ConnectorPlugIn == YES &&
                                 pDcChargingInfo->IsAvailable &&
                                 pDcChargingInfo->SystemStatus == S_AUTHORIZING &&
-								ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] == TRUE &&
                                 //waitSelectGunPlugIt(gunIndex)
                                 (waitRightGunPlugIt(gunIndex) == PASS ||
                                  waitLeftGunPlugIt(gunIndex) == PASS)
@@ -4499,8 +4504,11 @@ CheckStatus:
                         strcpy((char *)ShmOCPP16Data->StopTransaction[gunIndex].StopReason, "Local");
                     }
                     StopGunInfoTimeoutDet(gunIndex);
-                    StartSystemTimeoutDet(Timeout_Terminating);
+                    //StartSystemTimeoutDet(Timeout_Terminating);
                     pSysInfo->CurGunSelected = gunIndex;
+                    ShmDcCommonData->KeepComplete[gunIndex] = TRUE;
+                    ShmDcCommonData->StopCharge[pSysInfo->CurGunSelected] = TRUE;
+                	//StartGunInfoTimeoutDet(pSysInfo->CurGunSelected,Timeout_FinalCost);
                 }
                 // For Precharging timeout
 
@@ -4528,7 +4536,8 @@ CheckStatus:
                 if (pSysInfo->SystemPage == _PAGE_MAINTAIN) {
 					break;
                 }
-                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING) {
+                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING &&
+                		ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	if (ShmDcCommonData->PayPass_flag[pSysInfo->CurGunSelected] == TRUE)
                 		pSysInfo->SystemPage = _PAGE_COMPLETE;
                 	else
@@ -4545,17 +4554,20 @@ CheckStatus:
                     }
                     TheEndCharging(gunIndex);
                     StopSystemTimeoutDet();
+                    ShmDcCommonData->KeepComplete[gunIndex] = TRUE;
+
                 }
 
                 //if (pSysInfo->SystemPage == _LCM_ERROR) {
                 if (pSysInfo->SystemPage == _PAGE_MAINTAIN) {
                     break;
                 }
-                if (pSysInfo->CurGunSelected == gunIndex && is_plugout[gunIndex] == TRUE) {
+                if (pSysInfo->CurGunSelected == gunIndex && is_plugout[gunIndex] == TRUE &&
+                		ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	pSysInfo->SystemPage = _PAGE_EXIT;
                 	break;
                 }
-                if (pDcChargingInfo->ConnectorPlugIn == NO) {
+                if (pDcChargingInfo->ConnectorPlugIn == NO && ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	is_plugout[gunIndex] = TRUE;
                     StartGunInfoTimeoutDet(gunIndex, Timeout_PlugOutGun);
                     if (pSysInfo->CurGunSelected == gunIndex) {
@@ -4564,8 +4576,9 @@ CheckStatus:
                     }
                 }
 
-                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING) {
-                	if (ShmDcCommonData->PayPass_flag[pSysInfo->CurGunSelected] == TRUE)
+                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING &&
+                		ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
+                	if (ShmDcCommonData->PayPass_flag[pSysInfo->CurGunSelected] == TRUE )
 						pSysInfo->SystemPage = _PAGE_COMPLETE;
 					else
 						pSysInfo->SystemPage = _PAGE_PAYFAIL;
@@ -4589,11 +4602,11 @@ CheckStatus:
                 		ShmDcCommonData->PreAuth_Config = _CREDITCARD_CANCEL;
                 		ShmDcCommonData->PreAuth_Result = 0;
                     } else {
-						if(ShmDcCommonData->PayFinish[gunIndex] == FALSE) {
-							pSysInfo->SystemPage = _PAGE_PAYING;
-						}
-						ShmDcCommonData->StopCharge[gunIndex] = TRUE;
+	                    ShmDcCommonData->StopCharge[pSysInfo->CurGunSelected] = TRUE;
+	                	//StartGunInfoTimeoutDet(pSysInfo->CurGunSelected,Timeout_FinalCost);
                     }
+                    ShmDcCommonData->KeepComplete[gunIndex] = TRUE;
+
                 }
 
                 if (pSysWarning->Level == WARN_LV_ER) {
@@ -4601,11 +4614,12 @@ CheckStatus:
 
 					continue;
 				}
-                if (pSysInfo->CurGunSelected == gunIndex && is_plugout[gunIndex] == TRUE) {
+                if (pSysInfo->CurGunSelected == gunIndex && is_plugout[gunIndex] == TRUE &&
+                		ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	pSysInfo->SystemPage = _PAGE_EXIT;
                 	break;
                 }
-                if (pDcChargingInfo->ConnectorPlugIn == NO) {
+                if (pDcChargingInfo->ConnectorPlugIn == NO && ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	is_plugout[gunIndex] = TRUE;
 					if (pDcChargingInfo->Replug_flag == TRUE) {
 						pSysInfo->SystemPage = _PAGE_SELECT_GUN;
@@ -4620,7 +4634,8 @@ CheckStatus:
                 //if (pSysInfo->SystemPage == _PAGE_PAYING)
                 //	break;
 
-                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING) {
+                if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _PAGE_PAYING &&
+                		ShmDcCommonData->KeepComplete[gunIndex] == FALSE) {
                 	if (pDcChargingInfo->Replug_flag == TRUE)
                 		pSysInfo->SystemPage = _PAGE_PLUGOUT;
                 	else {

EVSE/Projects/DD360Tcci/Apps/CSU/main.h

@@ -53,6 +53,7 @@
 #define TCC_FINALCOST_TIMEOUT					(30)
 #define TCC_SCANCARD_TIMEOUT					(60)
 #define TCC_SENSING_TIMEOUT						(60)
+#define TCC_KEEPCOMPLETE_TIMEOUT				(10)
 
 //#define log_info(format, args...) StoreLogMsg_1("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 //#define log_warn(format, args...) StoreLogMsg_1("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)

EVSE/Projects/DD360Tcci/Apps/Config.h

@@ -484,10 +484,12 @@ typedef struct StDcCommonInfo {
     unsigned int PayFinish[2];
     unsigned int StopCharge[2];
     unsigned int GetCardNo[2];
+    unsigned int TradeCancel;
     int reupload_deduct_status;		// 0:Not ReUpload 1:ReUpload 2:ReUpload finish
     RecordTransactionInfo TransactionInfo[2];
     RecordTransactionInfo UploadRedectInfo;
     RecordTransactionInfo ReAuthComplete;
+    unsigned int KeepComplete[2];
 } DcCommonInfo;
 
 #endif /* CONFIG_H_ */

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

@@ -1958,7 +1958,7 @@ static void checkAuthorProcess(int fd, uint8_t plugNum)
         ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance = 0.0;
     }
 #else
-    gunID = gDoCommGblData.ConnectorID[plugNum];;
+    gunID = gDoCommGblData.ConnectorID[pSysInfo->CurGunSelected];
 
     ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance = 0.0; //非Audi 不需要等待主櫃回報餘額
 #endif // DD360Audi

EVSE/Projects/DD360Tcci/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -205,22 +205,32 @@ void CheckReturnPress()
 	//pDcChargingInfo->SystemStatus = S_IDLE;
 	StopSystemTimeoutDet();
 	if ( pDcChargingInfo->SystemStatus == S_AUTHORIZING ) {
-		if (pSysInfo->SystemPage == _PAGE_AUTHORIZE || pSysInfo->SystemPage == _PAGE_PLUGIN ) {
+		if (pSysInfo->SystemPage == _PAGE_AUTHORIZE) {
 			pSysInfo->SystemPage = _PAGE_SELECT_PAY;
+		} else if (pSysInfo->SystemPage == _PAGE_PLUGIN) {
+			pSysInfo->SystemPage = _PAGE_SENSING;
 		}
-		pDcChargingInfo->SystemStatus = S_IDLE;
-		ShmDcCommonData->PreAuth_Config = _CREDITCARD_CANCEL;
-		ShmDcCommonData->PreAuth_Result = 0;
-		for(i=0;i<=30;i++) {
-			if(ShmDcCommonData->PreAuth_Result != 0)
-				break;
-			sleep(1);
-		}
-		ShmDcCommonData->PreAuth_Result = 0;
+		ShmDcCommonData->TradeCancel = TRUE;
+		if (ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] == TRUE) {
+			ShmDcCommonData->PreAuth_Config = _CREDITCARD_CANCEL;
+			ShmDcCommonData->PreAuth_Result = 0;
+			ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] = FALSE;
+			for(i=0;i<=30;i++) {
+				if(ShmDcCommonData->PreAuth_Result != 0)
+					break;
+				sleep(1);
+			}
+			pDcChargingInfo->SystemStatus = S_IDLE;
+			ShmDcCommonData->PreAuth_Result = 0;
 
-		strcpy((char *)pSysConfig->UserId, "");
+			strcpy((char *)pSysConfig->UserId, "");
+		}
 		return;
 	}
+	if (pDcChargingInfo->SystemStatus == S_IDLE && pSysInfo->SystemPage == _PAGE_AUTHORIZE_FAIL ) {
+		pDcChargingInfo->SystemStatus = S_IDLE;
+		strcpy((char *)pSysConfig->UserId, "");
+	}
 	if ( pSysInfo->SystemPage == _PAGE_EXIT ) {
 		pDcChargingInfo->SystemStatus = S_IDLE;
 		pSysInfo->SystemPage = _PAGE_IDLE;
@@ -288,7 +298,7 @@ void CheckPayCreditCard()
 		setSelGunWaitToAuthor(pSysInfo->CurGunSelected);
 		pSysInfo->SystemPage = _PAGE_AUTHORIZE;
 		//pDcChargingInfo->SystemStatus = S_AUTHORIZING;
-
+		StartSystemTimeoutDet(Timeout_Sensing);
 		//
 		AuthorizingStart();
 	}
@@ -359,8 +369,6 @@ void CheckTouchPress(short id)
 
             break;
         case _Touch_Return:
-        	if (pSysInfo->SystemPage == _PAGE_AUTHORIZE)
-        		pSysInfo->SystemPage = _PAGE_SELECT_PAY;
         	CheckReturnPress();
         	break;
         case _Touch_IDLE:
@@ -1079,6 +1087,16 @@ void changeLocationValue(int _location)
 }
 int old_money = 0;
 int ClearQR_flag[2];
+void ShowTradeSensing(int _show)
+{
+	if (_show) {
+		ChangeDisplay2Value(_Icon_Location,(short)_TCC_PreAuth);
+	}
+}
+void ShowTradeCancel(int _show)
+{
+
+}
 void ProcessPageInfo()
 {
     // Show Gun Working and Type
@@ -1156,9 +1174,11 @@ void ProcessPageInfo()
 				}*/
             	//ChangeDisplay2Value(_Icon_Precharge,0);
             	//ChangeDisplay2Value(_Icon_Precharge,1);
+
             	if (ShmDcCommonData->GetCardNo[pSysInfo->CurGunSelected] == TRUE &&
             			ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] != TRUE) {
             		ShmDcCommonData->PreAuth_Config = _CREDITCARD_PREAUTH;
+            		StartSystemTimeoutDet(Timeout_Sensing);
             		ShmDcCommonData->PreAuth_Result = 0;
             		sleep(3);
             		pSysInfo->SystemPage = _PAGE_SENSING;
@@ -1167,6 +1187,9 @@ void ProcessPageInfo()
             	ChangeChargingRateValue(ShmDcCommonData->ChargingRate);
                 break;
             case _PAGE_SENSING:
+            	if (ShmDcCommonData->AuthPass_flag[pSysInfo->CurGunSelected] == TRUE) {
+
+            	}
             	break;
             case _PAGE_PLUGIN:
             	_everyPageRollChange = 0;
@@ -1219,6 +1242,7 @@ void ProcessPageInfo()
                 } else {
                     ChangeChargingEnergyValue(0);
                 }
+
                 if ( ShmDcCommonData->finalcost[i] >= 0 && ShmDcCommonData->finalcost_flag[i] == TRUE) {
                 	StopGunInfoTimeoutDet(i);
 					ChangeChargingFeeValue(ShmDcCommonData->finalcost[i]);
@@ -1227,6 +1251,7 @@ void ProcessPageInfo()
                 ChangeCarBonValue(pDcChargingInfo->PresentChargedEnergy);
                 ChangeBattMapAndValue(pDcChargingInfo->EvBatterySoc);
                 //StartSystemTimeoutDet(Timeout_ReturnViewPage);
+                StartSystemTimeoutDet(Timeout_KeepComplete);
                 break;
 
             case _PAGE_PLUGOUT:
@@ -1434,6 +1459,7 @@ void DefautLayOut()
 		if (i==0x28 || i ==0x2A)
 			continue;
 	}
+	ChangeDisplay2Value(0x1066,1);
 	ChangeDisplay2Value(_Icon_MobilePay,0);
 	ChangeDisplay2Value(_Icon_CardPay,0);
 	ChangeDisplay2Value(0x5000,1);

EVSE/Projects/DD360Tcci/Apps/ModuleLcmCtrl/Module_LcmControl.h

@@ -95,6 +95,11 @@
 #define _Icon_Warming2			0x1058
 #define _Icon_Warming3			0x105A
 #define _Icon_Warming4			0x105C
+#define _Icon_TradeCancel		0x105E
+#define _Icon_CountDownBG		0x1060
+#define _Icon_CountDownTen		0x1062
+#define _Icon_CountDownDigital	0x1064
+#define _Icon_SecondSense		0x1066
 
 #define _String_Date			0x3000
 #define _String_Tempture		0x3010

EVSE/Projects/DD360Tcci/Apps/ModuleUpdateFW/Module_UpdateFW.c

@@ -499,7 +499,7 @@ void CheckFwUpdateFunction(void)
 
         pSysInfo->FirmwareUpdate = NO;
         sleep(5);
-        //system("reboot -f");
+        system("reboot -f");
     } else if (ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq == YES) {
         ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = NO;
 

EVSE/Projects/DD360Tcci/Apps/timeout.h

@@ -61,6 +61,7 @@ enum Timeout_flag {
 	Timeout_FinalCost			   = 24,
 	Timeout_ScanCard			   = 25,
 	Timeout_Sensing				   = 26,
+	Timeout_KeepComplete		   = 27,
 };
 
 //------------------------------------------------------------------------------