Merge pull request #392 from andig/heat

Added heatsensor and improved order of definitions
volkszaehler · Feb 13, 2016 · b36542b · b36542b
2 parents 38c648d + e002d16
commit b36542b
Showing 1 changed file with 35 additions and 20 deletions.
diff --git a/lib/Definition/EntityDefinition.json b/lib/Definition/EntityDefinition.json
@@ -98,29 +98,18 @@
 		}
 	},
 	{
-		"name"			: "voltage",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "bolt.png",
-		"unit"			: "V",
-		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"translation"		: {
-			"de" : "Spannungssensor",
-			"en" : "Voltage Meter",
-			"fr" : "Voltmètre"
-		}
-	},
-	{
-		"name"			: "current",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "bolt.png",
-		"unit"			: "A",
+		"name"			: "heatsensor",
+		"required"		: ["resolution"],
+		"optional"		: ["tolerance", "cost", "local"],
+		"icon"			: "flame.png",
+		"unit"			: "W",
+		"scale"			: 1000,
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
 		"translation"		: {
-			"de" : "Stromsensor",
-			"en" : "Current Meter",
-			"fr" : "Courantmètre"
+			"de" : "Wärmemengensensor",
+			"en" : "Heat Sensor"
 		}
 	},
 	{
@@ -213,6 +202,32 @@
 			"fr" : "Eau"
 		}
 	},
+	{
+		"name"			: "voltage",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "bolt.png",
+		"unit"			: "V",
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"translation"		: {
+			"de" : "Spannungssensor",
+			"en" : "Voltage Meter",
+			"fr" : "Voltmètre"
+		}
+	},
+	{
+		"name"			: "current",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "bolt.png",
+		"unit"			: "A",
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"translation"		: {
+			"de" : "Stromsensor",
+			"en" : "Current Meter",
+			"fr" : "Courantmètre"
+		}
+	},
 	{
 		"name"			: "temperature",
 		"optional"		: ["resolution", "tolerance", "local", "gap"],