- Fix to various drivers due to changes in rs232controller
- hkl now searches psi in .5 steps - first point of fastscan is driven normally
This commit is contained in:
10
slsmagnet.c
10
slsmagnet.c
@@ -11,6 +11,8 @@
|
||||
115KB when using this device.
|
||||
|
||||
Mark Koennecke, October 2001
|
||||
|
||||
Adaptiert auf neue DSP Software version, Mark Koennecke, August 2005
|
||||
|
||||
Copyright: see copyright.h
|
||||
----------------------------------------------------------------------------*/
|
||||
@@ -161,7 +163,10 @@ static int communicateSLS(mkChannel *pSock, char msg[6], char reply[6])
|
||||
assert(pMe);
|
||||
|
||||
msg[0] = DSPREAD; /* read request */
|
||||
msg[1] = 0x92; /* address of mag current */
|
||||
/* old address of mag current
|
||||
msg[1] = 0x92;
|
||||
*/
|
||||
msg[1] = 0x9c; /* address of mag current */
|
||||
iRet = communicateSLS(pMe->pSock,msg,reply);
|
||||
if(iRet < 0)
|
||||
{
|
||||
@@ -267,7 +272,10 @@ static int communicateSLS(mkChannel *pSock, char msg[6], char reply[6])
|
||||
try to switch device on
|
||||
*/
|
||||
msg[0] = DSPWRITE;
|
||||
/* old device on
|
||||
msg[1] = 0x31;
|
||||
*/
|
||||
msg[1] = 0x3c;
|
||||
ival = 1;
|
||||
memcpy(msg+2, &ival,4);
|
||||
iRet = communicateSLS(pMe->pSock,msg,reply);
|
||||
|
||||
Reference in New Issue
Block a user