Skip to content

Commit 87e4b85

Browse files
authored
Merge pull request #32 from smdn/releases/Smdn.Net.EchonetLite.RouteB-2.2.0-1766497653
Release main/Smdn.Net.EchonetLite.RouteB-2.2.0
2 parents 9093b92 + a24d0c2 commit 87e4b85

File tree

3 files changed

+190
-10
lines changed

3 files changed

+190
-10
lines changed
Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
// Smdn.Net.EchonetLite.RouteB.dll (Smdn.Net.EchonetLite.RouteB-2.2.0)
2+
// Name: Smdn.Net.EchonetLite.RouteB
3+
// AssemblyVersion: 2.2.0.0
4+
// InformationalVersion: 2.2.0+eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
5+
// TargetFramework: .NETCoreApp,Version=v10.0
6+
// Configuration: Release
7+
// Metadata: IsTrimmable=True
8+
// Metadata: RepositoryUrl=https://github.com/smdn/Smdn.Net.EchonetLite
9+
// Metadata: RepositoryBranch=main
10+
// Metadata: RepositoryCommit=eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
11+
// Referenced assemblies:
12+
// Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
13+
// Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
14+
// Polly.Core, Version=8.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc
15+
// Smdn.Net.EchonetLite, Version=2.1.0.0, Culture=neutral
16+
// Smdn.Net.EchonetLite.Primitives, Version=2.0.0.0, Culture=neutral
17+
// Smdn.Net.EchonetLite.RouteB.Primitives, Version=2.1.0.0, Culture=neutral
18+
// System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
19+
// System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
20+
// System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
21+
// System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
22+
// System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51
23+
// System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
24+
// System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
25+
#nullable enable annotations
26+
27+
using System;
28+
using System.Collections.Generic;
29+
using System.ComponentModel;
30+
using System.Threading;
31+
using System.Threading.Tasks;
32+
using Microsoft.Extensions.DependencyInjection;
33+
using Microsoft.Extensions.Logging;
34+
using Polly;
35+
using Smdn.Net.EchonetLite;
36+
using Smdn.Net.EchonetLite.ObjectModel;
37+
using Smdn.Net.EchonetLite.RouteB;
38+
using Smdn.Net.EchonetLite.RouteB.Credentials;
39+
using Smdn.Net.EchonetLite.RouteB.DependencyInjection;
40+
using Smdn.Net.EchonetLite.RouteB.Transport;
41+
42+
namespace Smdn.Net.EchonetLite.RouteB {
43+
public class HemsController :
44+
IAsyncDisposable,
45+
IDisposable,
46+
IRouteBCredentialIdentity
47+
{
48+
public HemsController(IRouteBEchonetLiteHandlerFactory echonetLiteHandlerFactory, IRouteBCredentialProvider routeBCredentialProvider, ILogger? logger, ILoggerFactory? loggerFactoryForEchonetClient) {}
49+
public HemsController(IServiceProvider serviceProvider) {}
50+
51+
protected EchonetClient Client { get; }
52+
public EchonetObject Controller { get; }
53+
public bool IsConnected { get; }
54+
protected bool IsDisposed { get; }
55+
protected ILogger? Logger { get; }
56+
public LowVoltageSmartElectricEnergyMeter SmartMeter { get; }
57+
public ISynchronizeInvoke? SynchronizingObject { get; set; }
58+
public TimeSpan TimeoutWaitingProactiveNotification { get; set; }
59+
public TimeSpan TimeoutWaitingResponse1 { get; set; }
60+
public TimeSpan TimeoutWaitingResponse2 { get; set; }
61+
62+
public ValueTask ConnectAsync(ResiliencePipeline? resiliencePipelineForServiceRequest = null, CancellationToken cancellationToken = default) {}
63+
public async ValueTask DisconnectAsync(CancellationToken cancellationToken = default) {}
64+
protected virtual void Dispose(bool disposing) {}
65+
public void Dispose() {}
66+
public async ValueTask DisposeAsync() {}
67+
protected virtual async ValueTask DisposeAsyncCore() {}
68+
public ValueTask<TResult> RunWithResponseWaitTimer1Async<TResult>(Func<CancellationToken, ValueTask<TResult>> asyncAction, TResult resultForTimeout, CancellationToken cancellationToken = default) {}
69+
public ValueTask<TResult> RunWithResponseWaitTimer1Async<TResult>(Func<CancellationToken, ValueTask<TResult>> asyncAction, string? messageForTimeoutException = null, CancellationToken cancellationToken = default) {}
70+
public ValueTask<TResult> RunWithResponseWaitTimer2Async<TResult>(Func<CancellationToken, ValueTask<TResult>> asyncAction, string? messageForTimeoutException = null, CancellationToken cancellationToken = default) {}
71+
protected void ThrowIfDisconnected() {}
72+
protected void ThrowIfDisposed() {}
73+
}
74+
75+
public sealed class LowVoltageSmartElectricEnergyMeter : DeviceSuperClass {
76+
public IEchonetPropertyGetAccessor<int> Coefficient { get; }
77+
public IEchonetPropertyGetAccessor<IReadOnlyList<(MeasurementValue<ElectricEnergyValue> NormalDirection, MeasurementValue<ElectricEnergyValue> ReverseDirection)>> CumulativeElectricEnergyLog2 { get; }
78+
public IEchonetPropertySetGetAccessor<DateTime> DayForTheHistoricalDataOfCumulativeElectricEnergy1 { get; }
79+
public IEchonetPropertySetGetAccessor<(DateTime DateAndTime, int NumberOfItems)> DayForTheHistoricalDataOfCumulativeElectricEnergy2 { get; }
80+
public IEchonetPropertyGetAccessor<(ElectricCurrentValue RPhase, ElectricCurrentValue TPhase)> InstantaneousCurrent { get; }
81+
public IEchonetPropertyGetAccessor<int> InstantaneousElectricPower { get; }
82+
public IEchonetPropertyGetAccessor<ElectricEnergyValue> NormalDirectionCumulativeElectricEnergy { get; }
83+
public IEchonetPropertyGetAccessor<MeasurementValue<ElectricEnergyValue>> NormalDirectionCumulativeElectricEnergyAtEvery30Min { get; }
84+
public IEchonetPropertyGetAccessor<IReadOnlyList<MeasurementValue<ElectricEnergyValue>>> NormalDirectionCumulativeElectricEnergyLog1 { get; }
85+
public IEchonetPropertyGetAccessor<int> NumberOfEffectiveDigitsCumulativeElectricEnergy { get; }
86+
public IEchonetPropertyGetAccessor<(MeasurementValue<ElectricEnergyValue> NormalDirection, MeasurementValue<ElectricEnergyValue> ReverseDirection)> OneMinuteMeasuredCumulativeAmountsOfElectricEnergy { get; }
87+
public IEchonetPropertyGetAccessor<ElectricEnergyValue> ReverseDirectionCumulativeElectricEnergy { get; }
88+
public IEchonetPropertyGetAccessor<MeasurementValue<ElectricEnergyValue>> ReverseDirectionCumulativeElectricEnergyAtEvery30Min { get; }
89+
public IEchonetPropertyGetAccessor<IReadOnlyList<MeasurementValue<ElectricEnergyValue>>> ReverseDirectionCumulativeElectricEnergyLog1 { get; }
90+
public IEchonetPropertyGetAccessor<ReadOnlyMemory<byte>> RouteBIdentificationNumber { get; }
91+
public IEchonetPropertyGetAccessor<decimal> UnitForCumulativeElectricEnergy { get; }
92+
}
93+
94+
public static class MeasurementValue {
95+
public static MeasurementValue<TValue> Create<TValue>(TValue @value, DateTime measuredAt) where TValue : struct {}
96+
}
97+
98+
public sealed class RouteBDeviceFactory : IEchonetDeviceFactory {
99+
public static RouteBDeviceFactory Instance { get; }
100+
101+
public RouteBDeviceFactory() {}
102+
103+
public EchonetDevice? Create(byte classGroupCode, byte classCode, byte instanceCode) {}
104+
}
105+
106+
public readonly struct ElectricCurrentValue {
107+
public ElectricCurrentValue(short rawValue) {}
108+
109+
public decimal Amperes { get; }
110+
public bool IsValid { get; }
111+
public short RawValue { get; }
112+
113+
public override string ToString() {}
114+
}
115+
116+
public readonly struct ElectricEnergyValue {
117+
public static readonly ElectricEnergyValue NoMeasurementData; // = "(no data)"
118+
public static readonly ElectricEnergyValue Zero; // = "0 [kWh]"
119+
120+
public ElectricEnergyValue(int rawValue, decimal multiplierToKiloWattHours) {}
121+
122+
public bool IsValid { get; }
123+
public decimal KiloWattHours { get; }
124+
public int RawValue { get; }
125+
public decimal WattHours { get; }
126+
127+
public override string ToString() {}
128+
public bool TryGetValueAsKiloWattHours(out decimal @value) {}
129+
}
130+
131+
public readonly struct MeasurementValue<TValue> where TValue : struct {
132+
public MeasurementValue(TValue @value, DateTime measuredAt) {}
133+
134+
public DateTime MeasuredAt { get; }
135+
public TValue Value { get; }
136+
137+
public void Deconstruct(out TValue @value, out DateTime measuredAt) {}
138+
public override string ToString() {}
139+
}
140+
}
141+
142+
namespace Smdn.Net.EchonetLite.RouteB.Credentials {
143+
public static class RouteBCredentialServiceCollectionExtensions {
144+
public static IServiceCollection AddRouteBCredential(this IServiceCollection services, object? serviceKey, string id, string password) {}
145+
public static IServiceCollection AddRouteBCredential(this IServiceCollection services, string id, string password) {}
146+
public static IServiceCollection AddRouteBCredentialFromEnvironmentVariable(this IServiceCollection services, object? serviceKey, string envVarForId, string envVarForPassword) {}
147+
public static IServiceCollection AddRouteBCredentialFromEnvironmentVariable(this IServiceCollection services, string envVarForId, string envVarForPassword) {}
148+
public static IServiceCollection AddRouteBCredentialProvider(this IServiceCollection services, IRouteBCredentialProvider credentialProvider) {}
149+
public static IServiceCollection AddRouteBCredentialProvider(this IServiceCollection services, object? serviceKey, IRouteBCredentialProvider credentialProvider) {}
150+
}
151+
}
152+
153+
namespace Smdn.Net.EchonetLite.RouteB.DependencyInjection {
154+
public static class CredentialProviderRouteBServiceBuilderExtensions {
155+
public static IRouteBServiceBuilder<TServiceKey> AddCredential<TServiceKey>(this IRouteBServiceBuilder<TServiceKey> builder, string id, string password) {}
156+
public static IRouteBServiceBuilder<TServiceKey> AddCredentialFromEnvironmentVariable<TServiceKey>(this IRouteBServiceBuilder<TServiceKey> builder, string envVarForId, string envVarForPassword) {}
157+
public static IRouteBServiceBuilder<TServiceKey> AddCredentialProvider<TServiceKey>(this IRouteBServiceBuilder<TServiceKey> builder, IRouteBCredentialProvider credentialProvider) {}
158+
}
159+
160+
public static class RouteBServiceCollectionExtensions {
161+
public static IServiceCollection AddRouteB(this IServiceCollection services, Action<IRouteBServiceBuilder<object?>> configure) {}
162+
public static IServiceCollection AddRouteB<TServiceKey>(this IServiceCollection services, TServiceKey serviceKey, Func<TServiceKey, string?>? selectOptionsNameForServiceKey, Action<IRouteBServiceBuilder<TServiceKey>> configure) {}
163+
}
164+
}
165+
166+
namespace Smdn.Net.EchonetLite.RouteB.Transport {
167+
[Obsolete("Use RouteBServiceCollectionExtensions instead.")]
168+
public static class RouteBEchonetLiteHandlerBuilderServiceCollectionExtensions {
169+
public static IServiceCollection AddRouteBHandler(this IServiceCollection services, Action<IRouteBEchonetLiteHandlerBuilder> configure) {}
170+
}
171+
}
172+
// API list generated by Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks v1.7.1.0.
173+
// Smdn.Reflection.ReverseGenerating.ListApi.Core v1.5.0.0 (https://github.com/smdn/Smdn.Reflection.ReverseGenerating)

doc/api-list/Smdn.Net.EchonetLite.RouteB/Smdn.Net.EchonetLite.RouteB-net8.0.apilist.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
// Smdn.Net.EchonetLite.RouteB.dll (Smdn.Net.EchonetLite.RouteB-2.1.0)
1+
// Smdn.Net.EchonetLite.RouteB.dll (Smdn.Net.EchonetLite.RouteB-2.2.0)
22
// Name: Smdn.Net.EchonetLite.RouteB
3-
// AssemblyVersion: 2.1.0.0
4-
// InformationalVersion: 2.1.0+befaca421b43357fbc3b9cbd7d5824a66044d7c6
3+
// AssemblyVersion: 2.2.0.0
4+
// InformationalVersion: 2.2.0+eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
55
// TargetFramework: .NETCoreApp,Version=v8.0
66
// Configuration: Release
7+
// Metadata: IsTrimmable=True
8+
// Metadata: RepositoryUrl=https://github.com/smdn/Smdn.Net.EchonetLite
9+
// Metadata: RepositoryBranch=main
10+
// Metadata: RepositoryCommit=eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
711
// Referenced assemblies:
812
// Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
913
// Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
@@ -165,5 +169,5 @@ public static class RouteBEchonetLiteHandlerBuilderServiceCollectionExtensions {
165169
public static IServiceCollection AddRouteBHandler(this IServiceCollection services, Action<IRouteBEchonetLiteHandlerBuilder> configure) {}
166170
}
167171
}
168-
// API list generated by Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks v1.6.0.0.
169-
// Smdn.Reflection.ReverseGenerating.ListApi.Core v1.4.0.0 (https://github.com/smdn/Smdn.Reflection.ReverseGenerating)
172+
// API list generated by Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks v1.7.1.0.
173+
// Smdn.Reflection.ReverseGenerating.ListApi.Core v1.5.0.0 (https://github.com/smdn/Smdn.Reflection.ReverseGenerating)

doc/api-list/Smdn.Net.EchonetLite.RouteB/Smdn.Net.EchonetLite.RouteB-netstandard2.1.apilist.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
// Smdn.Net.EchonetLite.RouteB.dll (Smdn.Net.EchonetLite.RouteB-2.1.0)
1+
// Smdn.Net.EchonetLite.RouteB.dll (Smdn.Net.EchonetLite.RouteB-2.2.0)
22
// Name: Smdn.Net.EchonetLite.RouteB
3-
// AssemblyVersion: 2.1.0.0
4-
// InformationalVersion: 2.1.0+befaca421b43357fbc3b9cbd7d5824a66044d7c6
3+
// AssemblyVersion: 2.2.0.0
4+
// InformationalVersion: 2.2.0+eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
55
// TargetFramework: .NETStandard,Version=v2.1
66
// Configuration: Release
7+
// Metadata: RepositoryUrl=https://github.com/smdn/Smdn.Net.EchonetLite
8+
// Metadata: RepositoryBranch=main
9+
// Metadata: RepositoryCommit=eceaa1ab8c33ec84da009bb0a40f14181fd5e97b
710
// Referenced assemblies:
811
// Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
912
// Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60
@@ -159,5 +162,5 @@ public static class RouteBEchonetLiteHandlerBuilderServiceCollectionExtensions {
159162
public static IServiceCollection AddRouteBHandler(this IServiceCollection services, Action<IRouteBEchonetLiteHandlerBuilder> configure) {}
160163
}
161164
}
162-
// API list generated by Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks v1.6.0.0.
163-
// Smdn.Reflection.ReverseGenerating.ListApi.Core v1.4.0.0 (https://github.com/smdn/Smdn.Reflection.ReverseGenerating)
165+
// API list generated by Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks v1.7.1.0.
166+
// Smdn.Reflection.ReverseGenerating.ListApi.Core v1.5.0.0 (https://github.com/smdn/Smdn.Reflection.ReverseGenerating)

0 commit comments

Comments
 (0)