linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,079 Commits 1 Branch 0 Tags
ad3aa5cd3b041151be59edba39b1b12ec716c576
Commit Graph

3079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
a8e2e54ec0 Break Makefile to make Makefile_SICS for the sics directory 2013-08-01 17:12:30 +10:00
Douglas Clowes
f552302bdf Update site_ansto/Makefile to actually use the dependency files gcc produces 2013-08-01 17:12:08 +10:00
Douglas Clowes
cfb1b90baa Update hardsup/makefile to actually use the dependency files gcc produces 2013-08-01 16:42:31 +10:00
Douglas Clowes
df7afb367a Implement a config.h to move defines off the compile line and reduce builds 2013-08-01 16:42:14 +10:00
Douglas Clowes
69925baaf6 Reset asyncRunning earlier to prevent ghttp_process calls and cover both paths 2013-07-31 11:44:49 +10:00
Douglas Clowes
39723685f5 SICS-650 Remove camera drive timer on disconnect and re-register on re-connect 2013-07-30 13:54:35 +10:00
Douglas Clowes
b797d73edc Do not build obsolete module nhq200util.c 2013-07-26 09:44:54 +10:00
Douglas Clowes
40c0bf7d9e Remove LS370 logging to stdout 2013-07-15 13:01:35 +10:00
Douglas Clowes
c5690e52ca Integrate scriptcontext-asyncqueue adapter into build 2013-07-08 16:17:23 +10:00
Douglas Clowes
10f1f41fd7 New file for scriptcontext-asyncqueue adapter 2013-07-08 16:13:33 +10:00
Douglas Clowes
dcfd6edfbe Clear the network timer on firing in TimedReconnect 2013-07-08 15:54:35 +10:00
Douglas Clowes
e4b528426d Make Timer handling more robust and easier to use 2013-07-08 15:54:31 +10:00
Douglas Clowes
784372503c refactor TimedReconnect and AQ_Reconnect to make more the same 2013-07-08 15:54:26 +10:00
Douglas Clowes
aaeaff692e purge asyncqueue on disconnect 2013-07-08 15:54:20 +10:00
Douglas Clowes
7c0dfe437a SICS-632 Allocate a copy of the connection, for motor tracing, and free it at the end. 2013-07-08 15:53:59 +10:00
Douglas Clowes
a44cd3464d Add a disconnected state to the motor state machine, rename Unknown to Init 2013-07-08 15:53:54 +10:00
Douglas Clowes
4bc06cea76 SICS-501 Special one-shot move after changing direction for backlash 2013-07-08 15:53:46 +10:00
Ferdi Franceschini
28b7acbeff Added magnet arm (marm) motor to provide feedback during wedge movements. 2013-07-08 11:42:25 +10:00
Ferdi Franceschini
1486481a4c Revert scan config changes made for Dingo. They broke the bmonscan and hmscan objects. 2013-07-08 11:42:25 +10:00
Ferdi Franceschini
65103ef607 SICS-626 tasub listref now reports the ANSTO motor names. 2013-07-08 11:42:24 +10:00
Douglas Clowes
c70c2d5213 Push FILEMAP.TXT down to the newserver directory and reduce duplication 2013-07-05 15:23:53 +10:00
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