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

1704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
01fce76ffa I think that this is a typo, always returns zero. 
r3697 | dcl | 2012-08-08 17:26:27 +1000 (Wed, 08 Aug 2012) | 1 line
 2012-11-15 17:36:07 +11:00
Douglas Clowes
39735092d7 Update to drive the rest of the way 
r3696 | dcl | 2012-08-08 13:36:40 +1000 (Wed, 08 Aug 2012) | 1 line
 2012-11-15 17:36:02 +11:00
Jing Chen
aaa10b5cf1 r3695 | jgn | 2012-08-07 16:27:59 +1000 (Tue, 07 Aug 2012) | 1 line 2012-11-15 17:35:57 +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
9281ebf4dd r3692 | jgn | 2012-08-03 15:34:16 +1000 (Fri, 03 Aug 2012) | 1 line 2012-11-15 17:35:43 +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
Jing Chen
27a37364ab Fixing hang-on bug in lfgen protocol 
r3689 | jgn | 2012-08-03 14:09:14 +1000 (Fri, 03 Aug 2012) | 1 line
 2012-11-15 17:35:29 +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
a311f331cd add Dlition Sample temperautre contorl 
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
 2012-11-15 17:35:19 +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
Jing Chen
152d637507 added features 
r3684 | jgn | 2012-07-30 15:22:31 +1000 (Mon, 30 Jul 2012) | 1 line
 2012-11-15 17:35:10 +11:00
Douglas Clowes
822b6d57a1 Add scan object to peak command, as: peak [scanObject] ["value"|"data"] 
r3683 | dcl | 2012-07-26 15:50:47 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:35:05 +11:00
Douglas Clowes
a9fc20abee make poll rates configurable by adding motorPollSlow, motorPollFast and airPollTimer parameters 
r3682 | dcl | 2012-07-26 15:48:38 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:35:00 +11:00
Douglas Clowes
6f836ae4cf bring back some changes from the instrument 
r3681 | dcl | 2012-07-26 15:47:15 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:56 +11:00
Douglas Clowes
45549fddb5 Improve logging robustness 
r3680 | dcl | 2012-07-26 15:46:07 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:51 +11:00
Douglas Clowes
d6ad841174 Set auto by default on startup - as per Paolo 
r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:46 +11:00
Douglas Clowes
8da55b8784 Taipan uses MC1-4,6 and not MC5 
r3678 | dcl | 2012-07-26 12:09:34 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:41 +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
7453eb2458 add new protocl controller for ag1010 
r3674 | jgn | 2012-07-23 13:42:05 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:23 +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
31b6cd6d3f add new protocl controller for ag1010 
r3672 | jgn | 2012-07-23 13:41:13 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:13 +11:00
Jing Chen
96d8af4de2 add new protocl controller for ag1010 
r3671 | jgn | 2012-07-23 13:41:03 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:09 +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
4309b28c2c Fix the Gaussian smoothing calculation 
r3657 | dcl | 2012-07-19 14:59:00 +1000 (Thu, 19 Jul 2012) | 1 line
 2012-11-15 17:33:59 +11:00
Douglas Clowes
7727408b80 Add some initialisaton for each new scan, so we don't reuse old data 
r3656 | dcl | 2012-07-19 14:58:21 +1000 (Thu, 19 Jul 2012) | 1 line
 2012-11-15 17:33:55 +11:00
Douglas Clowes
5118d7b23e Add TCP address:port to displayed parameters for use in simulation 
r3655 | dcl | 2012-07-19 14:57:03 +1000 (Thu, 19 Jul 2012) | 1 line
 2012-11-15 17:33:50 +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
Jing Chen
87e623c9af add magnetic 
r3650 | jgn | 2012-07-16 09:56:45 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:40 +11:00
Jing Chen
df847f6239 add magnetic 
r3649 | jgn | 2012-07-16 09:56:37 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:36 +11:00
Jing Chen
e0e7745291 add magnetic 
r3648 | jgn | 2012-07-16 09:56:02 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:31 +11:00
Jing Chen
21af2ad20e add magnetic 
r3647 | jgn | 2012-07-16 09:50:15 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:26 +11:00
Jing Chen
e4a57f0162 add magnetic 
r3646 | jgn | 2012-07-16 09:50:06 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:21 +11:00
Jing Chen
291892e6d7 use same folder name magnetic 
r3645 | jgn | 2012-07-16 09:44:48 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:17 +11:00
Jing Chen
83e8b77271 use same folder name magnetic 
r3643 | jgn | 2012-07-16 09:41:40 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:07 +11:00
Ferdi Franceschini
a6fd5af72c Made the isobus address configurable for the Oxford Mercury ITC. 
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"

r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
 2012-11-15 17:33:03 +11:00
Ferdi Franceschini
d85341b8fc Added aerotech motor control for 12T oxford magnet and oxford 
temperatuer controller.

r3641 | ffr | 2012-07-13 15:41:42 +1000 (Fri, 13 Jul 2012) | 3 lines
 2012-11-15 17:32:58 +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
25c10fb105 Convert difscan skip count to be milliseconds 
r3639 | dcl | 2012-07-11 15:12:51 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:49 +11:00
Douglas Clowes
f5537d7c9e Provide a way to configure a simulated motor if it identifies itself as being simulated 
r3638 | dcl | 2012-07-11 15:11:41 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:44 +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
ff2657c5e3 Update parameters to match parameters on instrument. 
r3629 | ffr | 2012-07-09 09:53:00 +1000 (Mon, 09 Jul 2012) | 2 lines
 2012-11-15 17:32:16 +11:00
Ferdi Franceschini
fd703373d8 New home position readings for Huber cradle. 
r3628 | ffr | 2012-07-09 09:51:37 +1000 (Mon, 09 Jul 2012) | 2 lines
 2012-11-15 17:32:11 +11:00