Skip to content

armgit / core

Public Imported from GitHub
0

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

Added electricity related asset types to the system (closes #198)

Rich Turner84d71dead3fb
diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.java
index 88e808d0d..dded00169 100644
--- a/model/src/main/java/org/openremote/model/Constants.java
+++ b/model/src/main/java/org/openremote/model/Constants.java
@@ -72,7 +72,23 @@ public interface Constants {
String UNITS_SPEED_KPH = "SPEED_KPH";
String UNITS_SPEED_MPS = "SPEED_MPS";
String UNITS_SOUND_DECIBELS = "DECIBELS";
- String UNITS_DISTANCE_METRES = "METRES";
+ String UNITS_DISTANCE_M = "METRES";
+ String UNITS_DISTANCE_CM = "CENTIMETRES";
+ String UNITS_DISTANCE_MM = "MILLIMETRES";
String UNITS_DIRECTION_DEGREES = "DEGREES";
String UNITS_FLOW_LPM = "FLOW_LPM";
+ String UNITS_EUR_PER_KILOWATT_HOUR = "EUR_PER_KWH";
+ String UNITS_EUR_PER_MONTH = "EUR_PER_MONTH";
+ String UNITS_GBP_PER_KILOWATT_HOUR = "GBP_PER_KWH";
+ String UNITS_GBP_PER_MONTH = "GBP_PER_MONTH";
+ String UNITS_KILOWATT_PER_HOUR = "KW_PER_HOUR";
+ String UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR = "KG_CARBON_PER_KWH";
+ String UNITS_POWER_KILOWATT = "POWER_KW";
+ String UNITS_POWER_WATT = "POWER_W";
+ String UNITS_MASS_KILOGRAM = "MASS_KG";
+ String UNITS_CURRENCY_EUR = "CURRENCY_EUR";
+ String UNITS_CURRENCY_GBP = "CURRENCY_GBP";
+ String UNITS_ANGLE_DEGREES = "ANGLE_DEGREES";
+ String UNITS_ANGLE_RADIANS = "ANGLE_RADIANS";
+ String UNITS_ANGLE_DEGREES_MINS_SECONDS = "ANGLE_DMS";
}
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 a1d5fc2eb..340de0866 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -21,9 +21,9 @@ package org.openremote.model.asset;
import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeDescriptorImpl;
-import org.openremote.model.attribute.MetaItemDescriptorImpl;
import org.openremote.model.value.Values;
+import java.util.Arrays;
import java.util.Optional;
import static org.openremote.model.Constants.*;
@@ -286,7 +286,381 @@ public enum AssetType implements AssetDescriptor {
new AttributeDescriptorImpl("childAssetType", STRING, null, READ_ONLY)
),
- THING(ASSET_NAMESPACE + ":thing", "cube-outline", null);
+ THING(ASSET_NAMESPACE + ":thing", "cube-outline", null),
+
+ ELECTRICITY_CONSUMER(ASSET_NAMESPACE + ":electricityConsumer", "power-plug", "8A293D", false,
+ new AttributeDescriptorImpl("manufacturer", STRING, null,
+ LABEL.withInitialValue("Manufacturer")),
+ new AttributeDescriptorImpl("model", STRING, null,
+ LABEL.withInitialValue("Model")),
+ new AttributeDescriptorImpl("userNotes", STRING, null,
+ LABEL.withInitialValue("User notes")),
+ new AttributeDescriptorImpl("status", STRING, null,
+ LABEL.withInitialValue("Status"),
+ DESCRIPTION.withInitialValue("Status system"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("demandResponseType", STRING, null,
+ LABEL.withInitialValue("Demand response type"),
+ ALLOWED_VALUES.withInitialValue(Values.createArray().addAll(Arrays.stream(ElectricityConsumerDemandResponseType.values()).map(Enum::name).toArray(String[]::new)))),
+ new AttributeDescriptorImpl("energyTariffImport", CURRENCY, null,
+ LABEL.withInitialValue("Energy tariff import"),
+ RULE_STATE,
+ STORE_DATA_POINTS,
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ new AttributeDescriptorImpl("energyTariffExport", CURRENCY, null,
+ LABEL.withInitialValue("Energy tariff export"),
+ RULE_STATE,
+ STORE_DATA_POINTS,
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ new AttributeDescriptorImpl("energyCarbonImport", ENERGY, null,
+ LABEL.withInitialValue("Energy carbon import"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ RULE_STATE),
+ new AttributeDescriptorImpl("energyCarbonExport", ENERGY, null,
+ LABEL.withInitialValue("Energy carbon export"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalPower", POWER, null,
+ LABEL.withInitialValue("Total power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("forecastPowerDeviation", NUMBER, null,
+ LABEL.withInitialValue("Forecast power deviation"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("setPointPower", NUMBER, null,
+ LABEL.withInitialValue("Setpoint power"),
+ DESCRIPTION.withInitialValue("Positive is consuming, negative is delivering to network"),
+ STORE_DATA_POINTS,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("availableMaxPower", NUMBER, null,
+ LABEL.withInitialValue("Available max power"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("availableMinPower", NUMBER, null,
+ LABEL.withInitialValue("Available min power"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("totalEnergy", ENERGY, Values.create(0),
+ LABEL.withInitialValue("Total energy"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE)
+ ),
+
+ ELECTRICITY_PRODUCER(ASSET_NAMESPACE + ":electricityProducer", "white-balance-sunny", "CC9423", false,
+ new AttributeDescriptorImpl("manufacturer", STRING, null,
+ LABEL.withInitialValue("Manufacturer")),
+ new AttributeDescriptorImpl("model", STRING, null,
+ LABEL.withInitialValue("Model")),
+ new AttributeDescriptorImpl("userNotes", STRING, null,
+ LABEL.withInitialValue("User notes")),
+ new AttributeDescriptorImpl("status", STRING, null,
+ LABEL.withInitialValue("Status"),
+ DESCRIPTION.withInitialValue("Status system"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("installedCapacity", NUMBER, Values.create(10000),
+ LABEL.withInitialValue("Installed capacity"),
+ DESCRIPTION.withInitialValue("Power delivered at normalised eg. sun intensity, wind speeds"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ RULE_STATE),
+ new AttributeDescriptorImpl("systemEfficiency", PERCENTAGE, null,
+ LABEL.withInitialValue("System efficiency"),
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalPower", POWER, Values.create(0),
+ LABEL.withInitialValue("Total power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS,
+ READ_ONLY),
+ new AttributeDescriptorImpl("forecastPowerDeviation", NUMBER, null,
+ LABEL.withInitialValue("Forecast power deviation"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("totalEnergy", ENERGY, Values.create(0),
+ LABEL.withInitialValue("Total energy"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ READ_ONLY)
+ ),
+
+ ELECTRICITY_STORAGE(ASSET_NAMESPACE + ":electricityStorage", "battery-charging", "1B7C89", false,
+ new AttributeDescriptorImpl("manufacturer", STRING, null,
+ LABEL.withInitialValue("Manufacturer")),
+ new AttributeDescriptorImpl("model", STRING, null,
+ LABEL.withInitialValue("Model")),
+ new AttributeDescriptorImpl("userNotes", STRING, null,
+ LABEL.withInitialValue("User notes")),
+ new AttributeDescriptorImpl("status", STRING, null,
+ LABEL.withInitialValue("Status"),
+ DESCRIPTION.withInitialValue("Status system"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("installedCapacity", NUMBER, null,
+ LABEL.withInitialValue("Installed capacity"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ RULE_STATE),
+ new AttributeDescriptorImpl("levelledCostOfStorage", CURRENCY, null,
+ LABEL.withInitialValue("Levelised cost of storage"),
+ UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR),
+ RULE_STATE),
+ new AttributeDescriptorImpl("maxCharge", NUMBER, null,
+ LABEL.withInitialValue("Max charge"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY),
+ new AttributeDescriptorImpl("maxDischarge", NUMBER, null,
+ LABEL.withInitialValue("Max discharge"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY),
+ new AttributeDescriptorImpl("chargeState", PERCENTAGE, null,
+ LABEL.withInitialValue("Charge state"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("chargedCapacity", CHARGE, null,
+ LABEL.withInitialValue("Charged capacity"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ RULE_STATE),
+ new AttributeDescriptorImpl("freeCapacity", CHARGE, null,
+ LABEL.withInitialValue("Free capacity"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalPower", POWER, null,
+ LABEL.withInitialValue("Total power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("setPointPower", NUMBER, null,
+ LABEL.withInitialValue("Setpoint power"),
+ DESCRIPTION.withInitialValue("Positive is consuming, negative is delivering to network"),
+ STORE_DATA_POINTS),
+ new AttributeDescriptorImpl("command", NUMBER, null,
+ LABEL.withInitialValue("Command"),
+ DESCRIPTION.withInitialValue("0 = No command, 1 = Start, 2 = Stop"),
+ STORE_DATA_POINTS),
+ new AttributeDescriptorImpl("energyCharged", CHARGE, null,
+ LABEL.withInitialValue("Energy charged"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ RULE_STATE),
+ new AttributeDescriptorImpl("energyDischarged", CHARGE, null,
+ LABEL.withInitialValue("Energy discharged"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ RULE_STATE),
+ new AttributeDescriptorImpl("chargeCycle", INTEGER, null,
+ LABEL.withInitialValue("Charge cycle"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("financialWallet", CURRENCY, null,
+ LABEL.withInitialValue("Financial wallet"),
+ READ_ONLY,
+ UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("carbonWallet", CO2, null,
+ LABEL.withInitialValue("Carbon wallet"),
+ UNIT_TYPE.withInitialValue(UNITS_MASS_KILOGRAM),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE)
+ ),
+
+ ELECTRICITY_SUPPLIER(ASSET_NAMESPACE + ":electricitySupplier", "upload-network", "9257A9", false,
+ new AttributeDescriptorImpl("utilityProviderName", STRING, null,
+ LABEL.withInitialValue("Provider name")),
+ new AttributeDescriptorImpl("gridOperatorName", STRING, null,
+ LABEL.withInitialValue("Grid operator name")),
+ new AttributeDescriptorImpl("userNotes", STRING, null,
+ LABEL.withInitialValue("User notes")),
+ new AttributeDescriptorImpl("status", BOOLEAN, null,
+ LABEL.withInitialValue("Status"),
+ DESCRIPTION.withInitialValue("Status system (operational)")),
+ new AttributeDescriptorImpl("connectionPower", POWER, null,
+ LABEL.withInitialValue("Connection power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("setpointEdrPower", OBJECT, null,
+ LABEL.withInitialValue("Setpoint EDR power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY,
+ RULE_STATE),
+ new AttributeDescriptorImpl("edrPrimaryReserve", POWER, null,
+ LABEL.withInitialValue("EDR primary reserve"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT)),
+ new AttributeDescriptorImpl("edrMinimumPeriod", NUMBER, null,
+ LABEL.withInitialValue("EDR minimum period"),
+ UNIT_TYPE.withInitialValue(UNITS_TIME_SECONDS)),
+ new AttributeDescriptorImpl("energyTariffImport", CURRENCY, null,
+ LABEL.withInitialValue("Energy tariff import"),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS,
+ HAS_PREDICTED_DATA_POINTS,
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ new AttributeDescriptorImpl("forecastEnergyTariffImportDeviation", NUMBER, null,
+ LABEL.withInitialValue("Forecast energy tariff import deviation"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("energyTariffExport", CURRENCY, null,
+ LABEL.withInitialValue("Energy tariff export"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS,
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ new AttributeDescriptorImpl("forecastEnergyTariffExportDeviation", NUMBER, null,
+ LABEL.withInitialValue("Forecast energy tariff export deviation"),
+ READ_ONLY),
+ new AttributeDescriptorImpl("energyTax", CURRENCY, null,
+ LABEL.withInitialValue("Energy tax"),
+ READ_ONLY,
+ RULE_STATE,
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR)),
+ new AttributeDescriptorImpl("gridCosts", CURRENCY, null,
+ LABEL.withInitialValue("Grid costs"),
+ UNIT_TYPE.withInitialValue(UNITS_EUR_PER_MONTH),
+ RULE_STATE),
+ new AttributeDescriptorImpl("gridConnectCosts", CURRENCY, null,
+ LABEL.withInitialValue("Grid connection costs"),
+ UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR),
+ RULE_STATE),
+ new AttributeDescriptorImpl("energyCarbonImport", ENERGY, null,
+ LABEL.withInitialValue("Energy carbon import"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS,
+ STORE_DATA_POINTS,
+ READ_ONLY),
+ new AttributeDescriptorImpl("energyCarbonExport", ENERGY, null,
+ LABEL.withInitialValue("Energy carbon export"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOGRAM_CARBON_PER_KILOWATT_HOUR),
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS,
+ STORE_DATA_POINTS,
+ READ_ONLY),
+ new AttributeDescriptorImpl("totalPower", POWER, Values.create(0),
+ LABEL.withInitialValue("Total power"),
+ UNIT_TYPE.withInitialValue(UNITS_POWER_KILOWATT),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("forecastPowerDeviation", NUMBER, null,
+ LABEL.withInitialValue("Forecast power deviation"),
+ READ_ONLY,
+ RULE_EVENT),
+ new AttributeDescriptorImpl("totalEnergyImport", ENERGY, Values.create(0),
+ LABEL.withInitialValue("Total energy import"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalEnergyExport", ENERGY, Values.create(0),
+ LABEL.withInitialValue("Total energy export"),
+ UNIT_TYPE.withInitialValue(UNITS_KILOWATT_PER_HOUR),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalEnergyImportCosts", CURRENCY, Values.create(0),
+ LABEL.withInitialValue("Total energy import costs"),
+ READ_ONLY,
+ UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalEnergyExportIncome", CURRENCY, Values.create(0),
+ LABEL.withInitialValue("Total energy export income"),
+ READ_ONLY,
+ UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR),
+ STORE_DATA_POINTS,
+ RULE_STATE),
+ new AttributeDescriptorImpl("totalCarbonCosts", CO2, Values.create(0),
+ LABEL.withInitialValue("Total carbon costs"),
+ UNIT_TYPE.withInitialValue(UNITS_MASS_KILOGRAM),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE)
+ ),
+
+ WEATHER(ASSET_NAMESPACE + ":weather", "weather-partly-cloudy", "49B0D8", false,
+ new AttributeDescriptorImpl("userNotes", STRING, null,
+ LABEL.withInitialValue("User notes")),
+ new AttributeDescriptorImpl("temperature", TEMPERATURE, Values.create(0),
+ LABEL.withInitialValue("Temperature"),
+ UNIT_TYPE.withInitialValue(UNITS_TEMPERATURE_CELCIUS),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("sunUvIndex", NUMBER, null,
+ LABEL.withInitialValue("UV Index of the sun"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("sunIrradiance", NUMBER, null,
+ LABEL.withInitialValue("Irradiance of the sun"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("sunAzimuth", NUMBER, null,
+ LABEL.withInitialValue("Azimuth of the sun"),
+ UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("sunZenith", NUMBER, null,
+ LABEL.withInitialValue("Zenith of the sun"),
+ UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("sunAltitude", NUMBER, null,
+ LABEL.withInitialValue("Altitude of the sun"),
+ UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("windSpeed", SPEED, null,
+ LABEL.withInitialValue("Wind speed"),
+ UNIT_TYPE.withInitialValue(UNITS_SPEED_MPS),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("windDirection", DIRECTION, null,
+ LABEL.withInitialValue("Wind direction"),
+ UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("precipitation", RAINFALL, null,
+ LABEL.withInitialValue("Precipitation"),
+ UNIT_TYPE.withInitialValue(UNITS_DISTANCE_MM),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS),
+ new AttributeDescriptorImpl("humidity", PERCENTAGE, null,
+ LABEL.withInitialValue("Humidity"),
+ READ_ONLY,
+ STORE_DATA_POINTS,
+ RULE_STATE,
+ HAS_PREDICTED_DATA_POINTS)
+ );
final protected String type;
final protected String icon;
diff --git a/model/src/main/java/org/openremote/model/asset/ElectricityConsumerDemandResponseType.java b/model/src/main/java/org/openremote/model/asset/ElectricityConsumerDemandResponseType.java
new file mode 100644
index 000000000..2439b73a7
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/asset/ElectricityConsumerDemandResponseType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.asset;
+
+public enum ElectricityConsumerDemandResponseType {
+ NONE,
+ FORECAST,
+ SETPOINT
+}