소스 검색

[Bug fix][Modularization][Module_OcppBackend / Module_OcppBackend20]

2021.05.24 / Folus Wen

Actions:
1. Cancel reservation confirmation flag logic bug fix if charger with 2 connectors above.

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 년 전
부모
커밋
8dab7a7875
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      EVSE/Modularization/ocpp20/MessageHandler.c
  2. 2 1
      EVSE/Modularization/ocppfiles/MessageHandler.c

+ 1 - 1
EVSE/Modularization/ocpp20/MessageHandler.c

@@ -9193,7 +9193,7 @@ int sendCancelReservationConfirmation(char *uuid, unsigned char gun_index)
 								,uuid
 								,json_object_to_json_string_ext(CancelReservation, JSON_C_TO_STRING_PLAIN));
 	json_object_put(CancelReservation);
-	ShmOCPP20Data->CsMsg.bits[0].CancelReservationConf = OFF;
+	ShmOCPP20Data->CsMsg.bits[gun_index].CancelReservationConf = OFF;
 	LWS_Send(message);
 	result = TRUE;
 	return result;

+ 2 - 1
EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -3436,6 +3436,7 @@ void CheckSystemValue(void)
 		if(isWebsocketSendable && (server_sign == TRUE) && (ShmOCPP16Data->CsMsg.bits[gun_index].CancelReservationConf == 1))
 		{
 			sendCancelReservationConfirmation((char *)ShmOCPP16Data->CancelReservation[gun_index].guid,(char *)ShmOCPP16Data->CancelReservation[gun_index].ResponseStatus);
+			ShmOCPP16Data->CsMsg.bits[gun_index].CancelReservationConf = 0;
 		}
 
 		//==========================================
@@ -6382,7 +6383,7 @@ int sendCancelReservationConfirmation(char *uuid,char *payload)
 	sprintf(message,"[%d,\"%s\",{\"status\":\"%s\"}]",MESSAGE_TYPE_CALLRESULT,uuid, payload);
 	LWS_Send(message);
 	result = TRUE;
-	ShmOCPP16Data->CsMsg.bits[0].CancelReservationConf = 0;
+
 	return result;
 }