Merge remote-tracking branch 'origin/AW-CCS'

EVSE/Projects/AW-CCS/Apps/LCM/Module_LcmControl.c

@@ -483,7 +483,7 @@ void page_preparing(uint8_t gun_index, uint8_t system_mode)
 
 void page_charging(uint8_t gun_index, uint8_t system_mode)
 {
-	static char runningCost[256] = {0};
+	static char runningCost[1024] = {0};
 
 	if((getCurrentPage() != SYSTEM_SCREEN_CHARGING) && (!ShmCharger->isAuthrizing && !ShmCharger->isGetAuthResult))
 	{
@@ -1347,10 +1347,31 @@ void setBillingFromBackend(uint8_t gun_index, uint8_t system_mode)
 				}
 				else
 				{
-					setDisplayValue(ICON_PRICE, DISAPPEAR);
-					setDisplayValue(TEXT_PRICE, DISAPPEAR);
-					setDisplayValue(TEXT_CURRENCY_UNIT, DISAPPEAR);
-					setDisplayValue2(MARQUEES_DEFAULT_PRICE, DISAPPEAR);
+					if(system_mode == SYS_MODE_IDLE)
+					{
+						setDisplayValue(ICON_PRICE, DISAPPEAR);
+						setDisplayValue(TEXT_PRICE, DISAPPEAR);
+						setDisplayValue(TEXT_CURRENCY_UNIT, DISAPPEAR);
+						setDisplayValue2(MARQUEES_DEFAULT_PRICE, DISAPPEAR);
+					}
+					else
+					{
+						if((strcmp((char*)ShmSysConfigAndInfo->SysConfig.UserId, (char *)ShmOCPP16Data->Cost.SetUserPrice.idToken) == 0) && ((strcmp((char *)ShmOCPP16Data->Cost.SetUserPrice.idToken,"") != 0)))
+						{
+							setDisplayValue(TEXT_PRICE, DISAPPEAR);
+							setDisplayValue(TEXT_CURRENCY_UNIT, DISAPPEAR);
+							setDisplayValue(ICON_PRICE, APPEAR);
+							setMarqueeControl(MARQUEES_DEFAULT_PRICE, gun_index, SET_USER_PRICE);
+						}
+						else
+						{
+							setDisplayValue(ICON_PRICE, DISAPPEAR);
+							setDisplayValue(TEXT_PRICE, DISAPPEAR);
+							setDisplayValue(TEXT_CURRENCY_UNIT, DISAPPEAR);
+							setDisplayValue2(MARQUEES_DEFAULT_PRICE, DISAPPEAR);
+
+						}
+					}
 				}
 			}
 			else
@@ -3053,7 +3074,14 @@ int main(void)
 				}
 				else if(((ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus == SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus == SYS_MODE_RESERVATION)) && (ShmCharger->gun_info[ShmCharger->gun_selectd].resultAuthorization == VALIDATED_RFID))
 				{
-					page_preparing(ShmCharger->gun_selectd, ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus);
+					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus == SYS_MODE_RESERVATION) && (strcmp((char*)ShmSysConfigAndInfo->SysConfig.UserId, (char*)ShmOCPP16Data->ReserveNow[ShmCharger->gun_selectd].IdTag) != 0))
+					{
+						page_idle(ShmCharger->gun_selectd, ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus);
+					}
+					else
+					{
+						page_preparing(ShmCharger->gun_selectd, ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus);
+					}
 					ShmCharger->gun_info[ShmCharger->gun_selectd].isHandshakeTimerRefresh = NO;
 				}
 			}

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

@@ -3330,7 +3330,7 @@ int isMatchStartUser(unsigned char gun_index)
 				break;
 		}
 	}
-	
+
 	if(isPrintLogOut == OFF)
 	{
 		DEBUG_INFO("==== isMatchStartUser ==== \n");
@@ -4383,7 +4383,7 @@ void checkChargingProfileLimit(uint8_t gun_index, uint8_t system_mode)
 		{
 			// Absolute profile
 			if((mystrcmp((char*)ShmOCPP16Data->MaxChargingProfile.ChargingProfileKind, "Absolute") == PASS))
-			{		
+			{
 				for(uint8_t idx_period=0;idx_period<ARRAY_SIZE(ShmOCPP16Data->MaxChargingProfile.ChargingSchedule.ChargingSchedulePeriod);idx_period++)
 				{
 					if((getMaxScheduleStart() >= ShmOCPP16Data->MaxChargingProfile.ChargingSchedule.ChargingSchedulePeriod[idx_period].StartPeriod) &&
@@ -4846,6 +4846,14 @@ void checkHandshakeCountdown(uint8_t gun_index)
 
 			ShmCharger->timeoutSpec.Handshake_Timeout = ((ocpp_get_connection_timeout()) - getDiffSecNow(startTime[gun_index][TMR_IDX_HANDSHAKING]));
 
+			break;
+		case SYS_MODE_RESERVATION:
+
+			if(ShmCharger->gun_info[ShmCharger->gun_selectd].isHandshakeTimerRefresh == YES)
+				refreshStartTimer(&startTime[0][TMR_IDX_GUN_DETECT]);
+			else
+				ShmCharger->timeoutSpec.Handshake_Timeout = ((ocpp_get_connection_timeout()) - (getDiffSecNow(startTime[0][TMR_IDX_GUN_DETECT])));
+
 			break;
 	}
 }
@@ -4853,6 +4861,7 @@ void checkHandshakeCountdown(uint8_t gun_index)
 void checkRfidAuthrize()
 {
 	static uint8_t isCheckdResult = FALSE;
+	uint8_t isStartByWrongReservation = NO;
 
 	if(!ShmCharger->isAuthrizing)
 	{
@@ -4983,12 +4992,20 @@ void checkRfidAuthrize()
 
 						for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
 							ShmCharger->gun_info[gun_index].resultAuthorization = VALIDATED_RFID;
+
+						if((ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus == SYS_MODE_RESERVATION) && (strcmp((char*)ShmSysConfigAndInfo->SysConfig.UserId, (char*)ShmOCPP16Data->ReserveNow[ShmCharger->gun_selectd].IdTag) != 0))
+						{
+							for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+								ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
+
+							isStartByWrongReservation = YES;
+						}
 					}
 
 					for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
 						checkHandshakeCountdown(gun_index);
 
-					if(getDiffSecNow(startTime[0][TMR_IDX_GUN_DETECT]) < (ocpp_get_connection_timeout()))
+					if((getDiffSecNow(startTime[0][TMR_IDX_GUN_DETECT]) < (ocpp_get_connection_timeout())) && (isStartByWrongReservation != YES))
 					{
 						if(GetCardSerialNumber() != FAIL)
 						{
@@ -5563,6 +5580,7 @@ int main(void)
 						// Response StopTransactionConf
 						ocpp_set_stoptransaction_conf(gun_index, OFF);
 						memset(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId));
+						memset(ShmSysConfigAndInfo->SysConfig.UserId, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
 
 						ShmCharger->gun_info[gun_index].ccsHandshakeState = HANDSHAKE_IDLE;
 						ShmCharger->gun_info[gun_index].chargingMode = CHARGING_MODE_BS;
@@ -5572,7 +5590,7 @@ int main(void)
 						ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
 						//if(ShmCharger->isCcsEnable)system("pkill Module_CCS");
 						DB_Check_Record_Buf(localDb, gun_index);
-						
+
 						// Default previousData every time
 						previousData[gun_index].primaryMcuCp_Pwn_Duty = 0;
 						previousData[gun_index].targetCurrent = 0;
@@ -6328,7 +6346,7 @@ int main(void)
 								}
 								else
 								{}
-							
+
 								setChargerMode(gun_index, SYS_MODE_TERMINATING);
 								DEBUG_INFO("Connector-%d charging duration(%d) already over max duration(%d) in second.\n", gun_index, ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration, (ShmSysConfigAndInfo->SysConfig.MaxChargingDuration*60));
 							}
@@ -6807,7 +6825,10 @@ int main(void)
 									setChargerMode(gun_index, SYS_MODE_AUTHORIZING);
 								}
 								else
+								{
 									DEBUG_INFO("It's not reserve user id.\n");
+									ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
+								}
 
 								ShmCharger->gun_info[gun_index].rfidReq = OFF;
 							}