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

124 Commits

Author SHA1 Message Date
Ferdi Franceschini
2d8d4864ef Merge branch 'dingo' into merge-replace 2013-06-11 08:30:24 +10:00
Douglas Clowes
ea28b7a78c add code to create, clean and ignore *.d files 2013-05-31 09:35:52 +10:00
Ferdi Franceschini
7036164640 SICS-613: Fixed voltage control for Ordela detector on Quokka. 2013-05-24 19:15:10 +10:00
Jing Chen
f4d9affe7d integrate Dingo Camera Server stuffs 2013-05-22 10:47:14 +10:00
Ferdi Franceschini
40f979de8f Fixed dumb typo. 2013-05-13 23:08:37 +10:00
Ferdi Franceschini
0f2df4a8fe SICS-593: Return 0 from the AsconReading state to ensure that SICS 
progresses through tasks.
 2013-05-13 08:40:30 +10:00
Ferdi Franceschini
c09968b72e Attempt a reconnect for astvels protocol if a command times out. 
This lets us re-use the astvel protovol to support SICS-601 so that HTTP
connections will reconnect after the connection times out.
 2013-05-05 21:19:05 +10:00
Ferdi Franceschini
e28b1f77da SICS-593 (in progress) Protocol handlers should return 0 from the 
AsconReading state.
 2013-04-24 16:44:53 +10:00
Ferdi Franceschini
1079f6e702 Always return 0 from the AsconReading state to make sure we exit the AsconTask(). 
Since the PSI update the AsconTask() function will loop forever unless you return 0.
 2013-03-13 19:06:57 +11:00
Ferdi Franceschini
86379e8038 Added functions to create the camera driver and init the camera protocol 
to site_ansto.c
 2013-02-28 12:57:41 +11:00
Ferdi Franceschini
ad27488d3d Initial implementation of Dingo Camera driver. 
Takes a single shot or a multishot.
If the user changes the camera configuration in SICS the new config will
be uploaded when the next take shot/multishot command is sent.
This driver allows the scan object in SICS to drive the scan variable to
the next target while the camera is processing and saving data after
acquiring an image.
TODO
Implement "set file,..." command.
 2013-02-26 01:20:02 +11:00
Ferdi Franceschini
87559bf411 Upload camera configuration if it has changed before sending 
a "take shot" or "take multi on" command.  Incorporate Vijay's changes
to the "set camera," parameters.
 2013-02-26 01:02:25 +11:00
Ferdi Franceschini
ed9a2aff16 Moved camera to hardsup and started adding parameters. 2013-02-18 11:21:04 +11:00
Ferdi Franceschini
f2befda1a2 Dingo camera driver 2013-02-11 19:14:03 +11:00
Douglas Clowes
da1213c059 TCL 8.5 and cleanup 2012-12-10 14:55:51 +11:00
Douglas Clowes
27e89241cf get it to build 2012-11-27 13:34:05 +11:00
Douglas Clowes
49123234d0 merge work in progress 2012-11-26 15:10:25 +11:00
Ferdi Franceschini
828cccc2f3 tcpmodbus.c 
Check for timeout when reading.  Added more error checking. Some
housekeeping to make it easier to follow the code, name changes and more
descriptive comments.

r3785 | ffr | 2012-11-05 12:20:41 +1100 (Mon, 05 Nov 2012) | 5 lines
 2012-11-15 17:41:15 +11:00
Jing Chen
15fdda1deb add timeout parameter in protocol 
r3694 | jgn | 2012-08-07 12:03:23 +1000 (Tue, 07 Aug 2012) | 1 line
 2012-11-15 17:35:52 +11:00
Jing Chen
1993aa2c11 r3693 | jgn | 2012-08-03 16:14:38 +1000 (Fri, 03 Aug 2012) | 1 line 2012-11-15 17:35:47 +11:00
Jing Chen
f3486b2a17 r3691 | jgn | 2012-08-03 15:34:06 +1000 (Fri, 03 Aug 2012) | 1 line 2012-11-15 17:35:38 +11:00
Jing Chen
f2788d66cd Fixing hang-on bug in lfgen protocol 
r3690 | jgn | 2012-08-03 14:09:55 +1000 (Fri, 03 Aug 2012) | 1 line
 2012-11-15 17:35:33 +11:00
Ferdi Franceschini
74edc8ab56 SICS-496: Set the output power limit to 40% on startup as requested. 
r3687 | ffr | 2012-08-02 09:47:33 +1000 (Thu, 02 Aug 2012) | 2 lines
 2012-11-15 17:35:24 +11:00
Jing Chen
cad63a8578 change data type 
r3685 | jgn | 2012-07-30 16:31:14 +1000 (Mon, 30 Jul 2012) | 1 line
 2012-11-15 17:35:14 +11:00
Douglas Clowes
9a39b9912a make timing defaults 1,1000,3 like histogram sets 
r3677 | dcl | 2012-07-26 10:14:02 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:37 +11:00
Jing Chen
710d76def7 r3676 | jgn | 2012-07-26 09:46:53 +1000 (Thu, 26 Jul 2012) | 1 line 2012-11-15 17:34:32 +11:00
Jing Chen
f1fc1e59e5 r3675 | jgn | 2012-07-25 13:25:02 +1000 (Wed, 25 Jul 2012) | 1 line 2012-11-15 17:34:27 +11:00
Jing Chen
1da7a21805 add new protocl controller for ag1010 
r3673 | jgn | 2012-07-23 13:41:34 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:18 +11:00
Jing Chen
28e090f1a2 add new protocl controller for ag1010 
r3670 | jgn | 2012-07-23 13:40:48 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:04 +11:00
Douglas Clowes
45f27b98cc Minor improvement in timing and jitter of simulation 
r3654 | dcl | 2012-07-19 14:55:45 +1000 (Thu, 19 Jul 2012) | 1 line
 2012-11-15 17:33:45 +11:00
Douglas Clowes
53d5339c66 Remove the lower limit on count rate for simulated hardware 
r3640 | dcl | 2012-07-11 17:31:41 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:53 +11:00
Douglas Clowes
c59a3979be Implement simulated counter hardware and more string literal changes 
r3637 | dcl | 2012-07-11 15:08:50 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:39 +11:00
Douglas Clowes
a4581ba153 string literals are now const so declare args as such to suppress compiler warnings 
r3636 | dcl | 2012-07-11 12:16:07 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:35 +11:00
Douglas Clowes
b8c3bc3acd bugfix: was overwriting short constant string or argv 
r3635 | dcl | 2012-07-11 12:04:43 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:30 +11:00
Douglas Clowes
6a539d2321 string literals are now const so declare args as such to suppress compiler warnings 
r3634 | dcl | 2012-07-11 11:59:16 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:25 +11:00
Douglas Clowes
556b69063c bugfix: was overwriting short constant string or argv 
r3633 | dcl | 2012-07-11 11:56:25 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:21 +11:00
Ferdi Franceschini
20ce9381bb Added modbus protocol handler and Fermi chopper support for Pelican 
r3359 | ffr | 2012-01-30 11:09:25 +1100 (Mon, 30 Jan 2012) | 2 lines
 2012-11-15 17:24:11 +11:00
Ferdi Franceschini
0b90dfc0dc Remove files accidentally added in rev 3071 
D    site_ansto/hardsup/oldsct_modbusprot.c
D    site_ansto/hardsup/libhlib.a
D    site_ansto/instrument/deploySICS.sh.new
D    site_ansto/instrument/reflectometer/config/beamline/old_polanal.tcl
D    site_ansto/instrument/reflectometer/config/beamline/old_sct_RFGen.tcl
D    .cproject
D    cscope.out
D    tags
D    psi/hardsup/libhlib.a
D    psi/tecs/libtecsl.a

r3234 | ffr | 2011-07-24 13:13:46 +1000 (Sun, 24 Jul 2011) | 13 lines
 2012-11-15 17:15:46 +11:00
Douglas Clowes
eaf924eb73 incorporate syringe pump protocol 
r3226 | dcl | 2011-06-24 13:05:51 +1000 (Fri, 24 Jun 2011) | 1 line
 2012-11-15 17:15:11 +11:00
Douglas Clowes
6a157ede79 Add "hamilton" protocol same as oxford with echo suppression 
r3222 | dcl | 2011-06-20 11:54:20 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:53 +11:00
Douglas Clowes
665adbf4a6 double the timeout to make errors less likely 
r3093 | dcl | 2011-04-05 17:37:51 +1000 (Tue, 05 Apr 2011) | 1 line
 2012-11-15 17:09:49 +11:00
Douglas Clowes
3cf7bfbf50 Add RVA SC driver and associated Newport protocol 
r3081 | dcl | 2011-03-24 14:51:13 +1100 (Thu, 24 Mar 2011) | 1 line
 2012-11-15 17:09:12 +11:00
Ferdi Franceschini
7371a561d9 Make sure spin flipper code in rfamp.c is initialised 
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
 2012-11-15 17:08:46 +11:00
Douglas Clowes
7f4b0de463 Modify makefiles to find libraries on more platforms 
r3060 | dcl | 2011-02-18 11:04:57 +1100 (Fri, 18 Feb 2011) | 1 line
 2012-11-15 17:07:57 +11:00
Douglas Clowes
18a57956b1 use PSI IEEE float code 
r3057 | dcl | 2011-02-16 16:29:35 +1100 (Wed, 16 Feb 2011) | 1 line
 2012-11-15 17:07:45 +11:00
Douglas Clowes
2e658ff4a9 Add Floating point read/write commands 
r3029 | dcl | 2010-11-12 14:56:28 +1100 (Fri, 12 Nov 2010) | 1 line
 2012-11-15 17:06:33 +11:00
Douglas Clowes
88d8ff904f add timeout processing timestamp at start of read 
r3024 | dcl | 2010-09-14 11:24:41 +1000 (Tue, 14 Sep 2010) | 1 line
 2012-11-15 17:06:12 +11:00
Douglas Clowes
8263b6916c add timeout processing and allow modbus device id to 39 
r3023 | dcl | 2010-09-14 11:23:02 +1000 (Tue, 14 Sep 2010) | 1 line
 2012-11-15 17:06:08 +11:00
Douglas Clowes
4ac338f4af replace stropts.h with sys/ioctl.h to define ioctl 
r3020 | dcl | 2010-08-13 15:00:40 +1000 (Fri, 13 Aug 2010) | 1 line
 2012-11-15 17:06:04 +11:00
Douglas Clowes
aaac832181 add oxford protocol 
r2961 | dcl | 2010-06-25 15:10:25 +1000 (Fri, 25 Jun 2010) | 2 lines
 2012-11-15 17:04:03 +11:00