255b83665c
- Added restart status code - Small fixes to make regression tests work at the same level as for first generation devices
koennecke
2013-07-18 14:24:00 +00:00
40c0bf7d9e
Remove LS370 logging to stdout
Douglas Clowes
2013-07-15 12:59:18 +10:00
c5690e52ca
Integrate scriptcontext-asyncqueue adapter into build
Douglas Clowes
2013-06-17 13:17:07 +10:00
10f1f41fd7
New file for scriptcontext-asyncqueue adapter
Douglas Clowes
2013-07-08 16:13:33 +10:00
dcfd6edfbe
Clear the network timer on firing in TimedReconnect
Douglas Clowes
2013-06-28 16:14:00 +10:00
e4b528426d
Make Timer handling more robust and easier to use
Douglas Clowes
2013-06-28 17:13:49 +10:00
784372503c
refactor TimedReconnect and AQ_Reconnect to make more the same
Douglas Clowes
2013-06-14 15:33:11 +10:00
aaeaff692e
purge asyncqueue on disconnect
Douglas Clowes
2013-07-01 14:12:59 +10:00
7c0dfe437a
SICS-632 Allocate a copy of the connection, for motor tracing, and free it at the end.
Douglas Clowes
2013-07-01 17:06:49 +10:00
a44cd3464d
Add a disconnected state to the motor state machine, rename Unknown to Init
Douglas Clowes
2013-07-01 13:55:22 +10:00
4bc06cea76
SICS-501 Special one-shot move after changing direction for backlash
Douglas Clowes
2013-06-26 17:20:21 +10:00
28b7acbeff
Added magnet arm (marm) motor to provide feedback during wedge movements.
Ferdi Franceschini
2013-07-08 11:41:20 +10:00
1486481a4c
Revert scan config changes made for Dingo. They broke the bmonscan and hmscan objects.
Ferdi Franceschini
2013-07-02 08:23:05 +10:00
65103ef607
SICS-626 tasub listref now reports the ANSTO motor names.
Ferdi Franceschini
2013-07-01 12:06:09 +10:00
c70c2d5213
Push FILEMAP.TXT down to the newserver directory and reduce duplication
Douglas Clowes
2013-07-05 11:18:53 +10:00
d73cf4278d
Add Kiethley serial port configuration from Echidna
Douglas Clowes
2013-07-05 14:27:35 +10:00
1e1fce78be
Script Context layers test for "ASCERR: " and the space is significant.
Douglas Clowes
2013-07-04 15:46:29 +10:00
6a672d3a8b
Don't put TEST_SICS at the top directory and clean any *.pyc files
Douglas Clowes
2013-07-04 15:42:40 +10:00
73536234fe
Add a new sct driver for the Watlow RM, based on the Watlow PM driver
Douglas Clowes
2013-07-04 15:39:24 +10:00
b76cee0525
Add sending the motor name in config information to the fake motor
Douglas Clowes
2013-07-01 13:38:22 +10:00
6287e0ba7f
Add the name and link count to the fake motors
Douglas Clowes
2013-07-01 13:10:46 +10:00
a0bf852024
Move displayscreen to the general utility directory "instrument/util"
Douglas Clowes
2013-07-01 12:20:11 +10:00
cbc1c940a1
Skip mc5 socket for taipan mc6 test addresses
Douglas Clowes
2013-06-27 16:43:07 +10:00
fbf6112cea
Update to show motor position on display screen
Douglas Clowes
2013-06-26 17:45:39 +10:00
99f18f8798
Add a display screen for motor position to taipan fake motors
Douglas Clowes
2013-06-26 17:24:47 +10:00
7d35ca4cf9
Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores
Douglas Clowes
2013-06-24 17:14:58 +10:00
3a06651ae3
Add link count and handle screen resize in fake Lakeshores
Douglas Clowes
2013-06-26 14:24:42 +10:00
1c6a2abdcc
Handle the non-AbsoluteEncoder motor
Douglas Clowes
2013-06-27 15:52:52 +10:00
66f67c1c0d
Lakeshore 340 only has one HTR
Douglas Clowes
2013-06-25 11:09:54 +10:00
0c179166de
Iterative improvement of fake Lakeshores
Douglas Clowes
2013-06-25 10:15:41 +10:00
9a3607bd66
- make reconnectInterval changeable (0: no automatic reconnection)
zolliker
2013-06-25 11:21:04 +00:00
8ecedfe443
- allow HIPFUNC functions to be saved and restored with its arguments
zolliker
2013-06-25 11:18:04 +00:00
1edc042db1
- created stop and count function for sics crons
zolliker
2013-06-25 11:16:20 +00:00
7fa446317a
- make V5A visible in IGH driver
zolliker
2013-06-25 11:15:05 +00:00
e26a1fc972
Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into merge-replace
Ferdi Franceschini
2013-06-24 14:56:47 +10:00
2b1e34202d
implement fake lakeshore 336, 340 and 370 in Python with curses display
Douglas Clowes
2013-06-21 14:27:37 +10:00
ce1f4cae19
SICS-587 Setup hostport dictionary based configuration for Lyrebird.
Ferdi Franceschini
2013-06-21 14:07:32 +10:00
3dce7feb8e
Andrew Kerrigan's sct driver for the Pfeiffer pressure gauge and Oxford Mercury
Douglas Clowes
2013-06-21 13:39:13 +10:00
95d8a565e3
Andrew Kerrigan's script context driver for the Pfeiffer 261 pressure gauge
Douglas Clowes
2013-06-21 13:37:31 +10:00
543f099682
Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace
Ferdi Franceschini
2013-06-21 11:25:32 +10:00
2601135c25
SICS-587 Setup hostport dictionary based configuration for Kowari.
Ferdi Franceschini
2013-06-21 11:23:41 +10:00
685a9b1373
SICS-587 Setup hostport dictionary based configuration for Echidna.
Ferdi Franceschini
2013-06-21 11:13:42 +10:00
76f323d15a
SICS-587 Setup hostport dictionary based configuration for Wombat.
Ferdi Franceschini
2013-06-21 09:07:56 +10:00
a146da74f2
SICS-587 Setup hostport dictionary based configuration for Kookaburra
Ferdi Franceschini
2013-06-21 08:40:54 +10:00
5970a05aaa
Make the ls370 sct controller name consistent with ls336 and ls340
Douglas Clowes
2013-06-19 12:35:46 +10:00
c240e54277
Create a deployment log in FILEMAP.TXT
Douglas Clowes
2013-06-18 17:45:01 +10:00
eb1579de7d
The SRCDIR is already included in the INSTSRC variable
Douglas Clowes
2013-06-18 17:18:07 +10:00
1ac674099d
Fix connection failure logic in AsyncQueue, return if not reconnected
Douglas Clowes
2013-06-14 13:33:08 +10:00
bff8cc2c16
Implement limit switches and the SC and TS commands on fake Galil motors
Douglas Clowes
2013-06-14 13:31:28 +10:00
d6f72482b3
change state to connected before notify callback for connect
Douglas Clowes
2013-06-06 15:45:04 +10:00
ecf64f40cc
Add some TODO messages and change the reconnect backoff limits
Douglas Clowes
2013-06-07 17:36:01 +10:00
923f056b2c
The voltage range for the repaired DENEX 250TN detector is now +2800 and -1000.
Ferdi Franceschini
2013-06-17 08:28:45 +10:00
40ecb8478d
The env var field in the default SICS start string should be blank. By default SICS is launched with no environment variables and sudo doesn't allow 'None' on the ICS computers.
Ferdi Franceschini
2013-06-16 10:54:19 +10:00
9949aae2fa
SICS-545 Fixed lockup/hang/freeze of Dingo cameradriver. The cameradriver would stop sending commands after about one minute if the safety_plc (ie SIS) driver was also running.
Ferdi Franceschini
2013-06-16 09:42:36 +10:00
1cf8cc81a1
Add a function to AsyncQueue to tell if we are connected
Douglas Clowes
2013-05-28 16:17:15 +10:00
2df9297a3f
SICS-587 Setup hostport dictionary based configuration for dingo. Also added simulated camera server and a camtest configuration file to run test scans against a dummy motor.
Ferdi Franceschini
2013-06-14 10:18:45 +10:00
c71cbbc521
Added lyrebird and re-ordered server socket offsets. The offsets were re-ordered to match the 3rd digit of the SIM_GALIL baseports.
Ferdi Franceschini
2013-06-14 10:13:15 +10:00
d2c42c3913
- fixed some issues related to "config listen 1" mode i.e. do not write some lines twice when in this mode
zolliker
2013-06-07 06:47:03 +00:00
6e1005dbc0
workaround: do not treat ?H1 as an illegal answer to H1 (for IPS)
zolliker
2013-06-07 06:46:06 +00:00
97d74d48c7
- add synced support for heater range
zolliker
2013-06-07 06:42:36 +00:00
906ceb96e8
- fixed some issues broken when the new task system was introduced
zolliker
2013-06-07 06:39:50 +00:00
db963166df
SaveSICSNode fulfills at the first time all of the 3 following requirements: 1) save the value af the topmost node 2) use hupdate instead of a set command for nodes marked with __save=update 3) save kids of nodes not saved
zolliker
2013-06-07 06:38:17 +00:00
565f96b5ca
- add a check for empty return value
zolliker
2013-06-07 06:26:52 +00:00
3f6a76052d
- fixed some issues related to "config listen 1" mode i.e. do not write some lines twice when in this mode
zolliker
2013-06-07 06:17:07 +00:00
9a142c18bf
- fixed: pExecutor->iRun was no longer initialized since 1.52
zolliker
2013-06-05 14:18:07 +00:00
d872aedbec
Don't create Pelican fermichopper motors when loading the configuration file. This should be done in the local extraconfig.tcl
Ferdi Franceschini
2013-05-31 11:13:10 +10:00
357170a735
SICS-616 Removed obsolete setpos command from motor driver.
Ferdi Franceschini
2013-05-31 09:55:10 +10:00
7e0e068ee2
differentiate forward/reverse limit switches in 'crashed' log message
Douglas Clowes
2013-05-31 09:27:50 +10:00
ea28b7a78c
add code to create, clean and ignore *.d files
Douglas Clowes
2013-05-31 09:34:41 +10:00
8f0ceac2ad
SICS-615 You can now update the start and step fields of scan parameters. NOTE: This also fixes the bug that was crashing SICS. The n was missing in an snprintf().
Ferdi Franceschini
2013-05-31 09:18:35 +10:00
0954c3bceb
Fixed compile error, ‘struct __MoDriv’ has no m ember named ‘errMsg’
Ferdi Franceschini
2013-05-31 08:06:38 +10:00
4a363d0e95
SICS-614 reallocate errMsg buffer each time it's used
Douglas Clowes
2013-05-28 16:19:52 +10:00
7036164640
SICS-613: Fixed voltage control for Ordela detector on Quokka.
Ferdi Franceschini
2013-05-24 19:15:10 +10:00
8096212c52
- introduced "stopexe run" - fixed "task ps" to show names containing ':' correctly
zolliker
2013-05-24 05:44:52 +00:00
3c3afb92c8
the send blocks if both rmask and wmask are set so only do it if rmask is not set
Douglas Clowes
2013-05-24 12:38:02 +10:00
8e245ba4be
turn read interest back on once connect completes
Douglas Clowes
2013-05-24 12:39:21 +10:00
4b510ffd05
replace the touch of site_ansto.c with the rm of site_ansto.o to force recompile (it's more git friendly)
Douglas Clowes
2013-05-24 12:41:23 +10:00
f6a2b259ea
- Introduced a state filed into first generation objects - Fixed some issues with error returns not being properly handled in devexec - Fixed a bug in motorlist which caused limit checks to fail - Fixed an issue with the TDCHM not properly updating the counter values on finish - Readded getHipadabaPar in ChainCallback as this caused a problem in ei - Made tasdrive ignore sgu, sgl when out of plane not allowed
koennecke
2013-05-23 08:54:55 +00:00
17e5c61d62
Integrate Dingo Camera Server Stuffs
Jing Chen
2013-05-22 11:10:21 +10:00
951f9f40ee
Integrate Dingo Camera Server Stuffs
Jing Chen
2013-05-22 10:57:11 +10:00
9b35fc13ed
Integrate Dingo Camera Server Stuffs
Jing Chen
2013-05-22 10:56:35 +10:00
fb7685ff8d
Integrate Dingo Camera Server Stuffs
Jing Chen
2013-05-22 10:56:01 +10:00
7a4fc22351
Integrate Dingo Camera Server Stuffs
Jing Chen
2013-05-22 10:55:16 +10:00
koennecke