rsmp_schema 0.4.4 → 0.4.5

data/schemas/tlc/1.1/alarms/A0004.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Less serious configuration error.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
-    }
-  ]
+  "description" : "Less serious configuration error.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
 }

data/schemas/tlc/1.1/alarms/A0005.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Synchronisation error (coordination).\nIs a \"minor fault\" defined according to 3.11 in EN12675."
-    }
-  ]
+  "description" : "Synchronisation error (coordination).\nIs a \"minor fault\" defined according to 3.11 in EN12675."
 }

data/schemas/tlc/1.1/alarms/A0006.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Safety error\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675."
-    }
-  ]
+  "description" : "Safety error\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675."
 }

data/schemas/tlc/1.1/alarms/A0007.json

@@ -1,7 +1,7 @@
 {
+  "description" : "Communication error.\nUsed for communication errors with the central system. Includes NTP connection loss if the TLC is configured to use NTP.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
   "allOf" : [
     {
-      "description" : "Communication error.\nUsed for communication errors with the central system. Includes NTP connection loss if the TLC is configured to use NTP.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -22,31 +22,37 @@
         }
       },
       "then" : {
-        "s" : null
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "protocol"
-          }
+        "s" : {
+          "type" : "null"
         }
       },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Type of communication error, e.g. NTP or RSMP",
-            "type" : "string",
-            "enum" : [
-              "ntp",
-              "rsmp"
-            ]
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "protocol"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Type of communication error, e.g. NTP or RSMP",
+                  "type" : "string",
+                  "enum" : [
+                    "ntp",
+                    "rsmp"
+                  ]
+                }
+              }
+            }
           }
-        }
+        ]
       }
     }
   ]

data/schemas/tlc/1.1/alarms/A0008.json

@@ -1,7 +1,7 @@
 {
+  "description" : "Dead lock error.\nUsed for dead lock errors.\nFor instance; a signal group has requested green but is unable to switch due to a conflicting signal group for an extended period of time. At some point the request times out and the controller goes failure mode. The cause for this error is due to configuration errors or external sources.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
   "allOf" : [
     {
-      "description" : "Dead lock error.\nUsed for dead lock errors.\nFor instance; a signal group has requested green but is unable to switch due to a conflicting signal group for an extended period of time. At some point the request times out and the controller goes failure mode. The cause for this error is due to configuration errors or external sources.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -22,33 +22,39 @@
         }
       },
       "then" : {
-        "s" : null
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "timeplan"
-          }
+        "s" : {
+          "type" : "null"
         }
       },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "allOf" : [
-              {
-                "description" : "Current time plan"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "timeplan"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "allOf" : [
+                    {
+                      "description" : "Current time plan"
+                    },
+                    {
+                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+                    }
+                  ]
+                }
               }
-            ]
+            }
           }
-        }
+        ]
       }
     }
   ]

data/schemas/tlc/1.1/alarms/A0009.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Other error.\nUsed for other errors not covered by any other alarm type.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
-    }
-  ]
+  "description" : "Other error.\nUsed for other errors not covered by any other alarm type.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
 }

data/schemas/tlc/1.1/alarms/A0010.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Door open.\nUsed for open door (room or cabinet)."
-    }
-  ]
+  "description" : "Door open.\nUsed for open door (room or cabinet)."
 }

data/schemas/tlc/1.1/alarms/A0101.json

@@ -1,7 +1,3 @@
 {
-  "allOf" : [
-    {
-      "description" : "Pushbutton error.\nUsed for push buttons."
-    }
-  ]
+  "description" : "Pushbutton error.\nUsed for push buttons."
 }

data/schemas/tlc/1.1/alarms/A0201.json

@@ -1,7 +1,7 @@
 {
+  "description" : "Serious lamp error.\nUsed for lamp errors.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
   "allOf" : [
     {
-      "description" : "Serious lamp error.\nUsed for lamp errors.\nIs a \"major fault\" defined according to 3.8 in EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -22,32 +22,38 @@
         }
       },
       "then" : {
-        "s" : null
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "color"
-          }
+        "s" : {
+          "type" : "null"
         }
       },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Color of lamp",
-            "type" : "string",
-            "enum" : [
-              "green",
-              "red",
-              "yellow"
-            ]
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "color"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Color of lamp",
+                  "type" : "string",
+                  "enum" : [
+                    "green",
+                    "red",
+                    "yellow"
+                  ]
+                }
+              }
+            }
           }
-        }
+        ]
       }
     }
   ]

data/schemas/tlc/1.1/alarms/A0202.json

@@ -1,7 +1,7 @@
 {
+  "description" : "Less serious lamp error.\nUsed for lamp errors.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
   "allOf" : [
     {
-      "description" : "Less serious lamp error.\nUsed for lamp errors.\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -22,32 +22,38 @@
         }
       },
       "then" : {
-        "s" : null
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "color"
-          }
+        "s" : {
+          "type" : "null"
         }
       },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Color of lamp",
-            "type" : "string",
-            "enum" : [
-              "green",
-              "red",
-              "yellow"
-            ]
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "color"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Color of lamp",
+                  "type" : "string",
+                  "enum" : [
+                    "green",
+                    "red",
+                    "yellow"
+                  ]
+                }
+              }
+            }
           }
-        }
+        ]
       }
     }
   ]

data/schemas/tlc/1.1/alarms/A0301.json

@@ -1,7 +1,7 @@
 {
+  "description" : "Detector error (hardware).\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
   "allOf" : [
     {
-      "description" : "Detector error (hardware).\nIs a \"minor fault\" defined according to 3.11 in EN12675.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -25,101 +25,107 @@
         }
       },
       "then" : {
-        "s" : null
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "detector"
-          }
-        }
-      },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Designation of the detector (hardware)",
-            "type" : "string"
-          }
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "type"
-          }
-        }
-      },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Type of detector",
-            "type" : "string",
-            "enum" : [
-              "input",
-              "loop"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "errormode"
-          }
-        }
-      },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Detector forced on/off while detector error",
-            "type" : "string",
-            "enum" : [
-              "off",
-              "on"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "n"
-        ],
-        "properties" : {
-          "n" : {
-            "const" : "manual"
-          }
+        "s" : {
+          "type" : "null"
         }
       },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "allOf" : [
-              {
-                "description" : "Manually controlled detector logic (True/False)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/boolean"
+      "else" : {
+        "allOf" : [
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "detector"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Designation of the detector (hardware)",
+                  "type" : "string"
+                }
               }
-            ]
+            }
+          },
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "type"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Type of detector",
+                  "type" : "string",
+                  "enum" : [
+                    "input",
+                    "loop"
+                  ]
+                }
+              }
+            }
+          },
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "errormode"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "description" : "Detector forced on/off while detector error",
+                  "type" : "string",
+                  "enum" : [
+                    "off",
+                    "on"
+                  ]
+                }
+              }
+            }
+          },
+          {
+            "if" : {
+              "required" : [
+                "n"
+              ],
+              "properties" : {
+                "n" : {
+                  "const" : "manual"
+                }
+              }
+            },
+            "then" : {
+              "properties" : {
+                "v" : {
+                  "allOf" : [
+                    {
+                      "description" : "Manually controlled detector logic (True/False)"
+                    },
+                    {
+                      "$ref" : "../../../core/3.1.2/definitions.json#/boolean"
+                    }
+                  ]
+                }
+              }
+            }
           }
-        }
+        ]
       }
     }
   ]