86673f6a8f
Only require the IP and PORT in the config.ini if we will use them
2014-05-16 15:39:58 +10:00
668cbcc3ed
Update Bilby motor configuration. Adds tank and sample stage.
...
Also changed some names as requested by Anna.
2014-05-16 13:56:51 +10:00
0ae4d40470
Deploy all environment drivers to all instruments.
2014-05-16 13:56:51 +10:00
d1bfcf3b6a
Remove unnecessary {*} TCL operator.
2014-05-16 13:56:50 +10:00
4e17c8b001
Fix string range arguments for removing quotes
2014-05-13 17:41:32 +10:00
8d1fed9e68
Use parse_file to read sics_config.ini (instead of dump)
2014-05-13 17:06:46 +10:00
5da017b633
Clean and comment the code, strip quotes
2014-05-13 17:04:48 +10:00
acb5b3e46e
Clean up the trailing spaces
2014-05-13 17:03:43 +10:00
fea1d5ee70
Fix "missing hipadaba" test
2014-05-12 17:29:26 +10:00
fe2706f406
Split up some of the tests and add a TCL clock test
2014-05-12 15:20:26 +10:00
bd9c79da30
Improve formatting and documentation (pylint)
2014-05-12 15:20:18 +10:00
325fc6f313
Fixed a bug with restarting after mipositioning in motorsec.c
2014-05-09 16:48:23 +02:00
5699ae2747
Updated SICS unit test infrastructure and test tests
2014-05-09 16:59:11 +10:00
f5f5ca33ea
Starter tests for SICS unit testing
2014-05-08 14:44:44 +10:00
8d6d28bd53
Twisted unittest based SICS unit test infrastructure
2014-05-08 14:44:37 +10:00
35674d8fb0
Create fake devices in terminal tabs for Taipan testing
2014-05-08 14:44:24 +10:00
416c609b9c
Change gumxml to remove (some) prohibited characters from XML
2014-05-08 08:54:08 +10:00
e89b640088
Bug fixes
...
- transfer of monitor values in mutlicountersec
- Permission denied mesage when restarting a second generation motor fixed
2014-05-07 14:24:44 +02:00
4820912bdc
Legacy_fsm cut/paste typo
2014-05-06 17:20:43 +10:00
72f9e59150
Multiple bug fixes
...
- Arrayutil was not summing correctly
- Added interest to motorsec in order to support old status clients
- core dump because of bad free in devser
- fixed transferring of count time in multicounter
- added stack debugging to sllinux_def
- Modifications to tasdrive to wait for finish of monochromator properly
2014-05-05 13:52:00 +02:00
3571578531
Only check write-timeouts when we have something to write.
2014-05-05 14:10:16 +10:00
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
a52835379d
Changes to sct files
2014-05-01 10:54:09 +10:00
bf84f65e5a
Changes to generated driver logging
2014-05-01 10:54:09 +10:00
46599051d9
Add find_sicsdev and find_myobject functions
2014-05-01 10:54:09 +10:00
93276478f5
Push the server and option code down to reduce dependency loops
2014-05-01 10:54:09 +10:00
a557cf577a
Implement 'sicslog' command for driver logging
2014-05-01 10:54:09 +10:00
0e0fd86da0
Replace {Log,Kill}Capture with a more generic hook.
2014-05-01 10:54:09 +10:00
7e6b5a3a9f
Fix the Pfeiffer/mercury driver
2014-05-01 10:54:09 +10:00
29bee0a057
Change fake pfeiffer to CRLF terminator
2014-05-01 10:54:09 +10:00
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
be653c91fe
Make instrument specific Oxford configs consistent for Quokka and Taipan.
2014-05-01 09:18:55 +10:00
6af68dcb46
Add radio buttons to wombat sics_config.ini for sample stage motor configurations.
2014-05-01 09:03:25 +10:00
7039a3726c
Don't automatically install the oxford magnet driver when the config is
...
loaded.
2014-04-30 16:21:38 +10:00
5f4c586002
Use the right IP address for PLC status.
2014-04-30 16:21:13 +10:00
1c75c336de
Load the Oxford 12T driver code for Echidna.
2014-04-29 15:29:05 +10:00
d0c9f39464
Update the SIS IP address for the plc status driver on Echidna.
2014-04-29 15:29:05 +10:00
85dc69ed70
Load Oxford 12T magnet driver if it is enabled in the sics_config.ini file.
2014-04-29 15:29:04 +10:00
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
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
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
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
a43ca1cf94
writetree - sorted items and continue on error for more resiliency
2014-04-23 16:27:43 +10:00
ad50eaca6a
Regenerate all of the generated driver code
2014-04-17 13:45:35 +10:00
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
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
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
610098f34b
Make a fake Hiden XCS device for testing the script context driver
2014-04-17 13:16:40 +10:00
43035bfb37
Split out the flow/humidity sensor/setpoint as four separate nodes
2014-04-16 10:08:08 +10:00
6f0e0b80f8
Handle terminator and timeout attributes in sics_config.ini files
2014-04-16 09:44:20 +10:00
