linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,958 Commits 1 Branch 0 Tags
d73cf4278d7c2c1998d7c97da487496bf70ec2fc
Commit Graph

2958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes d73cf4278d Add Kiethley serial port configuration from Echidna 2013-07-05 14:27:35 +10:00
Douglas Clowes 1e1fce78be Script Context layers test for "ASCERR: " and the space is significant. 
Update code and comments to reflect that
 2013-07-04 15:46:29 +10:00
Douglas Clowes 6a672d3a8b Don't put TEST_SICS at the top directory and clean any *.pyc files 2013-07-04 15:42:40 +10:00
Douglas Clowes 73536234fe Add a new sct driver for the Watlow RM, based on the Watlow PM driver 2013-07-04 15:39:24 +10:00
Douglas Clowes b76cee0525 Add sending the motor name in config information to the fake motor 2013-07-01 13:38:22 +10:00
Douglas Clowes 6287e0ba7f Add the name and link count to the fake motors 2013-07-01 13:10:46 +10:00
Douglas Clowes a0bf852024 Move displayscreen to the general utility directory "instrument/util" 2013-07-01 12:20:11 +10:00
Douglas Clowes cbc1c940a1 Skip mc5 socket for taipan mc6 test addresses 2013-06-27 16:43:07 +10:00
Douglas Clowes fbf6112cea Update to show motor position on display screen 2013-06-27 16:36:56 +10:00
Douglas Clowes 99f18f8798 Add a display screen for motor position to taipan fake motors 2013-06-27 16:36:38 +10:00
Douglas Clowes 7d35ca4cf9 Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores 2013-06-27 16:36:06 +10:00
Douglas Clowes 3a06651ae3 Add link count and handle screen resize in fake Lakeshores 2013-06-27 16:35:50 +10:00
Douglas Clowes 1c6a2abdcc Handle the non-AbsoluteEncoder motor 2013-06-27 16:08:46 +10:00
Douglas Clowes 66f67c1c0d Lakeshore 340 only has one HTR 2013-06-26 10:01:42 +10:00
Douglas Clowes 0c179166de Iterative improvement of fake Lakeshores 2013-06-26 10:01:41 +10:00
Ferdi Franceschini e26a1fc972 Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into merge-replace 2013-06-24 14:56:47 +10:00
Douglas Clowes 2b1e34202d implement fake lakeshore 336, 340 and 370 in Python with curses display 2013-06-21 14:27:37 +10:00
Ferdi Franceschini ce1f4cae19 SICS-587 Setup hostport dictionary based configuration for Lyrebird. 2013-06-21 14:07:32 +10:00
Douglas Clowes 3dce7feb8e Andrew Kerrigan's sct driver for the Pfeiffer pressure gauge and Oxford Mercury 2013-06-21 13:39:13 +10:00
Douglas Clowes 95d8a565e3 Andrew Kerrigan's script context driver for the Pfeiffer 261 pressure gauge 2013-06-21 13:37:31 +10:00
Ferdi Franceschini 543f099682 Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace 2013-06-21 11:25:32 +10:00
Ferdi Franceschini 2601135c25 SICS-587 Setup hostport dictionary based configuration for Kowari. 2013-06-21 11:23:41 +10:00
Ferdi Franceschini 685a9b1373 SICS-587 Setup hostport dictionary based configuration for Echidna. 2013-06-21 11:13:42 +10:00
Ferdi Franceschini 76f323d15a SICS-587 Setup hostport dictionary based configuration for Wombat. 2013-06-21 09:07:56 +10:00
Ferdi Franceschini a146da74f2 SICS-587 Setup hostport dictionary based configuration for Kookaburra 2013-06-21 08:40:54 +10:00
Douglas Clowes 5970a05aaa Make the ls370 sct controller name consistent with ls336 and ls340 2013-06-19 12:35:46 +10:00
Douglas Clowes c240e54277 Create a deployment log in FILEMAP.TXT 2013-06-18 17:45:01 +10:00
Douglas Clowes eb1579de7d The SRCDIR is already included in the INSTSRC variable 2013-06-18 17:18:07 +10:00
Douglas Clowes 1ac674099d Fix connection failure logic in AsyncQueue, return if not reconnected 2013-06-17 12:05:29 +10:00
Douglas Clowes bff8cc2c16 Implement limit switches and the SC and TS commands on fake Galil motors 2013-06-17 12:05:29 +10:00
Douglas Clowes d6f72482b3 change state to connected before notify callback for connect 2013-06-17 12:05:29 +10:00
Douglas Clowes ecf64f40cc Add some TODO messages and change the reconnect backoff limits 2013-06-17 12:05:29 +10:00
Ferdi Franceschini 923f056b2c The voltage range for the repaired DENEX 250TN detector is now +2800 and -1000. 2013-06-17 08:28:45 +10:00
Ferdi Franceschini 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.
 2013-06-16 10:54:19 +10:00
Ferdi Franceschini 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.
 2013-06-16 09:42:36 +10:00
Douglas Clowes 1cf8cc81a1 Add a function to AsyncQueue to tell if we are connected 2013-06-14 14:40:03 +10:00
Ferdi Franceschini 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.
 2013-06-14 10:18:45 +10:00
Ferdi Franceschini c71cbbc521 Added lyrebird and re-ordered server socket offsets. 
The offsets were re-ordered to match the 3rd digit of the SIM_GALIL
baseports.
 2013-06-14 10:13:15 +10:00
Ferdi Franceschini 0c49dc21f7 Add dingo, bilby and emu baseports. 2013-06-14 09:56:33 +10:00
Ferdi Franceschini 4f44b746ba Provide dummy histogram initialisation function. 2013-06-14 09:42:57 +10:00
Ferdi Franceschini 2d8d4864ef Merge branch 'dingo' into merge-replace 2013-06-11 08:30:24 +10:00
Ferdi Franceschini d872aedbec Don't create Pelican fermichopper motors when loading the configuration file. 
This should be done in the local extraconfig.tcl
 2013-05-31 11:13:10 +10:00
Ferdi Franceschini 357170a735 SICS-616 Removed obsolete setpos command from motor driver. 2013-05-31 09:55:10 +10:00
Douglas Clowes 7e0e068ee2 differentiate forward/reverse limit switches in 'crashed' log message 2013-05-31 09:35:52 +10:00
Douglas Clowes ea28b7a78c add code to create, clean and ignore *.d files 2013-05-31 09:35:52 +10:00
Ferdi Franceschini 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().
 2013-05-31 09:18:35 +10:00
Ferdi Franceschini 0954c3bceb Fixed compile error, ‘struct __MoDriv’ has no m ember named ‘errMsg’ 2013-05-31 08:06:38 +10:00
Douglas Clowes 4a363d0e95 SICS-614 reallocate errMsg buffer each time it's used 2013-05-28 16:22:44 +10:00
Ferdi Franceschini 7036164640 SICS-613: Fixed voltage control for Ordela detector on Quokka. 2013-05-24 19:15:10 +10:00
Douglas Clowes 3c3afb92c8 the send blocks if both rmask and wmask are set so only do it if rmask is not set 2013-05-24 13:05:07 +10:00