Skip to content

Commit

Permalink
Minor bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahzf
ahzf committed Sep 4, 2024
1 parent 693a479 commit 30836ac
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 8 deletions.
32 changes: 30 additions & 2 deletions Vanaheimr Electric.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_EEBus_SPINE_Tests", "l
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OCPPv2.1_EnergyMeter", "libs\WWCP_OCPP\WWCP_OCPPv2.1_EnergyMeter\WWCP_OCPPv2.1_EnergyMeter.csproj", "{6CBD2177-4728-4FA9-8E11-70394A377E5C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WWCP_OverlayNetworking2", "libs\WWCP_Core\WWCP_OverlayNetworking2\WWCP_OverlayNetworking2.csproj", "{EF7692EA-A5A2-4160-9E82-FB4E84B499FF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OverlayNetworking2", "libs\WWCP_Core\WWCP_OverlayNetworking2\WWCP_OverlayNetworking2.csproj", "{EF7692EA-A5A2-4160-9E82-FB4E84B499FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WWCP_CoreData", "libs\WWCP_Core\WWCP_CoreData\WWCP_CoreData.csproj", "{9F6123A2-385C-4315-B450-8EFB3EDDA8AF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_CoreData", "libs\WWCP_Core\WWCP_CoreData\WWCP_CoreData.csproj", "{9F6123A2-385C-4315-B450-8EFB3EDDA8AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OCPPv1.6", "libs\WWCP_OCPP\WWCP_OCPPv1.6\WWCP_OCPPv1.6.csproj", "{B3D49C31-3744-47C1-ACC5-134BF679C2C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OCPPv1.6_CentralSystem", "libs\WWCP_OCPP\WWCP_OCPPv1.6_CentralSystem\WWCP_OCPPv1.6_CentralSystem.csproj", "{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OCPPv1.6_ChargePoint", "libs\WWCP_OCPP\WWCP_OCPPv1.6_ChargePoint\WWCP_OCPPv1.6_ChargePoint.csproj", "{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WWCP_OCPPv1.6_Adapter", "libs\WWCP_OCPP\WWCP_OCPPv1.6_Adapter\WWCP_OCPPv1.6_Adapter.csproj", "{CE5806A6-8457-4043-BA60-0FC4F9A6CA87}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -405,6 +413,22 @@ Global
{9F6123A2-385C-4315-B450-8EFB3EDDA8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F6123A2-385C-4315-B450-8EFB3EDDA8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F6123A2-385C-4315-B450-8EFB3EDDA8AF}.Release|Any CPU.Build.0 = Release|Any CPU
{B3D49C31-3744-47C1-ACC5-134BF679C2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3D49C31-3744-47C1-ACC5-134BF679C2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3D49C31-3744-47C1-ACC5-134BF679C2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3D49C31-3744-47C1-ACC5-134BF679C2C1}.Release|Any CPU.Build.0 = Release|Any CPU
{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D}.Release|Any CPU.Build.0 = Release|Any CPU
{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D}.Release|Any CPU.Build.0 = Release|Any CPU
{CE5806A6-8457-4043-BA60-0FC4F9A6CA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE5806A6-8457-4043-BA60-0FC4F9A6CA87}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE5806A6-8457-4043-BA60-0FC4F9A6CA87}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE5806A6-8457-4043-BA60-0FC4F9A6CA87}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -478,6 +502,10 @@ Global
{6CBD2177-4728-4FA9-8E11-70394A377E5C} = {9321816B-FD3B-429E-972C-C43A0525C945}
{EF7692EA-A5A2-4160-9E82-FB4E84B499FF} = {C1D2648F-7093-4994-9C3E-272798F5B9FB}
{9F6123A2-385C-4315-B450-8EFB3EDDA8AF} = {C1D2648F-7093-4994-9C3E-272798F5B9FB}
{B3D49C31-3744-47C1-ACC5-134BF679C2C1} = {9321816B-FD3B-429E-972C-C43A0525C945}
{DD6D33C8-5B4D-4D8D-B2CC-016FE98F217D} = {9321816B-FD3B-429E-972C-C43A0525C945}
{A664BD2F-C710-44A8-9EE4-A3BF04F8BB2D} = {9321816B-FD3B-429E-972C-C43A0525C945}
{CE5806A6-8457-4043-BA60-0FC4F9A6CA87} = {9321816B-FD3B-429E-972C-C43A0525C945}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6C429541-A495-40A1-967F-974586F38BB4}
Expand Down
1 change: 1 addition & 0 deletions VanaheimrElectric_Tests/HighAvailableNetworking/HA_CS_2_CSMS_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
using cloud.charging.open.protocols.OCPPv2_1.NetworkingNode;

using cloud.charging.open.protocols.WWCP.NetworkingNode;
using cloud.charging.open.protocols.OCPP.WebSockets;

#endregion

Expand Down
11 changes: 8 additions & 3 deletions VanaheimrElectric_Tests/OverlayNetwork/ChargingStation_2_CSMS_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
using cloud.charging.open.protocols.WWCP;
using cloud.charging.open.protocols.WWCP.NetworkingNode;
using cloud.charging.open.protocols.WWCP.WebSockets;
using cloud.charging.open.protocols.OCPP.WebSockets;
using cloud.charging.open.protocols.OCPP;

#endregion

Expand Down Expand Up @@ -608,9 +610,12 @@ chargingStation2 is null ||
return Task.CompletedTask;
};

ocppLocalController1.OCPP.OUT. OnJSONResponseMessageSent += (timestamp, sender, connection, responseMessage, sentMessageResult, ct) => {
ocppLocalController1.OCPP.OUT. OnJSONResponseMessageSent += async (timestamp, sender, connection, responseMessage, sentMessageResult, ct) => {
ocppLocalController_jsonResponseMessagesSent. TryAdd(responseMessage);
return Task.CompletedTask;
DebugX.Log("Here at " + DateTime.Now);
await Task.Delay(30000, ct);
DebugX.Log("Here at " + DateTime.Now);
// return Task.CompletedTask;
};

#endregion
Expand All @@ -621,7 +626,7 @@ chargingStation2 is null ||
var chargingStation2_BootNotificationResponsesReceived = new ConcurrentList<BootNotificationResponse>();

chargingStation2.OCPP.IN.OnJSONResponseMessageReceived += (timestamp, sender, connection, jsonResponseMessage, ct) => {
chargingStation2_jsonMessageResponseReceived. TryAdd(jsonResponseMessage);
chargingStation2_jsonMessageResponseReceived. TryAdd(jsonResponseMessage);
return Task.CompletedTask;
};

Expand Down
2 changes: 2 additions & 0 deletions VanaheimrElectric_Tests/OverlayNetwork/EnergyMeter_2_CSMS_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
using cloud.charging.open.protocols.OCPPv2_1.NetworkingNode;
using cloud.charging.open.protocols.WWCP.NetworkingNode;
using cloud.charging.open.protocols.WWCP;
using cloud.charging.open.protocols.OCPP.WebSockets;
using cloud.charging.open.protocols.OCPP;

#endregion

Expand Down
1 change: 1 addition & 0 deletions VanaheimrElectric_Tests/ReverseOverlayNetwork/ChargingStation_2_CSMS_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using cloud.charging.open.protocols.OCPPv2_1.NetworkingNode;
using cloud.charging.open.protocols.OCPPv2_1.WebSockets;
using cloud.charging.open.protocols.WWCP.WebSockets;
using cloud.charging.open.protocols.OCPP.WebSockets;

#endregion

Expand Down
2 changes: 1 addition & 1 deletion libs/Hermod
Submodule Hermod updated 1 files
+2 −2 Hermod/Hermod/WebSocket/Client/WebSocketClient.cs
2 changes: 1 addition & 1 deletion libs/WWCP_Core
Submodule WWCP_Core updated 2 files
+11 −1 WWCP_CoreData/DataStructures/Complex/CustomData.cs
+7 −3 WWCP_CoreData/NetworkingNode/ANetworkingNode.cs
2 changes: 1 addition & 1 deletion libs/WWCP_OCPP
Submodule WWCP_OCPP updated 691 files

0 comments on commit 30836ac

Please sign in to comment.