From 34a7367e1d82a497a9082135c15897afa216e4d6 Mon Sep 17 00:00:00 2001 From: LowriJenkins <40766142+LowriJenkins@users.noreply.github.com> Date: Thu, 2 Oct 2025 08:31:35 +0100 Subject: [PATCH 1/2] add explanation of default handling to ICP Config --- doc/iocs/tools/icpconfig.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/iocs/tools/icpconfig.md b/doc/iocs/tools/icpconfig.md index b45cbda16..e407d7b60 100644 --- a/doc/iocs/tools/icpconfig.md +++ b/doc/iocs/tools/icpconfig.md @@ -1,10 +1,11 @@ # ICP Config ICP config is a set of C functions that are called by every IOC on startup to define the macros used within the IOC. The code for this is [here](https://github.com/ISISComputingGroup/EPICS-icpconfig). Macros can come from the following: +* Default macro values defined in the ioc's config.xml * The current configuration * `\Instrument\Settings\globals.txt` - See [here](../testing/Running-IOCs) * `\Instrument\var\tmp\test_macros.txt` - A file create by the IOC_test_framework to create macros for testing. Only used if the environment variables `TESTDEVSIM=yes` or `TESTRECSIM=yes`. -Macros are loaded in the order above, such that `globals.txt` will override macros in the configuration and test macros will override all others. See diagram below for an idea of how this works. +Macros are loaded in the order above, such that default values are overwridden if any other source is presented, `globals.txt` will override macros in the configuration and test macros will override all others. See diagram below for an idea of how this works. -![](loading_macros.png) \ No newline at end of file +![](loading_macros.png) From 7d6525eafbc465ead1ce45ebd17bb0e366d29510 Mon Sep 17 00:00:00 2001 From: LowriJenkins <40766142+LowriJenkins@users.noreply.github.com> Date: Thu, 2 Oct 2025 13:59:08 +0100 Subject: [PATCH 2/2] Fix sphinx --- doc/iocs/tools/icpconfig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/iocs/tools/icpconfig.md b/doc/iocs/tools/icpconfig.md index e407d7b60..af26772e2 100644 --- a/doc/iocs/tools/icpconfig.md +++ b/doc/iocs/tools/icpconfig.md @@ -6,6 +6,6 @@ ICP config is a set of C functions that are called by every IOC on startup to de * `\Instrument\Settings\globals.txt` - See [here](../testing/Running-IOCs) * `\Instrument\var\tmp\test_macros.txt` - A file create by the IOC_test_framework to create macros for testing. Only used if the environment variables `TESTDEVSIM=yes` or `TESTRECSIM=yes`. -Macros are loaded in the order above, such that default values are overwridden if any other source is presented, `globals.txt` will override macros in the configuration and test macros will override all others. See diagram below for an idea of how this works. +Macros are loaded in the order above, such that default values are overwritten if any other source is presented, `globals.txt` will override macros in the configuration and test macros will override all others. See diagram below for an idea of how this works. ![](loading_macros.png)