Skip to content

Ticket8445 move defaults to config#956

Open
LowriJenkins wants to merge 2 commits intomasterfrom
Ticket8445_move_defaults_to_config
Open

Ticket8445 move defaults to config#956
LowriJenkins wants to merge 2 commits intomasterfrom
Ticket8445_move_defaults_to_config

Conversation

@LowriJenkins
Copy link
Copy Markdown
Contributor

Description of work

Make sure defaults in config.xml match the actually used defaults in st.cmd to ensure that this issue doesn't break existing device defaults

To test

ISISComputingGroup/IBEX#8445

<macro name="DAQ_AI_PORT_NAME" pattern="^[a-zA-Z0-9_-]+$" description="Port name for AI DAQ Port. Defaults to cDAQ9185-MUONFEMod3" defaultValue="cDAQ9185-MUONFEMod3" hasDefault="YES" />
<macro name="DAQ_AO_PORT_NAME" pattern="^[a-zA-Z0-9_-]+$" description="Port name for AO DAQ Port. Defaults to cDAQ9185-MUONFEMod4" defaultValue="cDAQ9185-MUONFEMod4" hasDefault="YES" />
<macro name="FREQ" pattern="^[0-9]+$" description="Sample acquisition frequency. Defaults to 100" defaultValue="100" hasDefault="YES" />
<macro name="FREQ" pattern="^[0-9]+$" description="Sample acquisition frequency. Defaults to 100" defaultValue="1000" hasDefault="YES" />
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<macro name="FREQ" pattern="^[0-9]+$" description="Sample acquisition frequency. Defaults to 100" defaultValue="1000" hasDefault="YES" />
<macro name="FREQ" pattern="^[0-9]+$" description="Sample acquisition frequency. Defaults to 1000" defaultValue="1000" hasDefault="YES" />

<ioc_desc>NIMA Trough</ioc_desc>
<macros>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 2)" defaultValue="2" hasDefault="YES" />
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 2)" defaultValue="10" hasDefault="YES" />
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 2)" defaultValue="10" hasDefault="YES" />
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 10)" defaultValue="10" hasDefault="YES" />

<ioc_desc>ISIS IBEX Muon Jaws (via LVDCOM)</ioc_desc>
<macros>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="1"/>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="2"/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="2"/>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 2)" hasDefault="YES" defaultValue="2"/>

<xi:include href="../../../COMMON/BAUD9600.xml" />
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 7." defaultValue="7" hasDefault="YES" />
<macro name="PARITY" pattern="^(odd)|(even)|(none)$" description="Serial communication parity, defaults to odd." defaultValue="odd" hasDefault="YES" />
<macro name="PARITY" pattern="^(odd)|(even)|(none)$" description="Serial communication parity, defaults to odd." defaultValue="even" hasDefault="YES" />
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<macro name="PARITY" pattern="^(odd)|(even)|(none)$" description="Serial communication parity, defaults to odd." defaultValue="even" hasDefault="YES" />
<macro name="PARITY" pattern="^(odd)|(even)|(none)$" description="Serial communication parity, defaults to even." defaultValue="even" hasDefault="YES" />

<ioc_desc>ISIS Ferro Magnetic Resonance (via LVDCOM)</ioc_desc>
<macros>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="1"/>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="2"/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 1)" hasDefault="YES" defaultValue="2"/>
<macro name="LVDCOM_OPTIONS" pattern="^\d?\d?$" description="Options that define how the VI is started. Add selected options together to make the final value. 1 - warn if idle, 2 - start if idle, 4 - stop VIs if started on exit, 8 - stop VI on exit. (Default 2)" hasDefault="YES" defaultValue="2"/>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants