f2d051e2a5
Add a protocol module for Omron Compoway/F protocol on asyncqueue
Douglas Clowes
2014-06-13 14:56:26 +10:00
0a5ff0360d
Add trace and list commands to AsyncQueue
Douglas Clowes
2014-06-13 14:55:27 +10:00
58f23cc91d
Motor configuration updates from Bilby motion control spreadsheets.
Ferdi Franceschini
2014-06-13 08:52:26 +10:00
702a85b83f
SICS-746 STATEMON INTEREST register STEND only once
Douglas Clowes
2014-06-11 17:12:46 +10:00
09c82c0644
Try separating Quokka and taipan tests
Douglas Clowes
2014-06-11 15:45:26 +10:00
2ff336f1ee
Check for fake/simulated motors
Douglas Clowes
2014-06-06 17:26:29 +10:00
f4f29c2d84
Massage the test suite for non-taipan instruments
Douglas Clowes
2014-06-11 14:54:01 +10:00
3ae5310af9
Massage the mercury pressure card driver
Douglas Clowes
2014-06-11 10:46:38 +10:00
5df6300255
Updated detector carriage minimum separation after correcting curtaindet configuration. NOTE: The stepsperx and cntsperx were changed in the Bilby motion control spreadsheet after SICS was deployed.
Ferdi Franceschini
2014-06-10 19:57:54 +10:00
70e9ce99e4
Updated motor configuration from Bilby_motion_control_SICS.xls, 10-06-2014T16:45
Ferdi Franceschini
2014-06-10 19:26:58 +10:00
1baf4faa90
Add tank position and set vessel_y SICS variable for Ltof calculation.
Ferdi Franceschini
2014-06-10 19:24:57 +10:00
ea7f7b8b9d
Generate posit_n parameters from posn attributes in the motor configuration CSV files.
Ferdi Franceschini
2014-06-10 19:23:29 +10:00
8da11e0ff2
The fake Galil can now handle 'MG _LFH' and 'MG _LFR' to get limit switch states.
Ferdi Franceschini
2014-06-10 19:21:51 +10:00
cb1652835a
Added 'unpad' command to remove leading zeros from base 10 numbers.
Ferdi Franceschini
2014-06-10 19:20:41 +10:00
96526c7866
Trim whitespace from description when generating motor configuration.
Ferdi Franceschini
2014-06-10 19:16:53 +10:00
e2fae66199
Update the mercury pressure loop for the pressure card
Douglas Clowes
2014-06-10 17:17:10 +10:00
a27f0d9b94
- Cosmetic changes to sicsget and counter - Fixed a bug when NETconnect would come back with errno EINPROGRESS which is no error really
Mark Koennecke2014-06-06 16:38:14 +02:00
21c9193a4b
Minor fixes to compareSICS, gitrefer and gitloader
Douglas Clowes
2014-06-05 16:35:49 +10:00
1f3aa6676e
Create the gitloader and gitrefer progs and tie in with compareSICS
Douglas Clowes
2014-06-05 11:36:29 +10:00
49361e3430
Pull back configurations changes from Bilby
Douglas Clowes
2014-06-04 15:17:35 +10:00
98790ec9c5
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
Mark Koennecke2014-06-03 12:03:04 +02:00
f1e3ae7c0b
Fixed a bug in sicshipadaba which would not cause bin transfer mode properly honoured on hget Added a total feature to histmemsec
Mark Koennecke2014-06-03 12:01:52 +02:00
393f050338
Update sics_test.py to add position_names and embedded python tests
Douglas Clowes
2014-05-30 17:45:58 +10:00
61700fbae3
Update test code
Douglas Clowes
2014-05-29 13:44:57 +10:00
1a1f00c49a
motor verbose/debug, position_names, hard<->soft and refactor
Douglas Clowes
2014-05-30 17:32:47 +10:00
c7a2d05832
Add posit2soft to get soft position from position
Douglas Clowes
2014-05-30 12:22:31 +10:00
a1572f3152
Add astrium chopper field 'master' to driver
Douglas Clowes
2014-05-30 17:17:14 +10:00
bd0c0b5556
Bilby Astrium Chopper Driver and Fake Chopper
Douglas Clowes
2014-05-28 17:29:36 +10:00
2517f71c67
Improve handling and logging for xxx_simulation case
Douglas Clowes
2014-05-28 12:24:20 +10:00
28ea3befb6
Allow setting driver debug_threshold in SCT file
Douglas Clowes
2014-05-28 11:59:30 +10:00
6a9b64d3d6
Catch errors in the hval/hget and return the message as the value
Douglas Clowes
2014-05-26 12:53:55 +10:00
f62fb5a91c
Longer timeout and fiddling around the edges (debug, callback args)
Douglas Clowes
2014-05-26 12:55:22 +10:00
70e1cdcd01
Push test_suite, sicsconfig and hipadaba down to base class setup
Douglas Clowes
2014-05-21 12:27:22 +10:00
9c08424524
Update tests to include drive_one and getgumtreexmlvalues
Douglas Clowes
2014-05-16 17:36:37 +10:00
95ead97234
Default (fakedev) test config to include motors and environment
Douglas Clowes
2014-05-16 10:14:16 +10:00
dc3a3c39c0
Added append to trace in support of the autotrace facility
Mark Koennecke2014-05-23 09:53:34 +02:00
4f7fe09f35
Implement a turn counter for wrap-around rotary encoders
Douglas Clowes
2014-05-20 12:26:44 +10:00
1a28faabbf
Add the <value></value> to regular getgumtreexml
Douglas Clowes
2014-05-19 11:03:19 +10:00
92d3acb5d5
Remove superfluous trailing white space from TCL files
Douglas Clowes
2014-05-16 12:30:51 +10:00
89e4e37f9e
Remove superfluous trailing white space from Python files
Douglas Clowes
2014-05-16 13:01:13 +10:00
4c65f82116
Remove superfluous trailing white space from C files
Douglas Clowes
2014-05-16 15:48:41 +10:00
1881907e00
Add getgumtreexmlvalues function for values without properties
Douglas Clowes
2014-05-16 16:38:38 +10:00
cf8a08ea7e
Generated modular mercury drivers
Douglas Clowes
2014-05-14 17:28:58 +10:00
abafa6a2e6
Change obsoleted eStatus logging to eLog or eValue
Douglas Clowes
2014-05-16 11:18:20 +10:00
81ed966092
Regen sct drivers with async and logging changes
Douglas Clowes
2014-05-16 10:22:58 +10:00
86673f6a8f
Only require the IP and PORT in the config.ini if we will use them
Douglas Clowes
2014-05-14 17:33:37 +10:00
668cbcc3ed
Update Bilby motor configuration. Adds tank and sample stage. Also changed some names as requested by Anna.
Ferdi Franceschini
2014-05-16 13:54:12 +10:00
0ae4d40470
Deploy all environment drivers to all instruments.
Ferdi Franceschini
2014-05-09 09:34:38 +10:00
3571578531
Only check write-timeouts when we have something to write.
Ferdi Franceschini
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.
Ferdi Franceschini
2014-05-05 12:20:53 +10:00
a52835379d
Changes to sct files
Douglas Clowes
2014-04-24 10:45:45 +10:00
bf84f65e5a
Changes to generated driver logging
Douglas Clowes
2014-04-23 16:26:43 +10:00
46599051d9
Add find_sicsdev and find_myobject functions
Douglas Clowes
2014-04-23 16:26:30 +10:00
93276478f5
Push the server and option code down to reduce dependency loops
Douglas Clowes
2014-04-03 16:46:43 +11:00
a557cf577a
Implement 'sicslog' command for driver logging
Douglas Clowes
2014-04-23 16:26:18 +10:00
0e0fd86da0
Replace {Log,Kill}Capture with a more generic hook.
Douglas Clowes
2014-04-03 12:35:01 +11:00
7e6b5a3a9f
Fix the Pfeiffer/mercury driver
Douglas Clowes
2014-04-24 09:49:00 +10:00
29bee0a057
Change fake pfeiffer to CRLF terminator
Douglas Clowes
2014-04-22 10:22:54 +10:00
fd23ee2443
TCL mode, async{queue,protocol}, and reset line number
Douglas Clowes
2014-04-23 17:06:20 +10:00
be653c91fe
Make instrument specific Oxford configs consistent for Quokka and Taipan.
Ferdi Franceschini
2014-05-01 09:18:55 +10:00
6af68dcb46
Add radio buttons to wombat sics_config.ini for sample stage motor configurations.
Ferdi Franceschini
2014-05-01 08:45:05 +10:00
7039a3726c
Don't automatically install the oxford magnet driver when the config is loaded.
Ferdi Franceschini
2014-04-30 13:50:55 +10:00
5f4c586002
Use the right IP address for PLC status.
Ferdi Franceschini
2014-03-26 12:36:49 +11:00
1c75c336de
Load the Oxford 12T driver code for Echidna.
Ferdi Franceschini
2014-04-29 15:24:42 +10:00
d0c9f39464
Update the SIS IP address for the plc status driver on Echidna.
Ferdi Franceschini
2014-04-29 15:23:28 +10:00
85dc69ed70
Load Oxford 12T magnet driver if it is enabled in the sics_config.ini file.
Ferdi Franceschini
2014-04-29 14:59:37 +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.
Ferdi Franceschini
2014-04-29 13:52:26 +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.
Ferdi Franceschini
2014-04-29 11:55:35 +10:00
29583c51c0
Add a NULL aqadapter for use by script context pseudo devices
Douglas Clowes
2014-04-17 13:02:19 +10:00
8306d8587f
Move the view table/creation to after data collection.
Douglas Clowes
2014-04-03 12:37:52 +11:00
a43ca1cf94
writetree - sorted items and continue on error for more resiliency
Douglas Clowes
2014-04-22 15:03:19 +10:00
ad50eaca6a
Regenerate all of the generated driver code
Douglas Clowes
2014-04-17 13:45:35 +10:00
6bca9566e3
Fix Double underscore bug in generated code
Douglas Clowes
2014-04-17 13:43:57 +10:00
da2fd6bbbb
Make a fake Pfeiffer device for testing the script context driver
Douglas Clowes
2014-04-17 13:12:42 +10:00
acf2112fc2
Make a fake Oxford Mercury device for testing the script context driver
Douglas Clowes
2014-04-17 13:13:26 +10:00
610098f34b
Make a fake Hiden XCS device for testing the script context driver
Douglas Clowes
2014-04-17 13:11:38 +10:00
43035bfb37
Split out the flow/humidity sensor/setpoint as four separate nodes
Douglas Clowes
2014-04-16 10:08:08 +10:00
6f0e0b80f8
Handle terminator and timeout attributes in sics_config.ini files
Douglas Clowes
2014-04-16 09:44:20 +10:00