rsmp_schema 0.4.0 → 0.4.2

data/schemas/tlc/1.1/sxl.yaml

@@ -34,8 +34,8 @@ objects:
           NOTE! When dark according to configuration the controller is considered to be in use
       8:
         title: Not Connected
-    functional_position: not used (set to null)
-    functional_state: not used (set to null)
+    functional_position: null
+    functional_state: null
     alarms:
       A0001:
         description: |-
@@ -90,7 +90,7 @@ objects:
       A0009:
         description: |-
           Other error.
-          Used for other errors not covered by any other alarm type
+          Used for other errors not covered by any other alarm type.
           Is a "minor fault" defined according to 3.11 in EN12675.
         priority: 3
         category: D
@@ -123,7 +123,7 @@ objects:
               Is counted from 0 until it reaches the cycle time (See S0028).
               
               c = (b + o) mod t
-               
+              
               where c = cycle counter,
               b = base cycle counter,
               o = offset,
@@ -169,15 +169,21 @@ objects:
         arguments:
           inputstatus:
             type: string
-            description: Input status as text field
+            description: |-
+              Input status as text field
+              Each character represent the state of the input in consecutive order.
+              0 : Input is not active
+              1 : Input is active
+              - : Input is undefined/does not exist
           extendedinputstatus:
             type: string
+            deprecated: true
             description: |-
               Extended input status as text field
-              Each character represent the state of the detector logic in consecutive order.
-              0 : Detector logic is not active
-              1 : Detector logic is active
-              - : Detector logic is undefined/does not exist
+              Each character represent the state of the extended input status in consecutive order.
+              0 : Input is not active
+              1 : Input is active
+              - : Input is undefined/does not exist
       S0004:
         description: |-
           Output status.
@@ -186,15 +192,21 @@ objects:
         arguments:
           outputstatus:
             type: string
-            description: Output status as text field
+            description: |-
+              Output status as text field
+              Each character represent the state of the output status in consecutive order.
+              0 : Output is not active
+              1 : Output is active
+              - : Output is undefined/does not exist
           extendedoutputstatus:
             type: string
+            deprecated: true
             description: |-
               Extended output status as text field
-              Each character represent the state of the detector logic in consecutive order.
-              0 : Detector logic is not active
-              1 : Detector logic is active
-              - : Detector logic is undefined/does not exist
+              Each character represent the state of the extended output status in consecutive order.
+              0 : Output is not active
+              1 : Output is active
+              - : Output is undefined/does not exist
       S0005:
         description: |-
           Traffic Light Controller starting.
@@ -208,9 +220,10 @@ objects:
               True: Controller is currently in start up mode
       S0006:
         description: |-
-          Emergency stage.
+          Emergency route.
           The status is active during emergency prioritization.
           Used in situations where full priority is given in the emergency vehicle program.
+          If no emergency route is active, status should be set to False, and emergencystage to zero.
         arguments:
           status:
             type: boolean
@@ -219,8 +232,8 @@ objects:
               True: Emergency stage active
           emergencystage:
             type: integer
-            description: Number of emergency stage
-            min: 1
+            description: Number of emergency stage (set to zero if no route is active)
+            min: 0
             max: 255
       S0007:
         description: |-
@@ -228,6 +241,7 @@ objects:
           The controller is active and is not in dark mode.
           Used to determine if the controller is operating, e.g. it shows red, green or yellow to the vehicles.
           During maintenance work the controller might be using dark mode (no output to the signal heads).
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "0" and "True" (one intersection) or "1,2" and "True,False" (two intersections).
         arguments:
           intersection:
             type: integer_list
@@ -245,17 +259,18 @@ objects:
             description: Source of the status change
             type: string_list
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0008:
         description: |-
           Manual control.
-          Traffic control deactivated in controller
+          Traffic control deactivated in controller.
           Signal timings is controlled manually by service personnel using the operating panel of the controller.
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "0" and "True" (one intersection) or "1,2" and "True,False" (two intersections).
         arguments:
           intersection:
             type: integer_list
@@ -273,17 +288,18 @@ objects:
             type: string_list
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0009:
         description: |-
           Fixed time control.
           Traffic actuated control deactivated and a pre-timed control is used.
           Usually only used in case normal detectors can't be used, e.g. during maintenance work.
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "0" and "True" (one intersection) or "1,2" and "True,False" (two intersections).
         arguments:
           intersection:
             type: integer_list
@@ -301,17 +317,18 @@ objects:
             type: string_list
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0010:
         description: |-
           Isolated control.
-          Isolated control mode indicates that the controller operates independently of any other traffic light controllers. This may different depending on traffic program (time plan).
+          Isolated control mode indicates that the controller operates independently of any other traffic light controller. This may be different depending on traffic program (time plan).
           Used to determine if the controller is operating independently or operating with other controllers (coordination).
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "0" and "True" (one intersection) or "1,2" and "True,False" (two intersections).
         arguments:
           intersection:
             type: integer_list
@@ -329,17 +346,19 @@ objects:
             type: string_list
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0011:
         description: |-
           Yellow flash.
           The controller shows yellow flash.
           Yellow flash may be used during a serious fault (depending on configuration) or maintenance work. It can also be manually set using M0001.
+          Some countries may use yellow flash as an normal operating mode, and not necessarily during fault.
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "1,2" and "True,False"
         arguments:
           intersection:
             type: integer_list
@@ -357,17 +376,18 @@ objects:
             type: string_list
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0012:
         description: |-
           All red.
           The controller show all red.
           All red can be manually set using the controllers operating panel during maintenance work.
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "1,2" and "True,False"
         arguments:
           intersection:
             type: integer_list
@@ -385,17 +405,18 @@ objects:
             type: string_list
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0013:
         description: |-
           Police key
           The controller is forced to dark mode or yellow flash.
           The "police key" is a external control switch present in some controllers that manually switches the controller to either dark mode or yellow flash.
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "1,2" and "0,1"
         arguments:
           intersection:
             type: integer_list
@@ -423,14 +444,14 @@ objects:
             min: 1
             max: 255
           source:
-            type: string_list
+            type: string
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0015:
         description: |-
@@ -445,14 +466,14 @@ objects:
             min: 1
             max: 255
           source:
-            type: string_list
+            type: string
             description: Source of the status change
             values:
-              operator_panel: Operator panel 
-              calendar_clock: Calendar/clock 
-              control_block: Control block 
-              forced: Forced due to external command e.g. supervisor 
-              startup: Set after startup mode 
+              operator_panel: Operator panel
+              calendar_clock: Calendar/clock
+              control_block: Control block
+              forced: Forced due to external command e.g. supervisor
+              startup: Set after startup mode
               other: Other reason
       S0016:
         description: |-
@@ -498,6 +519,7 @@ objects:
         description: |-
           Control mode.
           Can be used for the management system to check the current control mode (startup, normal, standby, failure, test).
+          Please note that all values in this status uses comma-separated lists - one value for each intersection, e.g. "1,2" and "startup,control"
         arguments:
           intersection:
             type: integer_list
@@ -563,15 +585,15 @@ objects:
             type: string
             description: |-
               Offset table
-              Each offset time is written as pp-tt where:
-              pp=time plan
-              tt=offset time in seconds
+              Each offset time is written as p-t where:
+              p=time plan number (from 1 to 255)
+              t=offset time in seconds (from 0 to 255)
               
               Each offset time is separated with a comma
               
               E.g.
-              pp-tt,pp-tt
-            pattern: "^(\\d{1,2}\\-\\d{1,2})(?:,(\\d{1,2}\\-\\d{1,2}))*$"
+              1-0,2-13-3-7
+            pattern: "^(\\d{1,3}\\-\\d{1,3})(?:,(\\d{1,3}\\-\\d{1,3}))*$"
       S0026:
         description: |-
           Week time table.
@@ -690,14 +712,10 @@ objects:
             max: 255
           status:
             type: string_list
-            description: |-
+            values:
               local: Local coordination
               centralized: Coordination with synchronized clock
-              off: Coordination not active
-            values:
-              local:
-              centralized:
-              'off':
+              'off': Coordination not active
           source:
             description: Source of the status change
             type: string_list
@@ -715,10 +733,21 @@ objects:
           A list of priorities is returned, referred to by their request ids. The same request id can appear only once.
           All priorities are included in the list (not only the ones that have changed state since the last update). This is done regardless of whether the status is send in respond to a status request, or due to a status subscription, and also regardless of whether a status subscription uses an update interval, or send-on-change, or both.
           If you subscribe using an update interval, you’re not guaranteed to get all intermediate states. To guarantee that, send-on-change must be used when subscribing.
-          To understand how this status relates to ETSI/J2735, please see the wiki.
+          To understand how this status relates to ETSI/J2735, please see the [wiki](https://github.com/rsmp-nordic/rsmp_sxl_traffic_lights/wiki/Signal-priority-and-ETSI-J2735).
           All priorities are send on every status update, regardless of whether an interval, or sendOnChange (or both) is used.
           When a priority reaches an end states (completed, timeout, rejected, cooldown or stale), it must be sent once on the next status update, then removed from the list.
           A request always starts in the ‘received’ state. The following table shows the possible state transitions:
+
+          State      | Possible next states
+          ---------- | -------------------------------------
+          received   | queued, activated, rejected, cooldown
+          queued     | activated, timeout
+          activated  | completed, stale
+          completed  |
+          timeout    |
+          rejected   |
+          cooldown   |
+          stale      |
         arguments:
           status:
             description: JSON array of priority status items
@@ -749,7 +778,7 @@ objects:
               e:
                 type: integer
                 description: |-
-                  (Optional) Estimated green extension provided by the priority, in seconds
+                  Estimated green extension provided by the priority, in seconds
                   Only used when state is ‘completed’.
                 optional: true
                 min: 0
@@ -757,7 +786,7 @@ objects:
               d:
                 type: integer
                 description: |-
-                  (Optional) Estimated red reduction provided by the priority, in seconds
+                  Estimated red reduction provided by the priority, in seconds
                   Only used when state is ‘completed’.
                 optional: true
                 min: 0
@@ -782,8 +811,8 @@ objects:
           user:
             type: integer
             values:
-              0: Nobody logged in 
-              1: Operator logged in at level 1 (read only) 
+              0: Nobody logged in
+              1: Operator logged in at level 1 (read only)
               2: Operator logged in at level 2 (read/write)
       S0092:
         description: |-
@@ -793,8 +822,8 @@ objects:
           user:
             type: integer
             values:
-              0: Nobody logged in 
-              1: Operator logged in at level 1 (read only) 
+              0: Nobody logged in
+              1: Operator logged in at level 1 (read only)
               2: Operator logged in at level 2 (read/write)
       S0095:
         description: |-
@@ -806,39 +835,38 @@ objects:
             description: Manufacturer, product name and version of traffic light controller
       S0096:
         description: |-
-          Current date and time
+          Current date and time.
+          Note: UTC is used.
           Provides diagnostic information about the current date and time set in the controller.
         arguments:
           year:
             type: integer
-            description: 'Year according to format YYYY. NOTE: UTC is used'
+            description: Year
             min: 0
             max: 9999
           month:
             type: integer
-            description: 'Month (01-12) according to format MM. Note: UTC is used'
+            description: Month
             min: 1
             max: 12
           day:
             type: integer
-            description: 'Day of month (01-31) according to format DD.  Note: UTC
-              is used'
+            description: Day of month
             min: 1
             max: 31
           hour:
             type: integer
-            description: 'Hour of day (00-23) according to format DD. Note: UTC is
-              used'
+            description: Hour
             min: 0
             max: 23
           minute:
             type: integer
-            description: 'Minute (00-59) according to format MM. Note: UTC is used'
+            description: Minute
             min: 0
             max: 59
           second:
             type: integer
-            description: 'Second (00-59) according to format SS. Note: UTC is used'
+            description: Second
             min: 0
             max: 59
       S0097:
@@ -868,6 +896,7 @@ objects:
               
               Note:
               - The checksum should be calculated using the same data as used in S0098
+              - Data Downloaded with S0098 and hashed with SHA-2 should match this value.
           timestamp:
             type: timestamp
             description: Time stamp of the checksum. Format according to W3C XML dateTime
@@ -925,7 +954,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
       S0206:
         description: |-
@@ -945,7 +974,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
       S0207:
         description: |-
@@ -965,7 +994,7 @@ objects:
               - Value expressed as an integer with a range of 0-100.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 100
       S0208:
         description: |-
@@ -985,7 +1014,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           PS:
             type: integer_list
@@ -994,7 +1023,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           L:
             type: integer_list
@@ -1003,7 +1032,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           LS:
             type: integer_list
@@ -1012,16 +1041,16 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           B:
             type: integer_list
             description: |-
-              Number of busses.
+              Number of buses.
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           SP:
             type: integer_list
@@ -1030,7 +1059,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           MC:
             type: integer_list
@@ -1039,7 +1068,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           C:
             type: integer_list
@@ -1048,7 +1077,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
           F:
             type: integer_list
@@ -1057,7 +1086,7 @@ objects:
               - Value expressed as an integer with a range of 0-65535.
               - Contains data from all detector logics. Each detector logic is separated with a comma.
               - The value is set to “-1” if no data could be measured (e.g. detector fault)
-            min: 0
+            min: -1
             max: 65535
     commands:
       M0001:
@@ -1067,14 +1096,14 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control
               YellowFlash: Enables yellow flash
               Dark: Enables dark mode
           securityCode:
-            type: string_list
+            type: string
             description: Security code 2
           timeout:
             type: integer
@@ -1084,10 +1113,8 @@ objects:
             min: 0
             max: 1440
           intersection:
-            type: integer_list
-            description: |-
-              Comma separated list of intersections which the status relates to, e.g. “1,2”.
-              Use “0” for all intersections of the TLC.
+            type: integer
+            description: Intersection number
             min: 0
             max: 255
         command: setValue
@@ -1217,6 +1244,7 @@ objects:
           Only used when a primary controller orders signal group of other controller to green or red (Coordination with external control bits).
           May also include purposes for adaptive control where a UTC system or a local traffic light controller takes over the phase control (stage control).
           Requires security code 2.
+        reserved: true
         arguments:
           status:
             type: string
@@ -1257,40 +1285,36 @@ objects:
           The parameter ‘status’ sets/unsets a block of 16 inputs at a time. It can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon. Format: [Offset];[Bits to set];[Bits to unset];…
 
           - ‘Offset’ defines where the 16 inputs starts from
-          - ‘Bits to set’ defines which bit(s) to set. ‘0’ if unsed
+          - ‘Bits to set’ defines which bit(s) to set. ‘0’ if unused
           - ‘Bits to unset’ defines which bit(s) to unset. ‘0’ if unused
 
-          Example 1: “3,4134,65” sets input 4,5,8,15 and unsets 3,9 - Input starts from no. 5 - “4134” is 1 0000 0010 0110 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 1000 0001 0011 0000 which are bits 4,5,8,15 - “65” is 100 0001 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 10 0000 1000 which are bits 3,9
+          Example 1:
+          “3,4134,65” sets input 4,5,8,15 and unsets 3,9
+          - Input starts from no. 5
+          - “4134” is 1 0000 0010 0110 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 1000 0001 0011 0000 which are bits 4,5,8,15
+          - “65” is 100 0001 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 10 0000 1000 which are bits 3,9
 
-          Example 2: “12,1,4” sets input 12 and unsets 14 - Input starts from no. 12 - “1” is 1 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 1 0000 0000 0000, which is bit 12 - “4” is 100 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 100 0000 0000 0000, which is bit 14
+          Example 2:
+          “12,1,4” sets input 12 and unsets 14
+          - Input starts from no. 12
+          - “1” is 1 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 1 0000 0000 0000, which is bit 12
+          - “4” is 100 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 100 0000 0000 0000, which is bit 14
 
           And both these examples could be sent in the same message as: “3,4143,65;12,1,4”
 
           Such a message would set input 4,5,8,12,15 and unset input 3,9,14
 
-          Example 3: “0,1,2” sets input 0 and unsets 1 - Input starts from 0 - “1” is 1 in binary, which is bit 0 - “2” is 10 in binary, which is bit 1
+          Example 3:
+          “0,1,2” sets input 0 and unsets 1
+          - Input starts from 0
+          - “1” is 1 in binary, which is bit 0
+          - “2” is 10 in binary, which is bit 1
         arguments:
           status:
             type: string
             description: |-
-              Sets/Unsets a block of 16 inputs at a time. Can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon. Since semicolon breaks the SXL csv-format, colon, ":" is used in example below.
-              
-              Format: [Offset],[Bits to set],[Bits to unset]:…
-              
-              Offset sets where the 16 inputs starts from followed by two 16 bit values telling which bit to set and unset in binary format, i.e. first bit have value 1 and last bit have value 32768.
-              
-              Example 1:
-              "5, 4134, 65" sets input 6,7,10,17 = on and 5,11 = off
-              (Input starts from no. 5 and bit 1,2,5,12 = 1 and bit 0,6 = 0)
-              
-              Example 2:
-              "22, 1, 4" sets input 22 = on and 24 = off
-              (Input starts from no. 22 and bit 0 = 1 and bit 2 = 0)
-              
-              And both thease examples could be sent in the same message as:
-              "5,4143:65:22,1,4"
-              
-              Such a message would activate input 6,7,10,17,22 and deactivate input 5,11,24
+              Sets/Unsets a block of 16 inputs at a time. Can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon.
+              Format: [Offset];[Bits to set];[Bits to unset];…
           securityCode:
             type: string
             description: Security code 2
@@ -1507,7 +1531,7 @@ objects:
 
           The benefit of using this message over activating inputs or detector logics is that you can specify a priority level, vehicle type and estimated time of arrival. You can also update or cancel the request, and use the corresponding status message to track the status of the request, including how much priority was actually given.
 
-          To understand how this command relates to ETSI/J2735, please see the wiki.
+          To understand how this command relates to ETSI/J2735, please see the [wiki](https://github.com/rsmp-nordic/rsmp_sxl_traffic_lights/wiki/Signal-priority-and-ETSI-J2735).
 
           Activating signal priority is expected to provide more green time for a particular movement through the intersection, but the exact mechanism must typically be configured in the controller.
 
@@ -1558,53 +1582,49 @@ objects:
           signalGroupId:
             type: string
             optional: true
-            description: (Optional) ID of a signal group component.
+            description: ID of a signal group component.
           inputId:
             type: integer
             optional: true
-            description: (Optional) ID of an input, using the same numbering scheme as M0006
+            description: ID of an input, using the same numbering scheme as M0006
             min: 0
             max: 255
           connectionId:
             type: integer
             optional: true
-            description: (Optional) ID of a connection, connecting an ingoing and an outgoing lane
+            description: ID of a connection, connecting an ingoing and an outgoing lane
             min: 0
             max: 255
           approachId:
             type: integer
             optional: true
-            description: (Optional) ID of an intersection approach
+            description: ID of an intersection approach
             min: 0
             max: 16
           laneInId:
             type: integer
             optional: true
-            description: (Optional) ID of an ingoing lane
+            description: ID of an ingoing lane
             min: 0
             max: 255
           laneOutId:
             type: integer
             optional: true
-            description: (Optional) ID of an outgoing lane
+            description: ID of an outgoing lane
             min: 0
             max: 255
           priorityId:
             type: integer
             optional: true
-            description: (Optional) ID of a priority
+            description: ID of a priority
             min: 0
             max: 255
           type:
             type: string
-            description: |-
+            values:
               new: New priority request
               update: Update to existing priority request
               cancel: Cancel an existing priority
-            values:
-              new:
-              update:
-              cancel:
           level:
             type: integer
             description: |-
@@ -1614,15 +1634,14 @@ objects:
           eta:
             type: integer
             optional: true
-            description: (Optional) Estimated time of arrival to the intersection, in seconds
+            description: Estimated time of arrival to the intersection, in seconds
             min: 0
             max: 255
           vehicleType:
             type: string
             optional: true
-            description: |-
-              (Optional) Vehicle type
-
+            description: Vehicle type
+            values:
               pedestrian: Pedestrians
               bicycle: Bicycles
               motorcycle: Motorcycles
@@ -1635,19 +1654,6 @@ objects:
               safetyCar: For e.g. escort vehicles
               specialTransport: For e.g. heavy load
               other: Other type of vehicle
-            values:
-              pedestrian:
-              bicycle:
-              motorcycle:
-              car:
-              bus:
-              lightTruck:
-              heavyTruck:
-              tram:
-              emergency:
-              safetyCar:
-              specialTransport:
-              other:
         command: requestPriority
       M0023:
         description: |-
@@ -1655,6 +1661,7 @@ objects:
           Switch to a designated time plan if this timeout is reached due to lost connection with the supervisor.
           Disable by setting timeout to '0'.
           Used in conjunction with dynamic bands, M0014
+          Requires security code 2.
         arguments:
           status:
             type: integer
@@ -1687,6 +1694,7 @@ objects:
         description: |-
           Set clock.
           Can be used to manually set the clock of the traffic light controller if automatic  time synchronization (NTP or watchdog sync) is not available. For instance, during maintenance work.
+          Note: UTC is used.
           Requires security code 1
         arguments:
           securityCode:
@@ -1694,44 +1702,32 @@ objects:
             description: Security code 1
           year:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Year according to YYYY
+            description: Year
             min: 0
             max: 9999
           month:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Month according to MM (01-12)
+            description: Month
             min: 1
             max: 12
           day:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Day in month according to DD (01-31)
+            description: Day of month
             min: 1
             max: 31
           hour:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Hour according to HH (00-23)
+            description: Hour
             min: 0
             max: 23
           minute:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Minute according to MM (00-59)
+            description: Minute
             min: 0
             max: 59
           second:
             type: integer
-            description: |-
-              Changes internal clock. Note: UTC is used
-              Second according to SS (00-59)
+            description: Second
             min: 0
             max: 59
         command: setDate
@@ -1841,6 +1837,7 @@ objects:
           Although this command is intended to be used with coordination it is not actually specified to be used for this yet. It is reserved in the SXL for possible future use.
           Intended for use with coordination of signaling systems where a traffic light controller communicates with neighboring controllers. Only used when a primary controller orders signal group of other controller to green or red (Coordination with external control bits).
           Requires security code 2
+        reserved: true
         arguments:
           status:
             type: boolean
@@ -1857,6 +1854,7 @@ objects:
           Although this command is intended to be used with coordination it is not actually specified to be used for this yet. It is reserved in the SXL for possible future use.
           Intended for use with coordination of signaling systems where a traffic light controller communicates with neighboring controllers. Only used when a primary controller orders signal group of other controller to green or red (Coordination with external control bits).
           Requires security code 2
+        reserved: true
         arguments:
           status:
             type: boolean
@@ -1932,7 +1930,7 @@ objects:
         description: |-
           Serious detector error (hardware).
           Is 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.
-        priority: 3
+        priority: 2
         category: D
         arguments:
           detector:
@@ -1957,7 +1955,7 @@ objects:
           Serious detector error (logic error).
           For instance; detector continuously on or off during an extended time.
           Is 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
-        priority: 3
+        priority: 2
         category: D
         arguments:
           detector:
@@ -2015,6 +2013,7 @@ objects:
             type: integer
             description: Average speed in km/h
             min: 0
+            max: 65535
       S0203:
         description: |-
           Traffic Counting: Occupancy.
@@ -2046,38 +2045,47 @@ objects:
             type: integer
             description: Number of cars
             min: 0
+            max: 65535
           PS:
             type: integer
             description: Number of cars with trailers
             min: 0
+            max: 65535
           L:
             type: integer
             description: Number of trucks
             min: 0
+            max: 65535
           LS:
             type: integer
             description: Number of trucks with trailers
             min: 0
+            max: 65535
           B:
             type: integer
-            description: Number of busses
+            description: Number of buses
             min: 0
+            max: 65535
           SP:
             type: integer
             description: Number of trams
             min: 0
+            max: 65535
           MC:
             type: integer
             description: Number of motor cycles
             min: 0
+            max: 65535
           C:
             type: integer
             description: Number of bicycles
             min: 0
+            max: 65535
           F:
             type: integer
             description: Number of pedestrians
             min: 0
+            max: 65535
     commands:
       M0008:
         description: |-