michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update (develop) - GCI - GciBridge - better return for Connect

Browse Source
This commit is contained in:
Marek Frniak 2026-05-11 17:14:56 +02:00
parent 953b02a6e8
commit 76e7ccb4a6
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs
View File

@ -716,7 +716,7 @@ namespace GenesisCordonelInterface.API
if (!meter.IsLoggedOn)
{
meter.Login();
meter.Login2();
if (meter.IsLoggedOn)
{
@ -738,7 +738,9 @@ namespace GenesisCordonelInterface.API
Success = false,
SlotId = slot,
IsLoggedOn = false,
Message = "Login failed"
Message = string.IsNullOrWhiteSpace(meter.LastLoginError)
? "Login failed"
: meter.LastLoginError
};
}
@ -788,7 +790,7 @@ namespace GenesisCordonelInterface.API
if (!meter.IsConnected)
{
meter.ConnectMeter();
meter.ConnectMeter2();
LogInfo(operation, $"New Slot {slot} connection success.");
@ -796,21 +798,10 @@ namespace GenesisCordonelInterface.API
{
Success = true,
SlotId = slot,
IsConnected = true,
Message = "Connected now"
};
}
if (!meter.IsConnected)
{
LogInfo(operation, $"Failed Slot {slot} connection.");
return new PublicModels.GciConnectResult
{
Success = false,
SlotId = slot,
IsConnected = false,
Message = "Connect failed"
IsConnected = meter.IsConnected,
Message = meter.IsConnected
? "Connected now"
: meter.LastConnectError
};
}

33
TBF/Rig/BridgeComponents/GciBridge/GciBridge.cs
View File

@ -467,7 +467,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
/// -> InterfaceOutsideToGCI.ConnectOneSlotAsync()
/// -> InterfaceGCIToLaatzen.ConnectOneMeterAsync()
/// -> per-slot GCI worker
/// -> MeterBatch.MetersLogin()
/// -> Protocols connect to ports
/// -> GenesisMeter register snapshot
/// </summary>
/// <param name="slotId">Slot number.</param>
@ -489,11 +489,34 @@ namespace TBF.Rig.BridgeComponents.GciBridge
return result;
}
public Task<GciPublicModels.GciLoginResult> LoginAsync(
int slot,
CancellationToken token = default)
/// <summary>
/// Logs in to the meter assigned to the requested slot.
///
/// Trace:
/// GciBridge.LoginAsync()
/// -> InterfaceOutsideToGCI.LoginOneSlotAsync()
/// -> InterfaceGCIToLaatzen.LoginOneMeterAsync()
/// -> per-slot GCI worker
/// -> MeterBatch.MetersLogin()
/// -> GenesisMeter login state
/// </summary>
/// <param name="slotId">Slot number.</param>
/// <param name="token">Cancellation token.</param>
/// <returns>Login result for the requested slot.</returns>
public async Task<GciPublicModels.GciLoginResult> LoginAsync(
int slotId,
CancellationToken token = default)
{
return gciExternalInterface.LoginOneSlotAsync(slot, token);
EnsureExternalInterface();
if (slotId <= 0)
throw new ArgumentException("Invalid slot id.");
var result = await gciExternalInterface.LoginOneSlotAsync(slotId, token);
log.InfoFormat("{0}: LoginAsync({1}) invoked. Result={2}", Name, slotId, result);
return result;
}
/// <summary>

4
TBF/TBF.csproj
View File

@ -4434,10 +4434,6 @@
<Project>{439D0878-C76E-452B-B17D-209A89E91D36}</Project>
<Name>Dirichlet.Numerics</Name>
</ProjectReference>
<ProjectReference Include="..\ExternalProjects\Laatzen\Genesis\Common\CommonCore\CommonCore.csproj">
<Project>{1b02c79e-0b19-43e2-8f6b-71ef0c786c97}</Project>
<Name>CommonCore</Name>
</ProjectReference>
<ProjectReference Include="..\GemCard\GemCard.csproj">
<Project>{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}</Project>
<Name>GemCard</Name>