Revert "Issue #279 vzlogger_generic.schema.json"

volkszaehler · Dec 22, 2016 · 122c6d8 · 122c6d8
1 parent 437b19a
commit 122c6d8
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/etc/vzlogger_generic.schema.json b/etc/vzlogger_generic.schema.json
@@ -150,21 +150,6 @@
             }]
         },
 
-        "meterhostordev": {
-		"title": "Choose the connection to your meter.",
-		"oneOf": [{
-			"host": {
-				"type": "string",
-				"description": "ip addr of the meter (if not directly connected)"
-				}
-			},{
-			"device": {
-				"type": "string",
-				"description": "device the meter is connected to. E.g. /dev/ttyUSB0"
-				}
-			}
-		]
-	},
 
         "meterS0": {
             "title": "S0 based meter",
@@ -237,7 +222,13 @@
                         "type": "string",
                         "enum": ["d0"]
                     },
-                    "$ref": "#/definitions/meterhostordev",
+                    "device": {
+                        "type": "string",
+                        "description": "device the meter is connected to. E.g. /dev/ttyUSB0"
+                    },
+                    "host": {
+                        "type": "string",
+                        "description": "ip addr of the meter (if not directly connected)"
                     },
                     "dump_file": {
                         "type": "string",
@@ -300,7 +291,13 @@
                             "type": "string",
                             "enum": ["sml"]
                         },
-                        "$ref": "#/definitions/meterhostordev",
+                        "host": {
+                            "type": "string",
+                            "description": "ip addr of the meter (if not directly connected)"
+                        },
+                        "device": {
+                            "type": "string",
+                            "description": "device the meter is connected to. E.g. /dev/ttyUSB0"
                         },
                         "pullseq": {
                             "type": "string",