Skip to content

Ticket8445 move defaults to config #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tom-Willemsen merged 7 commits into from
Apr 7, 2026
Merged

Ticket8445 move defaults to config #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e2fb54
Remove un-reachable default
LowriJenkins Apr 1, 2026
4ece190
Updated config defaults to match st.cmd defaults
LowriJenkins Apr 1, 2026
b876fc0
Update SEPRTR/iocBoot/iocSEPRTR-IOC-01/config.xml
Tom-Willemsen Apr 7, 2026
5b29af8
Update NIMATRO/iocBoot/iocNIMATRO-IOC-01/config.xml
Tom-Willemsen Apr 7, 2026
125583e
Update MUONJAWS/iocBoot/iocMUONJAWS-IOC-01/config.xml
Tom-Willemsen Apr 7, 2026
8530a6f
Update LKSH460/iocBoot/iocLKSH460-IOC-01/config.xml
Tom-Willemsen Apr 7, 2026
d5b42a1
Update FMR/iocBoot/iocFMR-IOC-01/config.xml
Tom-Willemsen Apr 7, 2026
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
2 changes: 1 addition & 1 deletion DFKPS/iocBoot/iocDFKPS-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ioc_desc>Danfysik power supply</ioc_desc>
<macros>
<xi:include href="../../../COMMON/PORT.xml" />
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600 for most Danfysiks, 115200 for the 9X00 versions" defaultValue="9600" hasDefault="YES" />
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600 for most Danfysiks, 115200 for the 9X00 versions" defaultValue="$(DEFAULT_BAUD)" hasDefault="YES" />
<macro name="POLARITY" pattern="^(BIPOLAR|UNIPOLAR)$" description="Polarity type, BIPOLAR - polarity is stable; defaults to BIPOLAR" defaultValue="BIPOLAR" hasDefault="YES" />
<macro name="USE_SLEW" pattern="^(0|1)$" description="1 to user slew, 0 otherwise; defaults to 0" defaultValue="0" hasDefault="YES" />

Expand Down
2 changes: 1 addition & 1 deletion ESP300/iocBoot/iocESP300-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<macros>
<macro name="COMPORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
<macro name="BAUD" pattern="^[0-9]+$" description="Serial COM Baud rate" hasDefault="YES" defaultValue="19200"/>
<macro name="POLL" pattern="^[0-9]+$" description="Controller polling rate (1Hz - 60Hz)" hasDefault="YES" defaultValue="10"/>
<macro name="POLL" pattern="^[0-9]+$" description="Controller polling rate (1Hz - 60Hz)" hasDefault="YES" defaultValue="5"/>
<macro name="MTRCTRL" pattern="^[0-9]+$" description="Motor controller xx number for MOTxxyy PV e.g. 01" hasDefault="NO"/>
</macros>
</config_part>
Expand Down
2 changes: 1 addition & 1 deletion FMR/iocBoot/iocFMR-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<config_part>
<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 2)" hasDefault="YES" defaultValue="2"/>
<macro name="LVDCOM_HOST" pattern="^.*$" description="Host on which the vi is running, blank for localhost (Default '')" hasDefault="YES" defaultValue=""/>
<macro name="PATH_TO_VI" pattern="^.*$" description="Full VI path including filename (Default '')" hasDefault="YES" defaultValue=""/>
<macro name="VNSTANDALONE" pattern="^.*$" description="Whether or not to control JUST the VNA or the VNA and other kit - YES or blank, default is blank" hasDefault="YES" defaultValue=""/>
Expand Down
6 changes: 3 additions & 3 deletions ILM200/iocBoot/iocILM200-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<xi:include href="../../../COMMON/PORT.xml" />
<macro name="ISOBUS" pattern="^[0-9]+$" description="ISOBUS address (default: 1)" defaultValue="1" hasDefault="YES" />
<macro name="USE_ISOBUS" pattern="^(Yes|No)$" description="Whether to use ISOBUS for communications (default: Yes)" defaultValue="Yes" hasDefault="YES" />
<macro name="CH1_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 1 (default: 0%)" defaultValue="0" hasDefault="YES" />
<macro name="CH2_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 2 (default: 0%)" defaultValue="0" hasDefault="YES" />
<macro name="CH3_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 3 (default: 0%)" defaultValue="0" hasDefault="YES" />
<macro name="CH1_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 1 (default: 0%)" defaultValue="0.0" hasDefault="YES" />
<macro name="CH2_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 2 (default: 0%)" defaultValue="0.0" hasDefault="YES" />
<macro name="CH3_ALARM_THRESHOLD" pattern="-?[0-9]+\.?[0-9]*$" description="Alarm threshold for level on channel 3 (default: 0%)" defaultValue="0.0" hasDefault="YES" />
</macros>
<pvsets>
</pvsets>
Expand Down
2 changes: 1 addition & 1 deletion LKSH460/iocBoot/iocLKSH460-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<xi:include href="../../../COMMON/PORT.xml" />
<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 even." defaultValue="even" hasDefault="YES" />
<xi:include href="../../../COMMON/STOP1.xml" />

</macros>
Expand Down
2 changes: 1 addition & 1 deletion MUONJAWS/iocBoot/iocMUONJAWS-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<config_part>
<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 2)" hasDefault="YES" defaultValue="2"/>
<macro name="LVDCOM_HOST" pattern="^.*$" description="Host on which the vi is running, blank for localhost (Default '')" hasDefault="YES" defaultValue=""/>
</macros>
</config_part>
Expand Down
2 changes: 1 addition & 1 deletion MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<macro name="TPAR_FILE" pattern="^.{0,40}$" description="TPAR file name in directory C:\\Instrument\\Settings. 40 Character maximum." hasDefault="NO" />
<macro name="BOOSTER_TPAR_FILE" pattern="^.{0,40}$" description="Booster heater TPAR file name in directory C:\\Instrument\\Settings. 40 Character maximum." hasDefault="YES" defaultValue="" />
<macro name="BOOSTER_TYPE" pattern="^.{0,40}$" description="Booster heater type (ex. CCR, OXF13)" hasDefault="YES" defaultValue="OXF13" />
<macro name="EDITOR_TPAR_FILE_DIR" pattern="^.{0,512}$" description="Directory where TPAR editor files are stored. 512 chars max" hasDefault="YES" defaultValue="C:\\Instrument\\Settings\\" />
<macro name="EDITOR_TPAR_FILE_DIR" pattern="^.{0,512}$" description="Directory where TPAR editor files are stored. 512 chars max" hasDefault="YES" defaultValue="C:/Instrument/Settings" />
</macros>
</config_part>
</ioc_config>
2 changes: 1 addition & 1 deletion NIMATRO/iocBoot/iocNIMATRO-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<config_part>
<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 10)" defaultValue="10" hasDefault="YES" />
<macro name="LVDCOM_HOST" pattern="^.*$" description="Host on which the vi is running, blank for localhost (Default '')" defaultValue="" hasDefault="YES" />
<macro name="LVDCOM_PROGID" pattern="^.*$" description="DCOM ProgID, required if connecting to a compiled LabVIEW application (Default '')" defaultValue="" hasDefault="YES" />
<macro name="AREA_HIGH_LIMIT" pattern="^-?[0-9]+\.?[0-9]*$" description="The high area limit of the Nima trough" defaultValue="247.0" hasDefault="YES" />
Expand Down
2 changes: 1 addition & 1 deletion SEPRTR/iocBoot/iocSEPRTR-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<macros>
<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 1000" defaultValue="1000" hasDefault="YES" />
<macro name="NELM" pattern="^[0-9]+$" description="Number of elements in sample data. Defaults to 100" defaultValue="100" hasDefault="YES" />
<macro name="POWER_MIN_VOLT" pattern="^[0-9]+$" description="Voltage value (in kV) to determine when the separator is off. Defaults to 2" defaultValue="2" hasDefault="YES" />
<macro name="VUPPERLIM" pattern="^[.0-9]+$" description="Voltage stability upper limit (kV). Defaults to 1" defaultValue="1" hasDefault="YES" />
Expand Down
2 changes: 1 addition & 1 deletion ZFMAGFLD/iocBoot/iocZFMAGFLD-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<macro name="OFFSETY" pattern="^-?[0-9]+\.?[0-9]*$" description="Y component of measured field offset" defaultValue="0" hasDefault="YES" />
<macro name="OFFSETZ" pattern="^-?[0-9]+\.?[0-9]*$" description="Z component of measured field offset" defaultValue="0" hasDefault="YES" />
<macro name="RANGE" pattern="^-?[0-9]+\.?[0-9]*$" description="Range of the magnetometer" defaultValue="1" hasDefault="YES" />
<macro name="SQNCR" pattern="^[:a-zA-Z0-9_-\. ]+$" description="PV in auto-feedback sequencer to process on new field values" defaultValue="$(PVPREFIX):ZFCNTRL_01:INPUTS_UPDATED.PROC" hasDefault="YES" />
<macro name="SQNCR" pattern="^[:a-zA-Z0-9_-\. ]+$" description="PV in auto-feedback sequencer to process on new field values" defaultValue="$(MYPVPREFIX)ZFCNTRL_01:INPUTS_UPDATED.PROC CA" hasDefault="YES" />

<macro name="MATRIX_1_1" pattern="^-?[0-9]+\.?[0-9]*$" description="Element (1,1) of the fixed sensor matrix" defaultValue="0" hasDefault="YES" />
<macro name="MATRIX_1_2" pattern="^-?[0-9]+\.?[0-9]*$" description="Element (1,2) of the fixed sensor matrix" defaultValue="0" hasDefault="YES" />
Expand Down
2 changes: 1 addition & 1 deletion ZFMAGFLD/iocBoot/iocZFMAGFLD-IOC-01/st-daq.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ $(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQ)/$(X_DAQ_CHANNEL=ai0)", 0, "AI","MONSTE
$(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQ)/$(Y_DAQ_CHANNEL=ai1)", 1, "AI","MONSTER TerminalDiff N=$(DAQ_SAMPLES=1) F=1000") # Y (vertical transverse - perpendicular to the floor)
$(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQ)/$(Z_DAQ_CHANNEL=ai2)", 2, "AI","MONSTER TerminalDiff N=$(DAQ_SAMPLES=1) F=1000") # Z (along the beam, in the direction of the beam)

$(IFNOTRECSIM) $(IFHAS_EXTRA_DAQ_CHANNEL) DAQmxConfig("R0", "$(CDAQ)/$(EXTRA_DAQ_CHANNEL=ai3)", 3, "AI","MONSTER TerminalDiff N=$(DAQ_SAMPLES=1) F=1000")
$(IFNOTRECSIM) $(IFHAS_EXTRA_DAQ_CHANNEL) DAQmxConfig("R0", "$(CDAQ)/$(EXTRA_DAQ_CHANNEL)", 3, "AI","MONSTER TerminalDiff N=$(DAQ_SAMPLES=1) F=1000")