Skip to content

Commit 0781df6

Browse files
committed
Added support for full response object in realtime requests
1 parent 11214a7 commit 0781df6

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

FroniusSolarClient.Examples/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ static void Main(string[] args)
3636
static void GetRealTimeData(SolarClient client)
3737
{
3838
var data = client.GetMinMaxInverterData();
39-
40-
Console.WriteLine(data.MaxCurrentDayAcPower);
39+
Console.WriteLine($"{data.Head.Status.Code} at {data.Head.Timestamp}");
40+
Console.WriteLine(data.Body.Data.MaxCurrentDayAcPower);
4141
}
4242
#endregion
4343

FroniusSolarClient/Services/InverterRealtimeDataService.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ protected string BuildQueryString(int deviceId, Scope scope, DataCollection data
3030
return $"?Scope={scope}&DeviceId={deviceId}&DataCollection={dataCollection}";
3131
}
3232

33-
public CumulationInverterData GetCumulationInverterData(int deviceId = 1, Scope scope = Scope.Device)
33+
public Response<CumulationInverterData> GetCumulationInverterData(int deviceId = 1, Scope scope = Scope.Device)
3434
{
3535
string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.CumulationInverterData);
36-
return GetDataServiceResponse<CumulationInverterData>(baseEndpointURL).Body.Data;
36+
return GetDataServiceResponse<CumulationInverterData>(baseEndpointURL);
3737
}
3838

39-
public CommonInverterData GetCommonInverterData(int deviceId = 1, Scope scope = Scope.Device)
39+
public Response<CommonInverterData> GetCommonInverterData(int deviceId = 1, Scope scope = Scope.Device)
4040
{
4141
string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.CommonInverterData);
42-
return GetDataServiceResponse<CommonInverterData>(baseEndpointURL).Body.Data;
42+
return GetDataServiceResponse<CommonInverterData>(baseEndpointURL);
4343
}
4444

4545

46-
public P3InverterData GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device)
46+
public Response<P3InverterData> GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device)
4747
{
4848
string param = $"?Scope={scope.ToString()}&DeviceId={deviceId}&DataCollection=P3InverterData";
4949
string baseEndpointURL = _cgi + param;
50-
return GetDataServiceResponse<P3InverterData>(baseEndpointURL).Body.Data;
50+
return GetDataServiceResponse<P3InverterData>(baseEndpointURL);
5151
}
5252

5353

54-
public MinMaxInverterData GetMinMaxInverterData(int deviceId = 1, Scope scope = Scope.Device)
54+
public Response<MinMaxInverterData> GetMinMaxInverterData(int deviceId = 1, Scope scope = Scope.Device)
5555
{
5656
string baseEndpointURL = _cgi + BuildQueryString(deviceId, scope, DataCollection.MinMaxInverterData);
57-
return GetDataServiceResponse<MinMaxInverterData>(baseEndpointURL).Body.Data;
57+
return GetDataServiceResponse<MinMaxInverterData>(baseEndpointURL);
5858
}
5959

6060
}

FroniusSolarClient/SolarClient.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public SolarClient(string url, int version, ILogger logger, Action<CommonRespons
3636
/// <param name="deviceId"></param>
3737
/// <param name="scope"></param>
3838
/// <returns></returns>
39-
public CumulationInverterData GetCumulationInverterData(int deviceId = 1, Scope scope = Scope.Device)
39+
public Response<CumulationInverterData> GetCumulationInverterData(int deviceId = 1, Scope scope = Scope.Device)
4040
{
4141
return _inverterRealtimeDataService.GetCumulationInverterData(deviceId, scope);
4242
}
@@ -47,7 +47,7 @@ public CumulationInverterData GetCumulationInverterData(int deviceId = 1, Scope
4747
/// <param name="deviceId"></param>
4848
/// <param name="scope"></param>
4949
/// <returns></returns>
50-
public CommonInverterData GetCommonInverterData(int deviceId = 1, Scope scope = Scope.Device)
50+
public Response<CommonInverterData> GetCommonInverterData(int deviceId = 1, Scope scope = Scope.Device)
5151
{
5252
return _inverterRealtimeDataService.GetCommonInverterData(deviceId, scope);
5353
}
@@ -58,7 +58,7 @@ public CommonInverterData GetCommonInverterData(int deviceId = 1, Scope scope =
5858
/// <param name="deviceId"></param>
5959
/// <param name="scope"></param>
6060
/// <returns></returns>
61-
public P3InverterData GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device)
61+
public Response<P3InverterData> GetP3InverterData(int deviceId = 1, Scope scope = Scope.Device)
6262
{
6363
return _inverterRealtimeDataService.GetP3InverterData(deviceId, scope);
6464
}
@@ -69,7 +69,7 @@ public P3InverterData GetP3InverterData(int deviceId = 1, Scope scope = Scope.De
6969
/// <param name="deviceId"></param>
7070
/// <param name="scope"></param>
7171
/// <returns></returns>
72-
public MinMaxInverterData GetMinMaxInverterData(int deviceId = 1, Scope scope = Scope.Device)
72+
public Response<MinMaxInverterData> GetMinMaxInverterData(int deviceId = 1, Scope scope = Scope.Device)
7373
{
7474
return _inverterRealtimeDataService.GetMinMaxInverterData(deviceId, scope);
7575
}

0 commit comments

Comments
 (0)