rsmp 0.48.2 → 0.48.3

data/schemas/tlc/1.0.13/{sxl.yaml → source/sxl.yaml}

@@ -100,15 +100,15 @@ objects:
             description: Signal group status as text field
             pattern: "^[a-hA-G0-9N-P]*$"
           cyclecounter:
-            type: integer_as_string
+            type: integer
             description: Cycle counter
             range: "[0-999]"
           basecyclecounter:
-            type: integer_as_string
+            type: integer
             description: Base cycle counter
             range: "[0-999]"
           stage:
-            type: integer_as_string
+            type: integer
             description: Current stage (isolated)
             range: "[0-999]"
       S0002:
@@ -151,7 +151,7 @@ objects:
           During startup mode the traffic controller shows dark, red, yellow flash or using the predetermined start cycle (minimum times).
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller is not in start up mode
               True: Controller is currently in start up mode
@@ -162,12 +162,12 @@ objects:
           Used in situations where full priority is given in the emergency vehicle program.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Emergency stage inactive
               True: Emergency stage active
           emergencystage:
-            type: integer_as_string
+            type: integer
             description: Number of emergency stage
             range: "[1-255]"
       S0007:
@@ -298,7 +298,7 @@ objects:
           The time plan (signal program) may change signal timings, cycle time, control strategy and much more. Typical usage is is scenario based control where change of program is used to change priority etc.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Current time plan
             range: "[1-255]"
       S0015:
@@ -309,7 +309,7 @@ objects:
           Traffic situation is a concept used to divide multiple TLC's into areas and sub-areas. The traffic situation gives the possibility to change the TLC sub-area dynamically depending on the time of day and the traffic flow. Depending on the traffic situation each TLC selects the time plan dynamically.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Current traffic situation
             range: "[1-255]"
       S0016:
@@ -318,7 +318,7 @@ objects:
           Can be used by the management system to check the number of detector logics configured in the controller.
         arguments:
           number:
-            type: long_as_string
+            type: long
             description: Number of detector logics
             range: "[1-65025]"
       S0017:
@@ -327,7 +327,7 @@ objects:
           Can be used for the management system to check the number of signal groups configured in the controller.
         arguments:
           number:
-            type: long_as_string
+            type: long
             description: Number of signal groups
             range: "[1-65025]"
       S0018:
@@ -336,7 +336,7 @@ objects:
           Can be used for the management system to check the number of time plans configured in the controller.
         arguments:
           number:
-            type: long_as_string
+            type: long
             description: Number of time plans (depreciated)
             range: "[1-65025]"
       S0019:
@@ -345,7 +345,7 @@ objects:
           Can be used for the management system to check the number of traffic situations configured in the controller.
         arguments:
           number:
-            type: long_as_string
+            type: long
             description: Number of traffic situations
             range: "[1-65025]"
       S0020:
@@ -550,29 +550,29 @@ objects:
           Provides diagnostic information about the current date and time set in the controller.
         arguments:
           year:
-            type: integer_as_string
+            type: integer
             description: 'Year according to format YYYY. NOTE: UTC is used'
             range: YYYY
           month:
-            type: integer_as_string
+            type: integer
             description: 'Month (01-12) according to format MM. Note: UTC is used'
             range: MM
           day:
-            type: integer_as_string
+            type: integer
             description: 'Day of month (01-31) according to format DD.  Note: UTC
               is used'
             range: DD
           hour:
-            type: integer_as_string
+            type: integer
             description: 'Hour of day (00-23) according to format DD. Note: UTC is
               used'
             range: HH
           minute:
-            type: integer_as_string
+            type: integer
             description: 'Minute (00-59) according to format MM. Note: UTC is used'
             range: MM
           second:
-            type: integer_as_string
+            type: integer
             description: 'Second (00-59) according to format SS. Note: UTC is used'
             range: SS
     commands:
@@ -590,21 +590,18 @@ objects:
               YellowFlash: Enables yellow flash
               Dark: Enables dark mode
           securityCode:
-            type: string
+            type: string_list
             description: Security code 2
           timeout:
-            type: integer_as_string
+            type: integer_list
             description: |-
               Time in minutes until controller automatically reverts to previous functional position.
               0=no automatic return
             min: 0
             max: 1440
           intersection:
-            type: integer_as_string
-            description: |-
-              Intersection number.
-              Command only applies to specified intersection. Other intersections remains in their respective operating mode(s).
-              0: All intersections
+            type: integer_list
+            description: Intersection number
             min: 0
             max: 255
         command: setValue
@@ -617,7 +614,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller uses time plan according to programming
               True: Controller uses time plan according to command
@@ -625,7 +622,7 @@ objects:
             type: string
             description: Security code 2
           timeplan:
-            type: integer_as_string
+            type: integer
             description: designation of time plan
             range: "[1-255]"
         command: setPlan
@@ -637,7 +634,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller uses traffic situation according to own programming
               True: Controller uses traffic situation according to command
@@ -645,7 +642,7 @@ objects:
             type: string
             description: Security code 2
           traficsituation:
-            type: integer_as_string
+            type: integer
             description: designation of traficsituation
             range: "[1-255]"
         command: setTrafficSituation
@@ -656,7 +653,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: 'True: Restart controller'
           securityCode:
             type: string
@@ -670,7 +667,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Activate emergency route
               True: Deactivate emergency route
@@ -678,7 +675,7 @@ objects:
             type: string
             description: Security code 2
           emergencyroute:
-            type: integer_as_string
+            type: integer
             description: Number of emergency route
             range: "[1-255]"
         command: setEmergency
@@ -692,7 +689,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate input
               True: Activate input
@@ -700,7 +697,7 @@ objects:
             type: string
             description: Security code 2
           input:
-            type: integer_as_string
+            type: integer
             description: Number of Input
             range: "[1-255]"
         command: setInput
@@ -712,7 +709,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate fixed time control
               True: Activate fixed time control
@@ -800,7 +797,7 @@ objects:
           Requires security code 2
         arguments:
           plan:
-            type: integer_as_string
+            type: integer
             description: Plan to be changed
             range: "[0-255]"
           status:
@@ -827,11 +824,11 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Set offset time in seconds
             range: "[0-255]"
           plan:
-            type: integer_as_string
+            type: integer
             description: Time plan nr
             range: "[0-255]"
           securityCode:
@@ -911,11 +908,11 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Set cycle time in seconds
             range: "[1-255]"
           plan:
-            type: integer_as_string
+            type: integer
             description: Time plan nr
             range: "[0-255]"
           securityCode:
@@ -930,7 +927,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Force input
               True: Release input
@@ -938,11 +935,11 @@ objects:
             type: string
             description: Security code 2
           input:
-            type: integer_as_string
+            type: integer
             description: Number of Input
             range: "[1-255]"
           inputValue:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: input forced to False
               True: input forced to True
@@ -975,37 +972,37 @@ objects:
             type: string
             description: Security code 1
           year:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Year according to YYYY
             range: "[YYYY]"
           month:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Month according to MM (01-12)
             range: "[MM]"
           day:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Day in month according to DD (01-31)
             range: "[DD]"
           hour:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Hour according to HH (00-23)
             range: "[HH]"
           minute:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Minute according to MM (00-59)
             range: "[MM]"
           second:
-            type: integer_as_string
+            type: integer
             description: |-
               Changes internal clock. Note: UTC is used
               Second according to SS (00-59)
@@ -1024,7 +1021,7 @@ objects:
         category: D
         arguments:
           timeplan:
-            type: integer_as_string
+            type: integer
             description: Current time plan
             range: "[designation]"
       A0101:
@@ -1085,7 +1082,7 @@ objects:
               Time stamp for the most likely time for the signal group to go to green. If the signal group is green, it is the most likely time for the next green.
               Format according to W3C XML dateTime with a resolution of 3 decimal places. All time stamps in UTC. E.g. 2009-10-02T14:34:34.341Z
           ToGConfidence:
-            type: integer_as_string
+            type: integer
             description: Confidence of the likelyToGEstimate. 0-100%
             range: "[0-100]"
           minToREstimate   :
@@ -1104,7 +1101,7 @@ objects:
               Time stamp for the most likely time for the signal group to go to red. If the signal group is red, it is the most likely time for the next red.
               Format according to W3C XML dateTime with a resolution of 3 decimal places. All time stamps in UTC. E.g. 2009-10-02T14:34:34.341Z
           ToRConfidence:
-            type: integer_as_string
+            type: integer
             description: Confidence of the likelyToREstimate. 0-100%
             range: "[0-100]"
     commands:
@@ -1116,7 +1113,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: No command (default)
               True: Order a signal group to green
@@ -1132,7 +1129,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: No command (default)
               True: Order a signal group to red
@@ -1165,7 +1162,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off']
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
       A0302:
         description: |-
@@ -1190,7 +1187,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off']
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
           logicerror:
             type: string
@@ -1211,7 +1208,7 @@ objects:
               XML dateTime with a resolution of 3 decimal places. All time stamps
               in UTC. E.g. 2009-10-02T14:34:34.341Z
           vehicles:
-            type: long_as_string
+            type: long
             description: Number of vehicles on a given detector logic (since last
               update)
             range: "[number]"
@@ -1227,7 +1224,7 @@ objects:
               XML dateTime with a resolution of 3 decimal places. All time stamps
               in UTC. E.g. 2009-10-02T14:34:34.341Z
           speed:
-            type: integer_as_string
+            type: integer
             description: Average speed in km/h
             range: "[speed]"
       S0203:
@@ -1242,7 +1239,7 @@ objects:
               XML dateTime with a resolution of 3 decimal places. All time stamps
               in UTC. E.g. 2009-10-02T14:34:34.341Z
           occupancy:
-            type: integer_as_string
+            type: integer
             description: Occupancy in percent (0-100%)
             range: "[0-100]"
       S0204:
@@ -1257,39 +1254,39 @@ objects:
               XML dateTime with a resolution of 3 decimal places. All time stamps
               in UTC. E.g. 2009-10-02T14:34:34.341Z
           P:
-            type: long_as_string
+            type: long
             description: Number of cars
             range: "[number]"
           PS:
-            type: long_as_string
+            type: long
             description: Number of cars with trailers
             range: "[number]"
           L:
-            type: long_as_string
+            type: long
             description: Number of trucks
             range: "[number]"
           LS:
-            type: long_as_string
+            type: long
             description: Number of trucks with trailers
             range: "[number]"
           B:
-            type: long_as_string
+            type: long
             description: Number of busses
             range: "[number]"
           SP:
-            type: long_as_string
+            type: long
             description: Number of trams
             range: "[number]"
           MC:
-            type: long_as_string
+            type: long
             description: Number of motor cycles
             range: "[number]"
           C:
-            type: long_as_string
+            type: long
             description: Number of bicycles
             range: "[number]"
           F:
-            type: long_as_string
+            type: long
             description: Number of pedestrians
             range: "[number]"
     commands:
@@ -1301,7 +1298,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate manual control of detector logic
               True: Activate manual control of detector logic
@@ -1309,7 +1306,7 @@ objects:
             type: string
             description: Security code 2
           mode:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate detector logic
               True: Activate detector logic

data/schemas/tlc/1.0.13/sxl_index.json

@@ -235,10 +235,10 @@
   "commands" : {
     "M0001" : {
       "required" : {
-        "intersection" : "integer_as_string",
-        "securityCode" : "string",
+        "intersection" : "integer_list",
+        "securityCode" : "string_list",
         "status" : "string",
-        "timeout" : "integer_as_string"
+        "timeout" : "integer_list"
       }
     },
     "M0002" : {

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

@@ -54,7 +54,7 @@
           "properties" : {
             "v" : {
               "description" : "Security code 2",
-              "type" : "string"
+              "$ref" : "../defs/definitions.json#/string_list"
             }
           }
         }
@@ -71,7 +71,7 @@
           "properties" : {
             "v" : {
               "description" : "Time in minutes until controller automatically reverts to previous functional position.\n0=no automatic return",
-              "$ref" : "../defs/definitions.json#/integer"
+              "$ref" : "../defs/definitions.json#/integer_list"
             }
           }
         }
@@ -87,8 +87,8 @@
         "then" : {
           "properties" : {
             "v" : {
-              "description" : "Intersection number.\nCommand only applies to specified intersection. Other intersections remains in their respective operating mode(s).\n0: All intersections",
-              "$ref" : "../defs/definitions.json#/integer"
+              "description" : "Intersection number",
+              "$ref" : "../defs/definitions.json#/integer_list"
             }
           }
         }