Douglas Clowes
35674d8fb0
Create fake devices in terminal tabs for Taipan testing
2014-05-08 14:44:24 +10:00
Douglas Clowes
416c609b9c
Change gumxml to remove (some) prohibited characters from XML
2014-05-08 08:54:08 +10:00
Douglas Clowes
4820912bdc
Legacy_fsm cut/paste typo
2014-05-06 17:20:43 +10:00
Ferdi Franceschini
3571578531
Only check write-timeouts when we have something to write.
2014-05-05 14:10:16 +10:00
Ferdi Franceschini
d7acb7c16c
Load drivers which have been enabled in the SICS config ini files.
...
Lakeshore 336 drivers with known IP addresses have been added to the ini files with unique IDs.
All entries in the ini files now have unique IDs
The wombat ini now has radio buttons to select sample stage motor configurations.
2014-05-05 12:25:00 +10:00
Douglas Clowes
a52835379d
Changes to sct files
2014-05-01 10:54:09 +10:00
Douglas Clowes
bf84f65e5a
Changes to generated driver logging
2014-05-01 10:54:09 +10:00
Douglas Clowes
46599051d9
Add find_sicsdev and find_myobject functions
2014-05-01 10:54:09 +10:00
Douglas Clowes
93276478f5
Push the server and option code down to reduce dependency loops
2014-05-01 10:54:09 +10:00
Douglas Clowes
a557cf577a
Implement 'sicslog' command for driver logging
2014-05-01 10:54:09 +10:00
Douglas Clowes
0e0fd86da0
Replace {Log,Kill}Capture with a more generic hook.
2014-05-01 10:54:09 +10:00
Douglas Clowes
7e6b5a3a9f
Fix the Pfeiffer/mercury driver
2014-05-01 10:54:09 +10:00
Douglas Clowes
29bee0a057
Change fake pfeiffer to CRLF terminator
2014-05-01 10:54:09 +10:00
Douglas Clowes
fd23ee2443
TCL mode, async{queue,protocol}, and reset line number
...
The TCL mode allows a begin/end construct and TCL code without the
leading '@' characters.
Add the function name to the hook code comments that are generated.
Reset the line counter to 1 between driver modules for error reporting.
2014-05-01 10:54:09 +10:00
Ferdi Franceschini
be653c91fe
Make instrument specific Oxford configs consistent for Quokka and Taipan.
2014-05-01 09:18:55 +10:00
Ferdi Franceschini
6af68dcb46
Add radio buttons to wombat sics_config.ini for sample stage motor configurations.
2014-05-01 09:03:25 +10:00
Ferdi Franceschini
7039a3726c
Don't automatically install the oxford magnet driver when the config is
...
loaded.
2014-04-30 16:21:38 +10:00
Ferdi Franceschini
5f4c586002
Use the right IP address for PLC status.
2014-04-30 16:21:13 +10:00
Ferdi Franceschini
1c75c336de
Load the Oxford 12T driver code for Echidna.
2014-04-29 15:29:05 +10:00
Ferdi Franceschini
d0c9f39464
Update the SIS IP address for the plc status driver on Echidna.
2014-04-29 15:29:05 +10:00
Ferdi Franceschini
85dc69ed70
Load Oxford 12T magnet driver if it is enabled in the sics_config.ini file.
2014-04-29 15:29:04 +10:00
Ferdi Franceschini
4bd3200c99
SICS-729: The idle CPU usage has been reduced from 20% to <2%.
...
The select timeout has been set to 10ms and we only check if a socket is writeable when SICS has a message to send.
The performance command in SICS now shows a value of about 100 instead of 1000.
2014-04-29 15:29:03 +10:00
Ferdi Franceschini
19f6c8541c
SICS-128: Added a reactor status protocol handler called OPALSTAT for the asyncqueue.
...
OPALSTAT uses HTTP/1.1 and sets the UserAgent to SICS to avoid re-directs. It also sends
the SICS version and revision numbers in the UserAgent string.
2014-04-29 15:29:03 +10:00
Douglas Clowes
29583c51c0
Add a NULL aqadapter for use by script context pseudo devices
...
This allows the creation of a script context device without the need for
a physical device to exist. This pseudo device could derive its values
from other things and apply control to other things.
Writes to, this device are not expected and are logged. Reads from this
device are not expected and are logged and return an "ASCERR: " response.
2014-04-23 16:51:05 +10:00
Douglas Clowes
8306d8587f
Move the view table/creation to after data collection.
...
It takes longer to create table than a view but the view is slower in use than is a table.
make this move in preparation to having an option to create either a view or a table for this information.
2014-04-23 16:50:57 +10:00
Douglas Clowes
a43ca1cf94
writetree - sorted items and continue on error for more resiliency
2014-04-23 16:27:43 +10:00
Douglas Clowes
ad50eaca6a
Regenerate all of the generated driver code
2014-04-17 13:45:35 +10:00
Douglas Clowes
6bca9566e3
Fix Double underscore bug in generated code
...
061f19a52e3c40e30add262db95cea57655b893b introduced an extra underscore
in the make_path function for un-named groups.
2014-04-17 13:43:57 +10:00
Douglas Clowes
da2fd6bbbb
Make a fake Pfeiffer device for testing the script context driver
...
This driver controls the needle valve on the Oxford Mercury
2014-04-17 13:16:56 +10:00
Douglas Clowes
acf2112fc2
Make a fake Oxford Mercury device for testing the script context driver
...
This driver allows PID type control of the needle valve
2014-04-17 13:16:48 +10:00
Douglas Clowes
610098f34b
Make a fake Hiden XCS device for testing the script context driver
2014-04-17 13:16:40 +10:00
Douglas Clowes
43035bfb37
Split out the flow/humidity sensor/setpoint as four separate nodes
2014-04-16 10:08:08 +10:00
Douglas Clowes
6f0e0b80f8
Handle terminator and timeout attributes in sics_config.ini files
2014-04-16 09:44:20 +10:00
Douglas Clowes
8f3b6aaabe
Add sct and tcl driver files for mercury and pfeiffer duo
2014-04-14 14:25:11 +10:00
Douglas Clowes
87bf23eb6e
tweak spacing and code, generate new drivers
2014-04-14 14:25:11 +10:00
Douglas Clowes
53d6274e7d
Add 'permlink' code to generated drivers
2014-04-14 14:25:11 +10:00
Nick Hauser
3869b55380
Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into RELEASE-3_0
2014-04-14 13:25:50 +10:00
Nick Hauser
6db328f882
First commit for Oxford 12T and Oxford Mercury manual chapters
2014-04-14 13:20:41 +10:00
Douglas Clowes
d08f5b6541
Update generated driver code
2014-04-14 10:34:43 +10:00
Douglas Clowes
ff43028b1a
Add missing braces
2014-04-14 10:20:45 +10:00
Douglas Clowes
76baa21f64
Generate code to auto-create devices based on the config file
2014-04-14 10:19:35 +10:00
Douglas Clowes
419da766c5
driveable=nxalias, add make_args to debug_log, don't suppress unreferenced
...
we might want to use unreferenced functions in hook code
2014-04-14 10:19:23 +10:00
Douglas Clowes
d9dad4dd88
Allow single and double quotes, expressions for values, @@NOSEND@@
2014-04-14 10:19:06 +10:00
Douglas Clowes
1692e0d4d4
Sanitize error text to reduce TCL errors
2014-04-04 12:27:40 +11:00
Douglas Clowes
f9bff7f4f2
Remove duplicate init and move sics dependency out of nwatch
2014-04-03 12:11:53 +11:00
Douglas Clowes
719fd7dc5a
Make valgrind header inclusion conditional
2014-04-03 12:09:24 +11:00
Douglas Clowes
79be4c9422
Include outcode and continuation marker, move testlog test command up.
...
Moving the testlog command up reduces the dependency loops in servlog
2014-04-03 11:59:26 +11:00
Douglas Clowes
bab07abab8
Revised macro log suppression
2014-04-03 11:56:56 +11:00
Douglas Clowes
f2c5f515c4
Add radio buttons to ini files (radio = radio_group_name)
2014-03-28 10:57:13 +11:00
Ferdi Franceschini
9e6d04c693
Get reactor status from portal.nbi because neutron.ansto now requires SSL.
2014-03-26 10:34:45 +11:00