rsmp_schema 0.8.9 → 0.9.0

data/schemas/tlc/1.1.0/alarms/A0303.json

@@ -1,131 +1,91 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Serious detector error (hardware).\nIs a \"major fault\" defined according to 3.8 i EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675.",
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "detector",
+        "errormode",
+        "manual",
+        "type"
+      ]
+    }
+  },
   "allOf" : [
     {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "detector",
-            "errormode",
-            "manual",
-            "type"
-          ]
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "detector"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Designation of the detector (hardware)",
+            "type" : "string"
+          }
         }
       }
     },
     {
       "if" : {
-        "required" : [
-          "q"
-        ],
         "properties" : {
-          "q" : {
+          "n" : {
+            "const" : "type"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Type of detector.",
+            "type" : "string",
             "enum" : [
-              "undefined",
-              "unknown"
+              "input",
+              "loop"
             ]
           }
         }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "errormode"
+          }
+        }
       },
       "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Detector forced on/off while detector error",
+            "type" : "string",
+            "enum" : [
+              "off",
+              "on"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "manual"
+          }
+        }
       },
-      "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"
-                    }
-                  ]
-                }
-              }
-            }
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Manually controlled detector logic (True/False)",
+            "$ref" : "../../../core/3.1.2/definitions.json#/boolean"
           }
-        ]
+        }
       }
     }
   ]

data/schemas/tlc/1.1.0/alarms/A0304.json

@@ -1,157 +1,114 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Serious detector error (logic error).\nFor instance; detector continuously on or off during an extended time.\nIs a \"major fault\" defined according to 3.8 i EN12675 which causes the controller to switch to a \"failure mode\" according to 3.6 in EN12675",
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "detector",
+        "errormode",
+        "logicerror",
+        "manual",
+        "type"
+      ]
+    }
+  },
   "allOf" : [
     {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "detector",
-            "errormode",
-            "logicerror",
-            "manual",
-            "type"
-          ]
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "detector"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Designation of the detector (hardware)",
+            "type" : "string"
+          }
         }
       }
     },
     {
       "if" : {
-        "required" : [
-          "q"
-        ],
         "properties" : {
-          "q" : {
+          "n" : {
+            "const" : "type"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Type of detector.",
+            "type" : "string",
+            "enum" : [
+              "input",
+              "loop"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "errormode"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Detector forced on/off while detector error",
+            "type" : "string",
             "enum" : [
-              "undefined",
-              "unknown"
+              "off",
+              "on"
             ]
           }
         }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "manual"
+          }
+        }
       },
       "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Manually controlled detector logic (True/False)",
+            "$ref" : "../../../core/3.1.2/definitions.json#/boolean"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "logicerror"
+          }
+        }
       },
-      "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"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "logicerror"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Type of logic error",
-                  "type" : "string",
-                  "enum" : [
-                    "always_off",
-                    "always_on",
-                    "intermittent"
-                  ]
-                }
-              }
-            }
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Type of logic error",
+            "type" : "string",
+            "enum" : [
+              "always_off",
+              "always_on",
+              "intermittent"
+            ]
           }
-        ]
+        }
       }
     }
   ]

data/schemas/tlc/1.1.0/alarms/alarms.json

@@ -1,4 +1,5 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "properties" : {
     "aCId" : {
       "enum" : [

data/schemas/tlc/1.1.0/commands/M0001.json

@@ -1,137 +1,91 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Sets functional position.\nSets the controller to yellow flash, dark mode or normal control.\nRequires security code 2.",
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "intersection",
+        "securityCode",
+        "status",
+        "timeout"
+      ]
+    },
+    "cO" : {
+      "const" : "setValue"
+    }
+  },
   "allOf" : [
     {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "intersection",
-            "securityCode",
-            "status",
-            "timeout"
-          ]
-        },
-        "cO" : {
-          "const" : "setValue"
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "status"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
+            ]
+          }
         }
       }
     },
     {
       "if" : {
-        "required" : [
-          "q"
-        ],
         "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+          "n" : {
+            "const" : "securityCode"
           }
         }
       },
       "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Security code 2",
+            "type" : "string"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "timeout"
+          }
+        }
       },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Set operating mode",
-                  "type" : "string",
-                  "enum" : [
-                    "Dark",
-                    "NormalControl",
-                    "YellowFlash"
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "securityCode"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Security code 2",
-                  "type" : "string"
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "timeout"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "Time in minutes until controller automatically reverts to previous functional position.\n0=no automatic return"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "intersection"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "Intersection number"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Time in minutes until controller automatically reverts to previous functional position.\n0=no automatic return",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
           }
-        ]
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "intersection"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Intersection number",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
       }
     }
   ]