Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
-XX:ErrorFile=C:\Instrument\Scratch\CrashDumps\ibex_client_%p.log
-Dlog4j2.formatMsgNoLookups=true
-Djdk.util.zip.disableZip64ExtraFieldValidation=true
"-DEPICS_PVA_ADDR_LIST=127.0.0.1 130.246.51.255"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this intended to be committed on this PR/is it an artifact of a branch that is yet to be rebased?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually sorry im being stupid - it's PVA support isn't it? how do we set EPICS_CA_ADDR_LIST though normally?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is PVA support.

We set epics CA address lists via a .properties file, but as far as I could tell no such properties exist for PVA and env/system variables were the only way to configure this for PVA.

I also found the PVA support in CS-Studio a bit flaky especially on reconnection - would be curious if you find the same. If so it's probably something we need to look into...

-DEPICS_PVA_AUTO_ADDR_LIST=NO
-DEPICS_PVA_CONN_TMO=5
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
Expand Down Expand Up @@ -62,6 +65,7 @@
<plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.activemq" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.alarm" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.alerts" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.banner" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.beamstatus" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.configserver" autoStart="false" startLevel="0" />
Expand Down Expand Up @@ -93,6 +97,7 @@
<plugin id="uk.ac.stfc.isis.ibex.targets" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.alarm" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.alerts" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.banner" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.beamstatus" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.blocks" autoStart="false" startLevel="0" />
Expand All @@ -119,8 +124,6 @@
<plugin id="uk.ac.stfc.isis.ibex.ui.weblinks" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.widgets" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.validators" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.alerts" autoStart="false" startLevel="0" />
<plugin id="uk.ac.stfc.isis.ibex.ui.alerts" autoStart="false" startLevel="0" />
<property name="osgi.splashPath" value="platform:/base/plugins/uk.ac.stfc.isis.ibex.e4.product" />
</configurations>

Expand Down
4 changes: 3 additions & 1 deletion base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ Require-Bundle: uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.e4.ui,
org.eclipse.equinox.registry,
org.apache.commons.commons-codec;bundle-version="1.15.0";visibility:=reexport,
joda-time;bundle-version="2.11.0";visibility:=reexport
joda-time;bundle-version="2.11.0";visibility:=reexport,
org.diirt.support.diirt-pva;bundle-version="3.1.8",
org.epics.pvaccess;bundle-version="5.1.2"
Export-Package: uk.ac.stfc.isis.ibex.epics.adapters,
uk.ac.stfc.isis.ibex.epics.conversion,
uk.ac.stfc.isis.ibex.epics.conversion.json,
Expand Down
Loading
Loading