Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Updated meta for ELECTRICITY_CONSUMER AssetType

Rich Turner090753c7460d
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.java
index c8fdb8f6f..c1cf98ed9 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -196,7 +196,7 @@ public enum AssetType implements AssetDescriptor {
RULE_STATE,
STORE_DATA_POINTS
),
- new AttributeDescriptorImpl("Scenario", STRING, null,
+ new AttributeDescriptorImpl("scenario", STRING, null,
LABEL.withInitialValue(Values.create("Scenario")),
DESCRIPTION.withInitialValue(Values.create("The scenario the light are setup to")),
RULE_STATE
@@ -228,7 +228,7 @@ public enum AssetType implements AssetDescriptor {
LABEL.withInitialValue(Values.create("Color RGBW")),
DESCRIPTION.withInitialValue(Values.create("The RGBW color of all the lights"))
),
- new AttributeDescriptorImpl("Scenario", STRING, null,
+ new AttributeDescriptorImpl("scenario", STRING, null,
LABEL.withInitialValue(Values.create("Scenario")),
DESCRIPTION.withInitialValue(Values.create("The scenario the lights are setup to")),
RULE_STATE
@@ -407,32 +407,50 @@ public enum AssetType implements AssetDescriptor {
UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
new AttributeDescriptorImpl("energyTariffExport", CURRENCY, null,
LABEL.withInitialValue("Energy tariff export"),
- UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("energyCarbonImport", ENERGY, null,
LABEL.withInitialValue("Energy carbon import"),
- UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR)),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("energyCarbonExport", ENERGY, null,
LABEL.withInitialValue("Energy carbon export"),
- UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR)),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("totalPower", POWER, null,
LABEL.withInitialValue("Total power"),
- READ_ONLY),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("forecastPowerDeviation", POWER, null,
LABEL.withInitialValue("Forecast power deviation"),
- READ_ONLY),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("setPointPower", POWER, null,
LABEL.withInitialValue("Setpoint power"),
- DESCRIPTION.withInitialValue("Positive is consuming, negative is delivering to network")),
+ DESCRIPTION.withInitialValue("Positive is consuming, negative is delivering to network"),
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("availableMaxPower", POWER, null,
LABEL.withInitialValue("Available max power"),
- READ_ONLY),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("availableMinPower", POWER, null,
LABEL.withInitialValue("Available min power"),
- READ_ONLY),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
new AttributeDescriptorImpl("totalEnergy", ENERGY, null,
LABEL.withInitialValue("Total energy"),
UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),
- READ_ONLY)
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE)
),
ELECTRICITY_CHARGER(ASSET_NAMESPACE + ":electricityCharger", "ev-station", "8A293D", false,