Skip to content

Commit ccce299

Browse files
committed
Fix cross-references
1 parent 001bfd5 commit ccce299

File tree

11 files changed

+29
-23
lines changed

11 files changed

+29
-23
lines changed

protocol/specification/classes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ but earlier definitions will stay intact, i.e. no removals or redefinitions will
1313
occur.
1414

1515
The module class is in fact a list of classes (highest level class first) and is
16-
stored in the module-property `interface_classes`. The ECS chooses the first
17-
class from the list which is known to it. The last one in the list must be one
18-
of the base classes listed below.
16+
stored in the module-property `interface_classes <mod.interface_classes>`. The
17+
ECS chooses the first class from the list which is known to it. The last one in
18+
the list must be one of the base classes listed below.
1919

2020
.. admonition:: Remark
2121

@@ -46,7 +46,7 @@ Base classes
4646
It must have a `target` parameter in addition to what a `Readable` has.
4747
It does not have a `stop` command. A module which needs time to reach
4848
the target but cannot be stopped has also to be represented as a `Writable`,
49-
with a `BUSY` item (code 300...389) in the status enum.
49+
with a ``BUSY`` item (code 300...389) in the status enum.
5050

5151
.. baseclass:: Drivable
5252

protocol/specification/descriptive.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,6 @@ description.
501501

502502
As for all custom extensions, their names must be prefixed with an underscore.
503503
The meaning of custom properties depends on the implementor, given by the
504-
`implementor` module property. An ECS that doesn't know the meaning of a
505-
custom property MUST ignore it. The data type of a custom property is not
506-
pre-defined, an ECS should be prepared to handle anything here.
504+
`implementor <mod.implementor>` module property. An ECS that doesn't know the
505+
meaning of a custom property MUST ignore it. The data type of a custom property
506+
is not pre-defined, an ECS should be prepared to handle anything here.

protocol/specification/messages.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The ``<`` or ``>`` marks whether messages are sent to or received from the node.
4343
Message intent Kind Message structure
4444
======================= ============== ==================
4545
Identification request `*IDN?`
46-
\ reply `ISSE&SINE2020,SECoP,revision,version`
46+
\ reply `ISSE,SECoP,revision,version <ISSE,SECoP,<revision>,<version>>`
4747
Description request `describe`
4848
\ reply `describing . structure-report <describing>`
4949
Activate updates request `activate`
@@ -59,7 +59,7 @@ The ``<`` or ``>`` marks whether messages are sent to or received from the node.
5959
Execute command request `do mod:cmd value <do>`
6060
\ reply `done mod:cmd data-report <done>`
6161
Value update event event `update mod:param data-report <update>`
62-
Error reply reply `error_action specifier error-report <error>`
62+
Error reply reply `error_action specifier error-report <error_*>`
6363
Checking (\*) request `check mod:param value <check>`
6464
\ reply `checked mod:param data-report <checked>`
6565
Logging (\*) request `logging mod level <logging>`

protocol/specification/messages/activation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
.. message:: [request] deactivate [<module>]
3030
[reply] inactive [<module>]
31+
[reply] error_deactivate [<module>] <error-report>
3132

3233
A parameterless message. After the "inactive" reply no more updates are
3334
delivered if not triggered by a read message.

protocol/specification/messages/commands.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
conform to the declared datatypes from the datatype of the command argument.
1818

1919
A command may have a return value, which may also be structured. The "done"
20-
reply always contains a `data-report` with the return value. If no value is
20+
reply always contains a :ref:`data-report` with the return value. If no value is
2121
returned, the data part is set to "null". The "done" message should be returned
2222
quickly, the time scale should be in the order of the time needed for
2323
communications. Still, all side-effects need to be realized and communicated

protocol/specification/messages/errors.rst

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,28 @@
33
``error_*``: Error replies
44
--------------------------
55

6-
Contains an error class from the list below as its second item (the specifier).
7-
The third item of the message is an :ref:`error-report`, containing the request
8-
message (minus line endings) as a string in its first element, a (short) human
9-
readable text as its second element. The third element is a JSON object,
10-
containing possibly implementation specific information about the error (stack
11-
dump etc.).
6+
.. message:: [reply] error_* <specifier> <error-report>
127

13-
Example:
8+
Contains an error class from the list below as its second item (the
9+
specifier). The third item of the message is an :ref:`error-report`,
10+
containing the request message (minus line endings) as a string in its first
11+
element, a (short) human readable text as its second element. The third
12+
element is a JSON object, containing possibly implementation specific
13+
information about the error (stack dump etc.).
14+
15+
Examples:
1416

1517
.. code::
1618
1719
> read tx:target
1820
< error_read tx:target ["NoSuchModule","tx is not configured on this SEC node", {}]
21+
1922
> change ts:target 12
2023
< error_change ts:target ["NoSuchParameter","ts has no parameter target", {}]
24+
2125
> change t:target -9
2226
< error_change t:target ["BadValue","requested value (-9) is outside limits (0..300)", {}]
27+
2328
> meas:volt?
2429
< error_meas:volt? ["ProtocolError","unknown action", {}]
2530

protocol/specification/messages/heartbeat.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
a space and should be short and not be re-used. It may be omitted. The reply
1010
will contain exactly the same id.
1111

12-
A SEC node replies with a `pong` message with a `data-report` of a null value.
12+
A SEC node replies with a `pong` message with a :ref:`data-report` of a null value.
1313
The :ref:`qualifiers` part SHOULD only contain the timestamp (as member "t") if
1414
the SEC node supports timestamping. This can be used to synchronize the time
1515
between ECS and SEC node.

protocol/specification/messages/optional.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ and should reply with a `ProtocolError` error to indicate this.
1717
command. This check goes beyond a simple validity check based on the
1818
accessible's datainfo and may depend on the current configuration of the
1919
entire SEC node. Upon successful completion of the check, a `checked`
20-
response is sent, containing a `data-report` of the verified value. The
21-
accessible property `checkable` indicates whether an accessible can be
20+
response is sent, containing a :ref:`data-report` of the verified value.
21+
The accessible property `checkable` indicates whether an accessible can be
2222
checked.
2323

2424
.. admonition:: Remarks

protocol/specification/messages/readwrite.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Example:
3232
value to be set. The value is JSON formatted. As soon as the set-value is read
3333
back from the hardware, all clients, having activated the parameter/module in
3434
question, get an "update" message. After all side-effects are communicated, a
35-
"changed" reply is then send, containing a `data-report` of the read-back value.
35+
"changed" reply is then send, containing a :ref:`data-report` of the read-back value.
3636

3737
.. admonition:: Remarks
3838

protocol/specification/messages/update.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[event] error_update <module>:<parameter> <error-report>
66

77
When activated, update messages are delivered without explicit request from the
8-
client. The value is a `data-report`, i.e. a JSON array with the value as its
8+
client. The value is a :ref:`data-report`, i.e. a JSON array with the value as its
99
first element, and an JSON object containing the :ref:`qualifiers` as its second
1010
element.
1111

0 commit comments

Comments
 (0)