Commit Graph

112 Commits

Author SHA1 Message Date
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
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
Jing Chen
687ed01c01 add delay factor after sending a S command and before sending a L command
r2947 | jgn | 2010-06-01 15:10:12 +1000 (Tue, 01 Jun 2010) | 2 lines
2012-11-15 17:03:53 +11:00
Ferdi Franceschini
3d5d94c1dd sct_rfamp.c
SICS-405 Protocol handler always reports "SET" failed. Implemented workaround so that it always succeeds until we have a proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:35 +11:00
Ferdi Franceschini
b8811330f1 script_context_util.tcl
hinitprops can now be called with a list of parameters.
SICS-403 hinitprops will now check for "argtype" and "values" attributes on script context objects to create drop down lists valid arguments for GumTree

sct_positmotor_common.tcl
SICS-403 Now sets "argtype" and a list of "values" properties so GumTree can create drop-down lists of arguments.

quokka positmotor_configuration.tcl
SICS-401 diameter and sampleNum selectors report communications errors

sct_rfamp.c
The controller state should be set before calling AsconError.

r2931 | ffr | 2010-05-22 13:56:13 +1000 (Sat, 22 May 2010) | 13 lines
2012-11-15 17:03:11 +11:00
Jing Chen
b9a550fd8d return to txNormalState when setting GetReplyFailed
r2928 | jgn | 2010-05-19 12:12:51 +1000 (Wed, 19 May 2010) | 2 lines
2012-11-15 17:02:57 +11:00
Ferdi Franceschini
9cb2ba5ed8 Added a tolerance parameter for the current because the current on the RF generator fluctuates a bit.
r2926 | ffr | 2010-05-18 20:07:16 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:48 +11:00
Ferdi Franceschini
bc3471bb98 If the S (set) command fails it should be reported as an error.
r2920 | ffr | 2010-05-12 17:35:17 +1000 (Wed, 12 May 2010) | 2 lines
2012-11-15 17:02:20 +11:00
Jing Chen
3b8b81a19b add response when sending a S command
r2918 | jgn | 2010-05-12 12:15:24 +1000 (Wed, 12 May 2010) | 2 lines
2012-11-15 17:02:11 +11:00
Ferdi Franceschini
47fd7c781f Added some dev notes.
r2916 | ffr | 2010-05-10 15:16:09 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:02:02 +11:00
Ferdi Franceschini
e4e2447475 Replaced by sct_rfamp.c
r2915 | ffr | 2010-05-10 15:12:21 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:01:57 +11:00
Douglas Clowes
6993b4de6b Oxford ITC502 and ITC503 Temperature Controllers
r2913 | dcl | 2010-05-10 10:02:42 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:01:48 +11:00
Ferdi Franceschini
7a456163b5 Fixed SICS-392 RF Generator command truncation.
Code cleanup

r2906 | ffr | 2010-05-05 15:33:00 +1000 (Wed, 05 May 2010) | 3 lines
2012-11-15 17:01:25 +11:00
Ferdi Franceschini
d8e391ea90 Added protec and http protocols which had been removed during merge.
r2889 | ffr | 2010-04-19 14:33:37 +1000 (Mon, 19 Apr 2010) | 2 lines
2012-11-15 17:00:34 +11:00