Skip to content

Commit

Permalink
More refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
ahzf committed Aug 8, 2024
1 parent 99d5d48 commit 42ceff4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,7 @@ chargingStation2 is null ||
var chargingStation1_RequestStartTransactionRequestSent = new ConcurrentList<RequestStartTransactionRequest>();
var chargingStation1_jsonRequestMessageSent = new ConcurrentList<OCPP_JSONRequestMessage>();

csms1.OCPP.OUT.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, requestStartTransactionRequest, sentMessageResult) => {
csms1.OCPP.OUT.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, requestStartTransactionRequest, sentMessageResult, ct) => {
chargingStation1_RequestStartTransactionRequestSent.TryAdd(requestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -2933,7 +2933,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppGateway.OCPP.FORWARD.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest) => {
ocppGateway.OCPP.FORWARD.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest, ct) => {
ocppGateway_RequestStartTransactionRequestsReceived. TryAdd(RequestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -2943,7 +2943,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppGateway.OCPP.FORWARD.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, RequestStartTransactionRequest, sentMessageResult) => {
ocppGateway.OCPP.FORWARD.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, RequestStartTransactionRequest, sentMessageResult, ct) => {
ocppGateway_RequestStartTransactionRequestsSent. TryAdd(RequestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -2968,7 +2968,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest) => {
ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest, ct) => {
ocppLocalController_RequestStartTransactionRequestsReceived. TryAdd(RequestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -2978,7 +2978,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, RequestStartTransactionRequest, sentMessageResult) => {
ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionRequestSent += (timestamp, sender, connection, RequestStartTransactionRequest, sentMessageResult, ct) => {
ocppLocalController_RequestStartTransactionRequestsSent. TryAdd(RequestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -3000,7 +3000,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

chargingStation1.OCPP.IN.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest) => {
chargingStation1.OCPP.IN.OnRequestStartTransactionRequestReceived += (timestamp, sender, connection, RequestStartTransactionRequest, ct) => {
chargingStation1_RequestStartTransactionRequestsReceived.TryAdd(RequestStartTransactionRequest);
return Task.CompletedTask;
};
Expand All @@ -3018,7 +3018,7 @@ chargingStation2 is null ||
var chargingStation1_RequestStartTransactionResponsesSent = new ConcurrentList<RequestStartTransactionResponse>();
var chargingStation1_jsonResponseMessagesSent = new ConcurrentList<OCPP_JSONResponseMessage>();

chargingStation1.OCPP.OUT.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime) => {
chargingStation1.OCPP.OUT.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime, sentMessageResult, ct) => {
chargingStation1_RequestStartTransactionResponsesSent.TryAdd(response);
return Task.CompletedTask;
};
Expand All @@ -3042,12 +3042,12 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime) => {
ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime, sentMessageResult, ct) => {
ocppLocalController_RequestStartTransactionResponsesReceived.TryAdd(response);
return Task.CompletedTask;
};

ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionResponseReceived += (timestamp, sender, request, response, runtime) => {
ocppLocalController.OCPP.FORWARD.OnRequestStartTransactionResponseReceived += (timestamp, sender, connection, request, response, runtime, ct) => {
ocppLocalController_RequestStartTransactionResponsesReceived.TryAdd(response);
return Task.CompletedTask;
};
Expand All @@ -3071,12 +3071,12 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppGateway.OCPP.FORWARD.OnRequestStartTransactionResponseReceived += (timestamp, sender, request, response, runtime) => {
ocppGateway.OCPP.FORWARD.OnRequestStartTransactionResponseReceived += (timestamp, sender, connection, request, response, runtime, ct) => {
ocppGateway_RequestStartTransactionResponsesReceived.TryAdd(response);
return Task.CompletedTask;
};

ocppGateway.OCPP.FORWARD.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime) => {
ocppGateway.OCPP.FORWARD.OnRequestStartTransactionResponseSent += (timestamp, sender, connection, request, response, runtime, sentMessageResult, ct) => {
ocppGateway_RequestStartTransactionResponsesSent. TryAdd(response);
return Task.CompletedTask;
};
Expand All @@ -3098,7 +3098,7 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

csms1.OCPP.IN.OnRequestStartTransactionResponseReceived += (timestamp, sender, request, response, runtime) => {
csms1.OCPP.IN.OnRequestStartTransactionResponseReceived += (timestamp, sender, connection, request, response, runtime, ct) => {
csms1_RequestStartTransactionResponsesReceived.TryAdd(response);
return Task.CompletedTask;
};
Expand Down
2 changes: 1 addition & 1 deletion libs/WWCP_Core
2 changes: 1 addition & 1 deletion libs/WWCP_OCPP
Submodule WWCP_OCPP updated 60 files
+45 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Charging/GetTransactionStatusResponse.cs
+46 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Charging/QRCodeScannedResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Charging/RequestStartTransactionResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Charging/RequestStopTransactionResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Customer/ClearDisplayMessageResponse.cs
+45 −7 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Customer/CostUpdatedResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Customer/CustomerInformationResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Customer/GetDisplayMessagesResponse.cs
+49 −7 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Customer/SetDisplayMessageResponse.cs
+2 −2 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Firmware/ResetResponse.cs
+48 −6 WWCP_OCPPv2.1/Devices/CSMS/OutgoingMessages/Grid/AFRRSignalResponse.cs
+0 −380 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Charging/GetTransactionStatus.cs
+0 −379 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Charging/QRCodeScanned.cs
+0 −411 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Charging/RequestStartTransaction.cs
+0 −381 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Charging/RequestStopTransaction.cs
+0 −381 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Customer/ClearDisplayMessage.cs
+0 −379 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Customer/CostUpdated.cs
+0 −384 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Customer/CustomerInformation.cs
+0 −381 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Customer/GetDisplayMessages.cs
+0 −385 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Customer/SetDisplayMessage.cs
+0 −381 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/CS/Grid/AFRRSignal.cs
+586 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Charging/GetTransactionStatus.cs
+586 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Charging/QRCodeScanned.cs
+15 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Charging/README.md
+619 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Charging/RequestStartTransaction.cs
+590 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Charging/RequestStopTransaction.cs
+590 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/ClearDisplayMessage.cs
+586 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/CostUpdated.cs
+593 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/CustomerInformation.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/GetDisplayMessages.cs
+19 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/README.md
+365 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Customer/SetDisplayMessage.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Grid/AFRRSignal.cs
+7 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Incoming/Grid/README.md
+0 −179 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Charging/GetTransactionStatus.cs
+0 −181 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Charging/QRCodeScanned.cs
+0 −210 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Charging/RequestStartTransaction.cs
+0 −180 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Charging/RequestStopTransaction.cs
+0 −181 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Customer/ClearDisplayMessage.cs
+0 −180 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Customer/CostUpdated.cs
+0 −183 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Customer/CustomerInformation.cs
+0 −180 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Customer/GetDisplayMessages.cs
+0 −184 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Customer/SetDisplayMessage.cs
+0 −179 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/CSMS/Grid/AFRRSignal.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Charging/GetTransactionStatus.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Charging/QRCodeScanned.cs
+14 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Charging/README.md
+415 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Charging/RequestStartTransaction.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Charging/RequestStopTransaction.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/ClearDisplayMessage.cs
+357 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/CostUpdated.cs
+363 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/CustomerInformation.cs
+590 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/GetDisplayMessages.cs
+19 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/README.md
+594 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Customer/SetDisplayMessage.cs
+590 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Grid/AFRRSignal.cs
+6 −0 WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Outgoing/Grid/README.md
+126 −81 WWCP_OCPPv2.1_CSMS/HTTPAPI/HTTPAPI.cs
+234 −189 WWCP_OCPPv2.1_LocalController/HTTPAPI/HTTPAPI.cs
+13 −13 WWCP_OCPPv2.1_Tests/CSMS/CSMS_Messages_Tests.cs

0 comments on commit 42ceff4

Please sign in to comment.