Skip to content

Commit 94d2e66

Browse files
committed
Docs tweaks
1 parent faadf6c commit 94d2e66

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

docs/explanations/why-use-pythonIoc.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ allows you to write this as:
3838
# Leave the IOC running with an interactive shell.
3939
softioc.interactive_ioc(globals())
4040
41+
4142
Dynamically created PVs
4243
-----------------------
4344

@@ -76,13 +77,10 @@ this as:
7677
# Leave the IOC running with an interactive shell.
7778
softioc.interactive_ioc(globals())
7879
79-
ADD THE PANDA USE CASE HERE
8080
8181
Existing Python Support
8282
-----------------------
8383

8484
It may be that you have specific device support written in Python that you wish
8585
to expose as PVs. This could be either in the form of a device support library
8686
or using a Python library to calculate PV values as above.
87-
88-
ADD THE FURKA/GRIMSEL MONITORING IOC USE CASE HERE

docs/how-to/use-asyncio-in-an-ioc.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ an IOC.
1212
.. literalinclude:: ../examples/example_asyncio_ioc.py
1313

1414

15-
The ``dispatcher`` is created and passed to :func:`~softioc.softioc.iocInit`. This is what
15+
The ``dispatcher`` is created and passed to :func:`~softioc.softioc.iocInit`. This is what
1616
allows the use of `asyncio` functions in this IOC. It contains a new event loop to handle
1717
this.
1818

@@ -21,13 +21,14 @@ sleeping that coroutine between updates.
2121
Note that we run this coroutine in the ``loop`` of the ``dispatcher``, and not in the
2222
main event loop.
2323

24-
This IOC will, like the one in `../tutorials/creating-an-ioc`, leave an interactive
25-
shell open. The values of the PVs can be queried using the methods defined in the
24+
This IOC will, like the one in `../tutorials/creating-an-ioc`, leave an interactive
25+
shell open. The values of the PVs can be queried using the methods defined in the
2626
`softioc.softioc` module.
2727

2828

2929
Asynchronous Channel Access
3030
---------------------------
3131

32-
PVs can be retrieved externally from a PV in an asynchronous manner by using the :py`aioca` module.
33-
It provides ``await``-able implementations of ``caget``, ``caput``, etc. See that module for more information.
32+
PVs can be retrieved externally from a PV in an asynchronous manner by using the
33+
`aioca` module. It provides ``await``-able implementations of ``caget``,
34+
``caput``, etc. See that module for more information.

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How the documentation is structured
55
-----------------------------------
66

77
Documentation is split into four categories, accessible from links below or in
8-
the side-bar. Use the links below or in the side-bar.
8+
the side-bar.
99

1010
.. rst-class:: columns
1111

docs/tutorials/creating-an-ioc.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Creating an IOC
44
Introduction
55
------------
66

7-
Once the module has been installed (see `installation`) we can create a
8-
simple EPICS Input/Output Controller (IOC).
7+
Once the module has been installed (see `installation`) we can create a
8+
simple EPICS Input/Output Controller (IOC).
99

1010
An EPICS IOC created with the help of ``pythonIoc`` and `softioc` is
1111
referred to as a "Python soft IOC". The code below illustrates a simple IOC
@@ -19,30 +19,30 @@ Each section is explained in detail below:
1919
:start-after: # Import
2020
:end-before: # Set
2121

22-
The `softioc` library is part of ``pythonIoc``. The two submodules
23-
`softioc.softioc` and `softioc.builder` provide the basic
22+
The `softioc` library is part of ``pythonIoc``. The two submodules
23+
`softioc.softioc` and `softioc.builder` provide the basic
2424
functionality for Python soft IOCs and are the ones that are normally used.
2525

2626
`cothread` is one of the two possible libraries the IOC can use for
27-
asynchronous operations.
27+
asynchronous operations.
2828
(see `../how-to/use-asyncio-in-an-ioc` for the alternative)
2929

3030

3131

3232
.. literalinclude:: ../examples/example_cothread_ioc.py
33-
:start-after: # Create
33+
:start-after: # Create
3434
:end-before: # Boilerplate
3535

3636
PVs are normally created dynamically using `softioc.builder`. All PV
37-
creation must be done before initialising the IOC. We define a lambda function for
38-
`on_update` on ``ao`` such that whenever we set ``ao``, ``ai`` will be set to the
39-
same value. The ``always_update`` flag ensures that the ``on_update`` function is always
37+
creation must be done before initialising the IOC. We define a lambda function for
38+
`on_update` on ``ao`` such that whenever we set ``ao``, ``ai`` will be set to the
39+
same value. The ``always_update`` flag ensures that the ``on_update`` function is always
4040
triggered, which is not the default behaviour if the updated value is the same as the
4141
current value.
4242

4343

4444
.. literalinclude:: ../examples/example_cothread_ioc.py
45-
:start-after: # Boilerplate
45+
:start-after: # Boilerplate
4646
:end-before: # Start
4747

4848

@@ -52,14 +52,14 @@ which must be called in this order. After calling
5252
:func:`~softioc.builder.LoadDatabase` it is no longer possible to create PVs.
5353

5454
.. literalinclude:: ../examples/example_cothread_ioc.py
55-
:start-after: # Start
55+
:start-after: # Start
5656
:end-before: # Finally
5757

5858
We define a long-running operation that will increment the value of ``ai`` once per
59-
second. This is run as a background thread by `cothread`.
59+
second. This is run in the background by `cothread`.
6060

6161
.. literalinclude:: ../examples/example_cothread_ioc.py
62-
:start-after: # Finally
62+
:start-after: # Finally
6363

6464
Finally the application must refrain from exiting until the IOC is no longer
6565
needed. The :func:`~softioc.softioc.interactive_ioc` runs a Python
@@ -69,7 +69,7 @@ internals of the IOC while it's running. The alternative is to call something
6969
like :func:`cothread.WaitForQuit` or some other `cothread` blocking
7070
action.
7171

72-
In this interpreter there is immediate access to methods defined in the
72+
In this interpreter there is immediate access to methods defined in the
7373
`softioc.softioc` module. For example the :func:`~softioc.softioc.dbgf` function
7474
can be run to observe the increasing value of ``AI``::
7575

@@ -79,15 +79,15 @@ can be run to observe the increasing value of ``AI``::
7979
DBF_DOUBLE: 37
8080

8181
And the :func:`~softioc.softioc.dbpf` method allows data to be set and to observe
82-
the functionality of the lambda passed to ``on_update`` . We set the value on ``AO``
82+
the functionality of the lambda passed to ``on_update`` . We set the value on ``AO``
8383
and read the value on ``AI`` (exact values will vary based on time taken)::
8484

8585
>>> dbgf("MY-DEVICE-PREFIX:AI")
8686
DBF_DOUBLE: 15
8787
>>> dbpf("MY-DEVICE-PREFIX:AO","999")
88-
DBF_DOUBLE: 999
88+
DBF_DOUBLE: 999
8989
>>> dbgf("MY-DEVICE-PREFIX:AI")
90-
DBF_DOUBLE: 1010
90+
DBF_DOUBLE: 1010
9191

9292

9393
Creating PVs

0 commit comments

Comments
 (0)