Skip to content

Add ConsumptionDetail for EnergyConsumed #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnjwalls merged 6 commits into from
Mar 4, 2026
Merged

Add ConsumptionDetail for EnergyConsumed #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
791d519
Add sub-device information to the EnergyConsumed message to enable re…
Oct 13, 2025
d1f8881
Add sub-device information to the EnergyConsumed message to enable re…
IIOTService-Delta Oct 13, 2025
eaefe07
modify ConsumptionDetail into CFX.Structures
IIOTService-Delta Oct 20, 2025
8030136
modify EnergyConsumptionDetail to ConsumptionDetail
IIOTService-Delta Oct 20, 2025
4d505ed
Merge branch 'master' into add-EnergyConsumed
johnjwalls Mar 4, 2026
fb92bed
Adding documentation to class level
johnjwalls Mar 4, 2026
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
10 changes: 8 additions & 2 deletions CFX/ResourcePerformance/EnergyConsumed.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using CFX.Structures;
using System;
using System.Collections.Generic;
using System.Text;

Expand Down Expand Up @@ -487,7 +488,11 @@ public double ThreePhaseNeutralCurrentNow
/// The sub-device granularity reports energy data
/// </summary>
[CFX.Utilities.CreatedVersion("2.1")]
public List<ConsumptionDetail> ConsumptionDetails { get; set; }
public List<ConsumptionDetail> ConsumptionDetails
{
get;
set;
}
}

[CFX.Utilities.CreatedVersion("2.1")]
Expand All @@ -500,4 +505,5 @@ public class ConsumptionDetail : EnergyConsumed
[CFX.Utilities.CreatedVersion("2.1")]
public string SubsystemName { get; set; }
}

}
Loading