Skip to content

Commit 01aaf31

Browse files
authored
Merge pull request #54 from marcelldls/marcell-patch
Documentation suggestions
2 parents e874778 + 195425d commit 01aaf31

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

docs/user/tutorials/create_beamline.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Steps
7979
If you are using an alternative to GitHub for your repositories then
8080
see `these instructions`_ for an alternative approach.
8181

82-
.. _these instructions: https://github.com/epics-containers/blxxi-template#how-to-copy-this-template-project
82+
.. _these instructions: https://github.com/epics-containers/blxxi-template#how-to-copy-this-template-project
8383

8484
#. Clone the template repo locally (substituting in your own GitHub Account).
8585

docs/user/tutorials/create_ioc.rst

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ This folder needs to contain these two items:
3030
can take a number of forms
3131
`listed here <https://github.com/epics-containers/ibek/blob/ea9da7e1cfe88f2a300ad236f820221837dd9dcf/src/ibek/templates/ioc/config/start.sh>`_.
3232

33+
values.yaml
34+
~~~~~~~~~~~~~~~~~~~~~~~
35+
3336
We will start by creating the values.yaml file:
3437

3538
.. code-block:: bash
3639
3740
cd bl01t
3841
mkdir iocs/bl01t-ea-ioc-02
39-
code values.yaml
42+
code iocs/bl01t-ea-ioc-02/values.yaml
4043
4144
This should launch vscode and open the values.yaml file. Add the following:
4245

@@ -80,8 +83,8 @@ To recap, we have two python CLI tools for supporting ``epics-containers``:
8083
above. So now we will provide some *IOC yaml* files to ``ibek`` so that it
8184
will generate startup assets for our IOC Instance.
8285

83-
Make an *IOC yaml* File
84-
-------------------------
86+
config
87+
~~~~~~~~~~~~~~~~~~~~~~~
8588

8689
*IOC yaml* files are a sequence of ``entities``. Each entity is an instance of
8790
a ``definition`` declared in the *Support yaml* that one of the support
@@ -170,14 +173,21 @@ baked into the container:
170173
# simDetectorConfig(portName, maxSizeX, maxSizeY, dataType, maxBuffers, maxMemory)
171174
simDetectorConfig("{{PORT}}", {{WIDTH}}, {{HEIGHT}}, {{DATATYPE}}, {{BUFFERS}}, {{MEMORY}})
172175
173-
You can see that this lists a a number of arguments that it expects. It then
176+
You can see that this lists a number of arguments that it expects. It then
174177
declares how these will be used to substitute values into the simDetector
175178
database template. Finally it declares some lines to go into the startup script
176179
(before iocInit).
177180

178181
Therefore, we can create an *IOC yaml* file that instantiates a simulation
179182
detector as follows:
180183

184+
.. code-block:: bash
185+
186+
mkdir iocs/bl01t-ea-ioc-02/config
187+
code iocs/bl01t-ea-ioc-02/config/ioc.yaml
188+
189+
This should launch vscode and open the ioc.yaml file. Add the following:
190+
181191
.. code:: yaml
182192
183193
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2023.10.7/ibek.ioc.schema.json
@@ -227,7 +237,7 @@ detector over a PVAccess channel called ``BL01T-EA-TST-02:PVA:OUTPUT``. The
227237
a dependency of ADSimDetector and so is included in the Generic IOC container.
228238

229239
Try putting the two snippets of *IOC yaml* together and saving it as
230-
``ioc.yaml`` in the ``iocs/bl01t-ea-ioc-02`` folder.
240+
``ioc.yaml`` in the ``iocs/bl01t-ea-ioc-02/config`` folder.
231241

232242
You have now defined your first IOC instance.
233243

@@ -388,4 +398,4 @@ changes in the startup script and substitution file and re-deploy the IOC.
388398

389399
For example try this command:
390400

391-
- ec -v ioc deploy-local iocs/bl01t-ea-ioc-02
401+
- ec -v ioc deploy-local iocs/bl01t-ea-ioc-02

docs/user/tutorials/dev_container.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ is mounted into the container as a volume. It is mounted under
177177
from your local machine and the changes will be visible inside the container and
178178
outside the container. This is a good thing as you should consider the container
179179
filesystem to be a temporary filesystem that will be destroyed when the container
180-
deleted.
180+
is deleted.
181181

182182
Now that you are *inside* the container you have access to the tools built into
183183
it, this includes ``ibek``. The first command you should run is:
@@ -303,4 +303,4 @@ we are able to test changes without having to go through a container build
303303
cycle.
304304

305305
In the following tutorials we will look at how to make changes at each of the
306-
3 levels listed in `ioc_change_types`.
306+
3 levels listed in `ioc_change_types`.

0 commit comments

Comments
 (0)