Skip to content

Commit 3152015

Browse files
LowriJenkinsFreddieAkeroyd
LowriJenkins
and
FreddieAkeroyd
authored
Ticket7813 import common ioc macros (#840)
* Fix IOCs that don't import IOCNAME_01 * Added Common port config * moved port macro to common macro * Add common baudrate (defaults to 9600) * Update simple 9600 baudrates to point at common * slightly more complex boardrates (may want to revert for macro descriptions) * Add common macro for parity none * Replace parity none with common macro * Add stop 1 to common macros * replace stop bit 1 macros with common macro * add bits 8 to common macros * Replace bit macros with default 8 with common macro BITS8 * Update PARITYNONE.xml Change None -> none * Act on review requests --------- Co-authored-by: Freddie Akeroyd <[email protected]>
1 parent b64458b commit 3152015

File tree

99 files changed

+205
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+205
-232
lines changed

‎AEROFLEX/iocBoot/iocAEROFLEX-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Aeroflex Signal Generator</ioc_desc>
55
<ioc_details>Aeroflex 2023A/2030 IOC</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
<macro name="BUS_ADDR" pattern="^[0-9]+$" description="Bus address e.g. GPIB address" defaultValue="0" hasDefault="YES" />
99
<macro name="PL_IPADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP Address of prologix GPIB converter" hasDefault="NO" />
1010
<macro name="DEV_TYPE" pattern="^(2023A|2030)$" description="Type of Aeroflex" defaultValue="2023A" hasDefault="YES" />

‎AG3631A/iocBoot/iocAG3631A-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>Agilent E3631A triple output DC power supply</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
</macros>
88
</config_part>
99
</ioc_config>

‎ALDN1000/iocBoot/iocALDN1000-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Aladdin-1000 Syringe Pump</ioc_desc>
55
<ioc_details>Aladdin-1000 Syringe Pump</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎AMINT2L/iocBoot/iocAMINT2L-IOC-01/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<ioc_desc>Applied Measurements INT2-L pressure transducer</ioc_desc>
55
<ioc_details>SKF Choppers</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
8-
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600." defaultValue="9600" hasDefault="YES" />
9-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />
10-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." defaultValue="none" hasDefault="YES" />
11-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
8+
<xi:include href="../../../COMMON/BAUD9600.xml" />
9+
<xi:include href="../../../COMMON/BITS8.xml" />
10+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
11+
<xi:include href="../../../COMMON/STOP1.xml" />
1212

1313
<macro name="ADDR" pattern="^[0-9A-F][0-9A-F]$" description="Internal address of the unit." hasDefault="NO" />
1414

‎B17TMAG/iocBoot/iocB17TMAG-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Birmingham 17T Magnet</ioc_desc>
55
<ioc_details>These are template details</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎CATFLWR/iocBoot/iocCATFLWR-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>IOC for the catalytic flow reactor</ioc_desc>
55
<ioc_details>Catalytic Flow Reactor</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎CCD100/iocBoot/iocCCD100-IOC-01/config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<config_part>
44
<ioc_desc>Chell CCD 100 pressure transducer</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port (for mk2)" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
<macro name="IPADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP Address (for mk3)" hasDefault="NO" />
88
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 57600." defaultValue="57600" hasDefault="YES" />
9-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />
10-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." defaultValue="none" hasDefault="YES" />
11-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
9+
<xi:include href="../../../COMMON/BITS8.xml" />
10+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
11+
<xi:include href="../../../COMMON/STOP1.xml" />
1212
<macro name="ADDRESS" pattern="^[a-h]$" description="The address of the CCD100, defaults to a." defaultValue="a" hasDefault="YES" />
1313
<macro name="DEV_NAME" pattern="^\w{0,40}$" description="A user friendly name for the device, defaults to blank." defaultValue="" hasDefault="YES" />
1414

‎CHTOBISR/iocBoot/iocCHTOBISR-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Coherent OBIS Laser Remote</ioc_desc>
55
<ioc_details></ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎COMMON/BAUD9600.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<macro name="BAUD" pattern="300|600|1200|2400|4800|9600|19200|38400|57600|115200" description="Serial communication baud rate, defaults to 9600." defaultValue="9600" hasDefault="YES"/>

‎COMMON/BITS8.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<macro name="BITS" pattern="^[5-8]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />

‎COMMON/PARITYNONE.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity (Default: none)." defaultValue="none" hasDefault="YES" />

‎COMMON/PORT.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />

‎COMMON/STOP1.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<macro name="STOP" pattern="^[0-2]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />

‎CP2800/iocBoot/iocCP2800-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Cryomech CP2800 Helium Compressor</ioc_desc>
55
<ioc_details>These are template details</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO"/>
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎CRYOSMS/iocBoot/iocCRYOSMS-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>Cryogenic Ltd. SMS series PSU</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
<macro name="T_TO_A" pattern="^[0-9]+.?[0-9]*$" description="Tesla - Amp conversion rate" defaultValue="0.037" hasDefault="YES" />
88
<macro name="DISPLAY_UNIT" pattern="^GAUSS|TESLA|AMPS$" description="Unit in which to display values" defaultValue="GAUSS" hasDefault="YES" />
99
<macro name="WRITE_UNIT" pattern="^TESLA|AMPS$" description="Unit in which to write to the device" defaultValue="AMPS" hasDefault="YES" />

‎CRYVALVE/iocBoot/iocCRYVALVE-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>ISIS Iris cryogenics valve</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
</macros>
88
</config_part>
99
</ioc_config>

‎CYBAMAN/iocBoot/iocCYBAMAN-IOC-01/config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<config_part>
44
<ioc_desc>Cybaman manipulator</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 38400." defaultValue="38400" hasDefault="YES" />
8-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />
9-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." defaultValue="none" hasDefault="YES" />
10-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
8+
<xi:include href="../../../COMMON/BITS8.xml" />
9+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
10+
<xi:include href="../../../COMMON/STOP1.xml" />
1111
</macros>
1212
</config_part>
1313
</ioc_config>

‎DELFTBPMAG/iocBoot/iocDELFTBPMAG-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>DELFT Bipolar Magnet</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
</macros>
88
</config_part>
99
</ioc_config>

‎DFKPS/iocBoot/iocDFKPS-IOC-01/config.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
<config_part>
44
<ioc_desc>Danfysik power supply</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
<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" />
8-
<macro name="POLARITY" pattern="^(BIPOLAR|UNIPOLAR)$" description="Polarity type, BIPOLAR - polarity is stable; defaults to BIPOLAR" defaultValue="BIPOLAR" hasDefault="YES" />
9-
<macro name="USE_SLEW" pattern="^(0|1)$" description="1 to user slew, 0 otherwise; defaults to 0" defaultValue="0" hasDefault="YES" />
8+
<macro name="POLARITY" pattern="^(BIPOLAR|UNIPOLAR)$" description="Polarity type, BIPOLAR - polarity is stable; defaults to BIPOLAR" defaultValue="BIPOLAR" hasDefault="YES" />
9+
<macro name="USE_SLEW" pattern="^(0|1)$" description="1 to user slew, 0 otherwise; defaults to 0" defaultValue="0" hasDefault="YES" />
1010

1111
<macro name="CALIBRATED" pattern="^(0|1)$" description="1 to use calibration file, 0 otherwise; defaults to 1" defaultValue="1" hasDefault="YES" />
1212
<macro name="CALIB_FILE" pattern="^\w{0,40}\.?\w{0,10}$" description="Name of calibration File; defaults to default_calib.dat" defaultValue="default_calib.dat" hasDefault="YES" />
13-
<macro name="DEV_TYPE" pattern="^(9X00|8800|8500|8000)$" description="Type of danfysik; default 8000" defaultValue="8000" hasDefault="YES" />
13+
<macro name="DEV_TYPE" pattern="^(9X00|8800|8500|8000)$" description="Type of danfysik; default 8000" defaultValue="8000" hasDefault="YES" />
1414
<macro name="SP_AT_STARTUP" pattern="^(YES|NO)$" description="Apply last setpoints at startup; defaults to NO" defaultValue="NO" hasDefault="YES" />
1515

1616

17-
<macro name="FACTOR_READ_I" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting reading to current; defaults to 1" defaultValue="1" hasDefault="YES" />
18-
<macro name="FACTOR_READ_V" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting reading to voltage; defaults to 1" defaultValue="1" hasDefault="YES" />
19-
<macro name="FACTOR_WRITE_I" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting current to set value; defaults to 1000" defaultValue="1000" hasDefault="YES" />
17+
<macro name="FACTOR_READ_I" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting reading to current; defaults to 1" defaultValue="1" hasDefault="YES" />
18+
<macro name="FACTOR_READ_V" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting reading to voltage; defaults to 1" defaultValue="1" hasDefault="YES" />
19+
<macro name="FACTOR_WRITE_I" pattern="^-?[0-9]+\.?[0-9]*$" description="Factor to apply when converting current to set value; defaults to 1000" defaultValue="1000" hasDefault="YES" />
2020

21-
<macro name="MAX_RAW_SETPOINT" pattern="^[0-9]+$" description="Maximum raw setpoint to send to the power supply, in ppm. Defaults to 1000000 (100% of full scale)." defaultValue="1000000" hasDefault="YES" />
21+
<macro name="MAX_RAW_SETPOINT" pattern="^[0-9]+$" description="Maximum raw setpoint to send to the power supply, in ppm. Defaults to 1000000 (100% of full scale)." defaultValue="1000000" hasDefault="YES" />
2222

2323
<macro name="LOCAL_CALIB" pattern="^(yes)|(no)$" description="Use local instrument calibration directory instead of common one? Default is no." defaultValue="no" hasDefault="YES" />
2424
<macro name="ADDRESS" pattern="^[0-9]+$" description="Address of the PSU; defaults to 0." defaultValue="0" hasDefault="YES" />
2525

26-
<macro name="STAB_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of the setpoint, consider the field as stable" defaultValue="2" hasDefault="YES" />
27-
<macro name="OFF_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of 0, consider the field as off." defaultValue="0" hasDefault="YES" />
26+
<macro name="STAB_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of the setpoint, consider the field as stable" defaultValue="2" hasDefault="YES" />
27+
<macro name="OFF_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of 0, consider the field as off." defaultValue="0" hasDefault="YES" />
2828

2929
<macro name="DISABLE_AUTOONOFF" pattern="^(0|1)$" description="Disable being able to set automatic PSU on/off feature, 1 - disable, 0 - enable (Automatic on off feature setting is autosaved)" defaultValue="1" hasDefault="YES" />
3030

‎DG645/iocBoot/iocDG645-IOC-01/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<ioc_details></ioc_details>
66
<macros>
77
<macro name="INTERFACE" pattern="^(SERIAL|ETHERNET)$" description="Whether to use an ethernet or serial connection" defaultValue="SERIAL" hasDefault="YES" />
8-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
8+
<xi:include href="../../../COMMON/PORT.xml" />
99
<macro name="ADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of the device" hasDefault="NO" />
10-
<macro name="BAUD" pattern="^[0-9]+$" description="Port BAUD rate (default: 9600)" defaultValue="9600" hasDefault="YES" />
10+
<xi:include href="../../../COMMON/BAUD9600.xml" />
1111
</macros>
1212
<pvsets>
1313
</pvsets>

‎DH2000/iocBoot/iocDH2000-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>Ocean Optics DH-2000 BAL shutter control</ioc_desc>
55
<ioc_details>Shutter control for DH-2000 light source</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎DHP30330/iocBoot/iocDHP30330-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>Sorensen DHP 30-330 DC High Power Programmable Supply</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77
<macro name="DEFAULT_CURR_LIMIT" pattern="^-?[0-9]+\.?[0-9]*$" description="Default current limit." hasDefault="YES" defaultValue="0" />
88
<macro name="DEFAULT_VOLT_LIMIT" pattern="^-?[0-9]+\.?[0-9]*$" description="Default voltage limit." hasDefault="YES" defaultValue="0" />
99
<macro name="DEFAULT_POW_LIMIT" pattern="^-?[0-9]+\.?[0-9]*$" description="Default power limit." hasDefault="YES" defaultValue="0" />

‎DMA4500M/iocBoot/iocDMA4500M-IOC-01/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<ioc_desc>AntonPaar DMA4500 Density Meter</ioc_desc>
55
<ioc_details>DMA4500 Density Meter</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO" />
8-
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600." defaultValue="9600" hasDefault="YES" />
9-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />
10-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." defaultValue="none" hasDefault="YES" />
11-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
7+
<xi:include href="../../../COMMON/PORT.xml" />
8+
<xi:include href="../../../COMMON/BAUD9600.xml" />
9+
<xi:include href="../../../COMMON/BITS8.xml" />
10+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
11+
<xi:include href="../../../COMMON/STOP1.xml" />
1212
</macros>
1313
<pvsets>
1414
</pvsets>

‎EDTIC/iocBoot/iocEDTIC-IOC-01/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<config_part>
44
<ioc_desc>Edwards Turbo Instrument Controller (TIC)</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
7-
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600." hasDefault="YES" defaultValue="9600"/>
8-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." hasDefault="YES" defaultValue="8"/>
9-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." hasDefault="YES" defaultValue="none"/>
10-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." hasDefault="YES" defaultValue="1"/>
6+
<xi:include href="../../../COMMON/PORT.xml" />
7+
<xi:include href="../../../COMMON/BAUD9600.xml" />
8+
<xi:include href="../../../COMMON/BITS8.xml" />
9+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
10+
<xi:include href="../../../COMMON/STOP1.xml" />
1111
<macro name="USEGAUGE1" pattern="^(YES|NO)$" description="YES if gauge 1 is in use, defaults to NO" hasDefault="YES" defaultValue="NO"/>
1212
<macro name="USEGAUGE2" pattern="^(YES|NO)$" description="YES if gauge 2 is in use, defaults to NO" hasDefault="YES" defaultValue="NO"/>
1313
<macro name="USEGAUGE3" pattern="^(YES|NO)$" description="YES if gauge 3 is in use, defaults to NO" hasDefault="YES" defaultValue="NO"/>

‎EUROTHRM/iocBoot/iocEUROTHRM-IOC-01/config.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<config_part>
44
<ioc_desc>Eurotherm PID controller</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
7-
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600." defaultValue="9600" hasDefault="YES" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
7+
<xi:include href="../../../COMMON/BAUD9600.xml" />
88
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 7." defaultValue="7" hasDefault="YES" />
99
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to even." defaultValue="even" hasDefault="YES" />
10-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
10+
<xi:include href="../../../COMMON/STOP1.xml" />
1111
<macro name="COMMS_MODE" pattern="^(eibisynch)|(modbus)$" description="Comms mode, eibisynch or modbus. Defaults to eibisynch." defaultValue="eibisynch" hasDefault="YES" />
1212

1313
<macro name="ADDR_1" pattern="^[0-9]{1,2}$" description="Address for the 1st Eurotherm on this port e.g. 01. Blank for do not use." hasDefault="NO" />

‎FERMCHOP/iocBoot/iocFERMCHOP-IOC-01/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<config_part>
44
<ioc_desc>FZJ Fermi chopper</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
7-
<macro name="BAUD" pattern="^[0-9]+$" description="Serial communication baud rate, defaults to 9600." defaultValue="9600" hasDefault="YES" />
8-
<macro name="BITS" pattern="^[0-9]$" description="Serial communication number of bits, defaults to 8." defaultValue="8" hasDefault="YES" />
9-
<macro name="PARITY" pattern="^(even)|(odd)|(none)$" description="Serial communication parity, defaults to none." defaultValue="none" hasDefault="YES" />
10-
<macro name="STOP" pattern="^[0-9]$" description="Serial communication stop bit, defaults to 1." defaultValue="1" hasDefault="YES" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
7+
<xi:include href="../../../COMMON/BAUD9600.xml" />
8+
<xi:include href="../../../COMMON/BITS8.xml" />
9+
<xi:include href="../../../COMMON/PARITYNONE.xml" />
10+
<xi:include href="../../../COMMON/STOP1.xml" />
1111
<macro name="INST" pattern="^(merlin)|(maps)$" description="Instrument (affects communication protocol). Defaults to merlin." defaultValue="merlin" hasDefault="YES" />
1212
<macro name="MHZ" pattern="^[0-9]*\.?[0-9]*$" description="Chopper crystal frequency in MHz. Should be 50.4 on merlin and 18.0 on maps. Defaults to 50.4." defaultValue="50.4" hasDefault="YES" />
1313
</macros>

‎FLIPPRPS/iocBoot/iocFLIPPRPS-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ioc_desc>ISIS CRISP Flipper system</ioc_desc>
55
<ioc_details>An IOC for the Flipper used in CRISP</ioc_details>
66
<macros>
7-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" hasDefault="NO"/>
7+
<xi:include href="../../../COMMON/PORT.xml" />
88
</macros>
99
<pvsets>
1010
</pvsets>

‎GAMRY/iocBoot/iocGAMRY-IOC-01/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<config_part>
44
<ioc_desc>ISIS Gamry trigger device.</ioc_desc>
55
<macros>
6-
<macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
6+
<xi:include href="../../../COMMON/PORT.xml" />
77

88
</macros>
99
</config_part>

0 commit comments

Comments
 (0)