Changeset 17

Timestamp:

2012-07-05 14:43:24 (13 years ago)

Author:

mcvflorin

Message:

Made the partition UI compatible with UI4.

File:

• trunk/D_ConcordPartition.json (modified) (8 diffs)

trunk/D_ConcordPartition.json ¶

@@ -50 +50 @@
                 {
                     "id": "1",
-                    "scenegroup": "1"
+                    "scenegroup": "1",
+                    "type": "info"
                 },
                 {
@@ -61 +62 @@
                 {
                     "ControlGroup": "1",
+                    "ControlHeader": "1",
                     "ControlType": "label",
                     "Label": {
@@ -77 +79 @@
                 {
                     "ControlGroup": "1",
+                    "ControlHeader": "1",
                     "ControlType": "variable",
                     "top": 0,
@@ -122 +125 @@
                         "Top": 60,
                         "Left": 155,
-                        "Width": 100,
+                        "Width": 120,
                         "Height": 20
                     }
@@ -341 +344 @@
                         "Top": 170,
                         "Left": 155,
-                        "Width": 100,
+                        "Width": 110,
                         "Height": 20
                     }
@@ -375 +378 @@
                         "Top": 230,
                         "Left": 155,
-                        "Width": 100,
+                        "Width": 80,
                         "Height": 20
                     }
@@ -541 +544 @@
                                 "text": "_DEVICE_NAME_ is DISARMED"
                             }
-                        },
-                        {
-                            "value": "ExitDelay",
-                            "HumanFriendlyText": {
-                                "lang_tag": "is_in_exit_delay",
-                                "text": "_DEVICE_NAME_ is in EXIT DELAY"
-                            }
-                        },
-                        {
-                            "value": "EntryDelay",
-                            "HumanFriendlyText": {
-                                "lang_tag": "is_in_entry_delay",
-                                "text": "_DEVICE_NAME_ is in ENTRY DELAY"
-                            }
                         }
                     ],
@@ -602 +591 @@
         }
     ],
+    "eventList": {
+        "event_1": {
+            "label": "Armed state",
+            "serviceId": "urn:micasaverde-com:serviceId:AlarmPartition2",
+            "argumentList" : {
+                "argument_1" : {
+                    "name": "ArmMode",
+                    "dataType": "string",
+                    "defaultValue": "Armed",
+                    "allowedValueList" : {
+                        "armed" : "Armed",
+                        "disarmed" : "Disarmed"
+                    },
+                    "comparisson": "=",
+                    "prefix": "Partition is...",
+                    "suffix": ""
+                }
+            }
+        },
+        "event_2": {
+            "label": "Armed detailed state",
+            "serviceId": "urn:micasaverde-com:serviceId:AlarmPartition2",
+            "argumentList" : {
+                "argument_1" : {
+                    "name": "DetailedArmMode",
+                    "dataType": "string",
+                    "defaultValue": "Armed",
+                    "allowedValueList" : {
+                        "away" : "Armed",
+                        "stay" : "Stay",
+                        "disarmed" : "Disarmed"
+                    },
+                    "comparisson": "=",
+                    "prefix": "Partition is armed...",
+                    "suffix": ""
+                }
+            }
+        },
+        "event_3": {
+            "label": "Alarm active",
+            "serviceId": "urn:micasaverde-com:serviceId:AlarmPartition2",
+            "argumentList" : {
+                "argument_1" : {
+                    "name": "Alarm",
+                    "dataType": "string",
+                    "defaultValue": "Active",
+                    "allowedValueList" : {
+                        "triggered" : "Active",
+                        "cleared" : "None"
+                    },
+                    "comparisson": "=",
+                    "prefix": "Alarm is...",
+                    "suffix": ""
+                }
+            }
+        }
+    },
+    "sceneList": {
+        "group_1": {
+            "cmd_1": {
+                "label": "Arm/Disarm partition",
+                "serviceId": "urn:micasaverde-com:serviceId:AlarmPartition2",
+                "action": "RequestArmMode",
+                "argumentList": {
+                    "argument_1": {
+                        "dataType": "string",
+                        "defaultValue": "Disarmed",
+                        "allowedValueList": {
+                            "Disarmed" : "Disarmed",
+                            "Away" : "Armed",
+                            "AwayInstant" : "ArmedInstant",
+                            "AwaySilent" : "ArmedSilent",
+                            "Stay" : "Stay",
+                            "StayInstant" : "StayInstant",
+                            "StaySilent" : "StaySilent"
+                        },
+                        "name": "State",
+                        "prefix": "State",
+                        "suffix": ""
+                    },
+                    "argument_2": {
+                        "dataType": "string",
+                        "defaultValue": "1234",
+                        "allowedValueRange": {
+                            "minimum": "0000",
+                            "maximum": "9999"
+                        },
+                        "prefix" : "PIN",
+                        "suffix" : "(insecure)",
+                        "name": "PINCode"
+                    }
+                }
+            }
+        },
+        "group_2": {
+            "cmd_1": {
+                "label": "Activate panic mode",
+                "serviceId": "urn:micasaverde-com:serviceId:AlarmPartition2",
+                "action": "RequestPanicMode",
+                "argumentList": {
+                    "argument_1": {
+                        "dataType": "string",
+                        "defaultValue": "Police",
+                        "allowedValueList": {
+                            "Police" : "Police",
+                            "Fire" : "Fire",
+                            "Auxiliary" : "Auxiliary"
+                        },
+                        "name": "State",
+                        "prefix": "Mode",
+                        "suffix": "Police, Fire or Auxiliary"
+                    }
+                }
+            }
+        }
+    },
     "DeviceType": "urn:schemas-micasaverde-com:device:ConcordAlarmPartition:1"
 }