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

2808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
82b8590f30 Move deployment information to file DEPLOYMENT.TXT 
r3741 | dcl | 2012-09-19 13:53:02 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:30 +11:00
Douglas Clowes
eddabe79c4 merge back changes from instrument 
r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:25 +11:00
Douglas Clowes
a59f088761 Add instrument/name and rename program_branch and program_revision 
r3739 | dcl | 2012-09-19 12:18:20 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:20 +11:00
Douglas Clowes
6a49b17dde augment and refactor SICS_* defines 
r3738 | dcl | 2012-09-19 11:11:13 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:16 +11:00
Douglas Clowes
9244cb839c extract all unique revisions 
r3737 | dcl | 2012-09-18 12:13:53 +1000 (Tue, 18 Sep 2012) | 1 line
 2012-11-15 17:38:11 +11:00
Douglas Clowes
f90ede5c75 Find the highest revision in the tree 
r3736 | dcl | 2012-09-18 09:55:01 +1000 (Tue, 18 Sep 2012) | 1 line
 2012-11-15 17:38:06 +11:00
Douglas Clowes
68edac83fc Add SICS_Site, SICS_Version and SICS_Revision 
r3735 | dcl | 2012-09-17 17:09:48 +1000 (Mon, 17 Sep 2012) | 1 line
 2012-11-15 17:38:01 +11:00
Douglas Clowes
6b482b29ec Implement the command "sics_revision" to get the SVN revision into the SICServer executable 
r3734 | dcl | 2012-09-14 17:18:11 +1000 (Fri, 14 Sep 2012) | 1 line
 2012-11-15 17:37:57 +11:00
Douglas Clowes
62d894b9e7 First Working Version against "SCPI" protocol Mercury 
r3733 | dcl | 2012-09-11 11:40:48 +1000 (Tue, 11 Sep 2012) | 1 line
 2012-11-15 17:37:52 +11:00
Douglas Clowes
81605a11a1 Driver for the Oxford Mercury Temperature Controller (WIP) 
r3732 | dcl | 2012-09-03 13:37:30 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:47 +11:00
Douglas Clowes
84842c901f Add voltage, status and "end-of-driving" 
r3731 | dcl | 2012-09-03 09:03:12 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:42 +11:00
Douglas Clowes
475d29cfb7 Add the Green Magnet driver to the deployment 
r3730 | dcl | 2012-09-03 09:00:45 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:37 +11:00
Douglas Clowes
d287611f03 Add virtual motors (e.g. for wavelength) 
r3729 | dcl | 2012-08-30 11:16:06 +1000 (Thu, 30 Aug 2012) | 1 line
 2012-11-15 17:37:33 +11:00
Jing Chen
acf91f494d r3728 | jgn | 2012-08-30 09:21:58 +1000 (Thu, 30 Aug 2012) | 1 line 2012-11-15 17:37:28 +11:00
Douglas Clowes
2ea516d84b Add virtual motors for initial energy (vei) and wavelength (vwi) and for elastic_time 
r3713 | dcl | 2012-08-28 16:00:32 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:23 +11:00
Douglas Clowes
813a1c0de8 add some catch blocks 
r3712 | dcl | 2012-08-28 15:12:57 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:18 +11:00
Douglas Clowes
eb3b71b532 enable the dummy motor for testing purposes 
r3711 | dcl | 2012-08-28 15:08:32 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:14 +11:00
Douglas Clowes
200d539adc Simple driver for the "Green Magnet" 
r3710 | dcl | 2012-08-28 15:06:20 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:09 +11:00
Jing Chen
0338f9973b make all command names lowercase 
r3709 | jgn | 2012-08-28 12:38:32 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:04 +11:00
Jing Chen
1d8b0f0b47 r3708 | jgn | 2012-08-27 09:13:37 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:59 +11:00
Jing Chen
e4df7329f3 r3707 | jgn | 2012-08-27 09:13:29 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:54 +11:00
Jing Chen
29a9ad72a8 r3706 | jgn | 2012-08-27 09:13:20 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:50 +11:00
Jing Chen
d2b917cb99 r3705 | jgn | 2012-08-24 10:51:29 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:45 +11:00
Jing Chen
263b7e9c78 r3704 | jgn | 2012-08-24 10:42:55 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:40 +11:00
Jing Chen
06bfc7a917 r3703 | jgn | 2012-08-24 10:41:07 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:35 +11:00
Jing Chen
b2388fe47a change folder magnetic to magneticField 
r3702 | jgn | 2012-08-24 10:39:12 +1000 (Fri, 24 Aug 2012) | 1 line
 2012-11-15 17:36:31 +11:00
Jing Chen
f4a240c377 change command names 
r3701 | jgn | 2012-08-20 15:54:34 +1000 (Mon, 20 Aug 2012) | 1 line
 2012-11-15 17:36:26 +11:00
Jing Chen
e10bb049fd add scale for temp measurement 
r3700 | jgn | 2012-08-15 15:42:13 +1000 (Wed, 15 Aug 2012) | 1 line
 2012-11-15 17:36:21 +11:00
Ferdi Franceschini
62567cac49 Add commands to set the veto window. 
r3699 | ffr | 2012-08-14 11:52:51 +1000 (Tue, 14 Aug 2012) | 2 lines
 2012-11-15 17:36:16 +11:00
Jing Chen
b1d95d0a2b bug fix 
r3698 | jgn | 2012-08-10 11:38:47 +1000 (Fri, 10 Aug 2012) | 1 line
 2012-11-15 17:36:11 +11:00
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