Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions CFX/ResourcePerformance/EnergyConsumed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace CFX.ResourcePerformance
/// "PeakFrequency": 52,
/// "MinimumFrequency": 50.5,
/// "MeanFrequency": 50.6,
/// FrequencyNow": 50.6,
/// "FrequencyNow": 50.6,
/// "PeakPowerRYB": [ 125.6, 77.4, 10.2 ],
/// "MinimumPowerRYB": [ 120.3, 68.5, 8.5 ],
/// "MeanPowerRYB": [ 124.6, 70.2, 9.8 ],
Expand All @@ -42,7 +42,45 @@ namespace CFX.ResourcePerformance
/// "MinimumVoltageRYB": [ 393.6, 399.8, 397.4 ],
/// "MeanVoltageRYB": [ 402.9, 400.1, 402.3 ],
/// "VoltageNowRYB": [ 401.1, 401.5, 402.3 ],
/// "ThreePhaseNeutralCurrentNow": 0.06
/// "ThreePhaseNeutralCurrentNow": 0.06,
/// "ConsumptionDetails": [{
/// "SubsystemName": "EquipmentSubArea",
/// "StartTime": "2018-04-05T09:33:06.1358356-04:00",
/// "EndTime": "2018-04-05T09:38:06.1358356-04:00",
/// "EnergyUsed": 0.010,
/// "PeakPower": 125.6,
/// "MinimumPower": 120.3,
/// "MeanPower": 124.6,
/// "PowerNow": 121.1,
/// "PowerFactorNow": 0.95,
/// "PeakCurrent": 0.82,
/// "MinimumCurrent": 0.00,
/// "MeanCurrent": 0.68,
/// "CurrentNow": 0.69,
/// "PeakVoltage": 239.1,
/// "MinimumVoltage": 231.6,
/// "MeanVoltage": 232.9,
/// "VoltageNow": 212.1,
/// "PeakFrequency": 52,
/// "MinimumFrequency": 50.5,
/// "MeanFrequency": 50.6,
/// "FrequencyNow": 50.6,
/// "PeakPowerRYB": [ 125.6, 77.4, 10.2 ],
/// "MinimumPowerRYB": [ 120.3, 68.5, 8.5 ],
/// "MeanPowerRYB": [ 124.6, 70.2, 9.8 ],
/// "PowerNowRYB": [ 121.1, 68.9, 10.1 ],
/// "PowerFactorNowRYB": [ 0.95, 0.92, 0.80 ],
/// "PeakCurrentRYB": [ 0.82, 0.65, 0.33 ],
/// "MinimumCurrentRYB": [ 0.00, 0.01, 0.32 ],
/// "MeanCurrentRYB": [ 0.68, 0.58, 0.32 ],
/// "CurrentNowRYB": [ 0.69, 0.57, 0.32 ],
/// "PeakVoltageRYB": [ 420.1, 413.7, 404.6 ],
/// "MinimumVoltageRYB": [ 393.6, 399.8, 397.4 ],
/// "MeanVoltageRYB": [ 402.9, 400.1, 402.3 ],
/// "VoltageNowRYB": [ 401.1, 401.5, 402.3 ],
/// "ThreePhaseNeutralCurrentNow": 0.06
/// }
/// ],
/// }
/// </code>
/// </summary>
Expand Down Expand Up @@ -444,5 +482,22 @@ public double ThreePhaseNeutralCurrentNow
set;
}

/// <summary>
/// <para>** NOTE: ADDED in CFX 2.1 **</para>
/// The sub-device granularity reports energy data
/// </summary>
[CFX.Utilities.CreatedVersion("2.1")]
public List<ConsumptionDetail> ConsumptionDetails { get; set; }
}

[CFX.Utilities.CreatedVersion("2.1")]
public class ConsumptionDetail : EnergyConsumed
{
/// <summary>
/// <para>** NOTE: ADDED in CFX 2.1 **</para>
/// Sub-device name, like zones/modules within a device
/// </summary>
[CFX.Utilities.CreatedVersion("2.1")]
public string SubsystemName { get; set; }
}
}