Skip to content

Commit 8e64399

Browse files
authored
Merge pull request #91 from epics-containers/md
Final changes for the new copier template based workflow
2 parents 9818810 + 2ba33d0 commit 8e64399

File tree

7 files changed

+160
-271
lines changed

7 files changed

+160
-271
lines changed

docs/images/lakeshore_releases.png

171 KB
Loading

docs/index.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@ html_theme.sidebar_secondary.remove: true
66
:end-before: <!-- README only content
77
```
88

9+
Update for February 2024
10+
------------------------
11+
12+
The tutorials have now been updated. Recent changes include:
13+
14+
- epics-containers-cli has been renamed to edge-containers-cli. It now supports the deployment of general services as well as IOCs. It still has the entrypoint `ec` but the namespace `ioc` has been dropped and its functions are now in the root (e.g. `ec ioc deploy` is now `ec deploy`).
15+
- Improved CI for {any}`ec-services-repo`s and generic IOCs repos.
16+
- copier template based creation of new beamline, accelerator and generic IOC repos.
17+
- This provides greatly improved ability to adopt updates to the template into your own repositories.
18+
19+
All tutorials are now up to date with the latest workflow. The exception is tutorials for the RTEMS platform which are now in active development.
20+
21+
22+
923
Materials
1024
---------
1125
- [Oxfordshire EPICS Meeting Nov 2023](https://dlsltd-my.sharepoint.com/:p:/g/personal/giles_knap_diamond_ac_uk/Ee7SPC_39blEu4Pilgqul7IBiCi4GM9_cgMzONV2ALHIsw?e=U02gHd)

docs/reference/configuration.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ TODO: this needs completing - pull all configuration discussions into
77
one place. Most of these will come from the original Setting up the
88
Workspace document.
99

10+
| | |
11+
|---|---|
1012

1113
## Git Configuration
1214

15+
This setting replaces https URLS for github repositories with ssh URLs. This is useful for the ibek-support submodule in the ioc-XXX repositories because it uses an HTTPS URL so that it can be built anywhere. When you want to push changes it is more convenient to use ssh URLs.
1316
```
1417
[url "ssh://[email protected]/"]
1518
insteadOf = https://github.com/
1619
```
1720

21+
| | |
22+
|---|---|
23+
1824
## Vscode Settings
1925

2026
These settings can be edited using `Ctrl-Shift-P`: `Preferences: Open User Settings: (JSON)`
@@ -46,3 +52,5 @@ For a much richer command line experience, it is recommended to use the zsh shel
4652
"terminal.integrated.defaultProfile.linux": "zsh",
4753
```
4854

55+
| | |
56+
|---|---|

docs/tutorials.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ tutorials/ioc_changes1
1717
tutorials/ioc_changes2
1818
tutorials/generic_ioc
1919
tutorials/debug_generic_ioc
20-
tutorials/test_generic_ioc
2120
tutorials/support_module
2221
tutorials/setup_k8s
2322
tutorials/setup_k8s_new_beamline

docs/tutorials/generic_ioc.md

Lines changed: 125 additions & 88 deletions
Large diffs are not rendered by default.

docs/tutorials/support_module.md

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,23 @@
11
# Working with Support Modules
22

33
:::{Warning}
4-
This tutorial is out of date and will be updated soon.
4+
This tutorial is an early draft and is not yet complete.
55
:::
66

7-
TODO: this is currently a stub with some pointers.
8-
9-
TODO: suggest that we will make a new Stream Device that will be a
10-
simple echo server. Use this to step through the process of creating a
11-
new support module.
12-
137
This is a type 3. change from the list at {any}`ioc-change-types`.
148

15-
If you are starting a new support module then the preceding tutorials
16-
have covered all of the skills you will need.
17-
18-
To work on a new support module you will need a Generic IOC project to
19-
work inside. You could choose to create two new projects:
20-
21-
```{eval-rst}
22-
23-
:ioc-MyNewDeviceSupport:
9+
In the tutorial on {doc}`generic_ioc`, we created a new Generic IOC container image that wrapped the existing support module `lakeshore340`.
2410

25-
a Generic IOC container definition based on ioc-template
11+
If you wanted to create a completely new support module then you would use a very similar workflow to the above.
2612

27-
Once you have created the project(s), working on the support module will
28-
look very similar to the procedures set out here `debug_generic_ioc`
29-
```
13+
In brief, the steps are:
3014

31-
Once you have created the project(s), working on the support module will
32-
look very similar to the procedures set out here {any}`debug_generic_ioc`
15+
- Create a new Generic IOC project using the <https://github.com/epics-containers/ioc-template>
16+
- Create a new folder in /workspaces/YOUR_SUPPORT_MODULE_NAME
17+
- Link the new folder to the epics support folders:
18+
- ln -s /workspaces/YOUR_SUPPORT_MODULE_NAME /epics/support/YOUR_SUPPORT_MODULE_NAME
19+
- TODO the ibek command `ibek dev support YOUR_SUPPORT_MODULE_NAME` will do this in future
20+
- Now work on your support module and get it compiling
21+
- Then add `ibek-support` for the new module as per {doc}`generic_ioc`
22+
- create an example instance in the Generic IOC project to test your work
23+
- When ready, push your new support and new ioc-support projects.

docs/tutorials/test_generic_ioc.md

Lines changed: 0 additions & 160 deletions
This file was deleted.

0 commit comments

Comments
 (0)