- added backwards calculation of hkl from four circle angles. This
required inclusion of a matrix package. - modified counter error handling to send a Stop when the _BAD_BUSY error is received. - added an environment interface to the general controller stuff in choco.* Also added setting a parameter directly at the controller object. - Added a driver for the ETH High Temperature Furnace to be used at SANS.
This commit is contained in:
@ -61,6 +61,7 @@
|
||||
#include "eurodriv.h"
|
||||
#include "el755driv.h"
|
||||
#include "tecsdriv.h"
|
||||
#include "chadapter.h"
|
||||
/*--------------------- Functions needed to implement interfaces -----------*/
|
||||
static long EVIDrive(void *pData, SConnection *pCon, float fVal)
|
||||
{
|
||||
@ -1239,7 +1240,8 @@
|
||||
SCSendOK(pCon);
|
||||
return 1;
|
||||
}
|
||||
else if(strcmp(argv[3],"ltc11") == 0) /* Neocera LTC-11 temperature controller*/
|
||||
else if(strcmp(argv[3],"ltc11") == 0)
|
||||
/* Neocera LTC-11 temperature controller*/
|
||||
{
|
||||
/* Create a driver */
|
||||
pDriv = CreateLTC11Driver(argc-4,&argv[4]);
|
||||
@ -1340,6 +1342,18 @@
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if(strcmp(argv[3],"gencon") == 0) /* general controller */
|
||||
{
|
||||
/* Create a driver */
|
||||
pDriv = MakeControllerEnvironmentDriver(argc-4,&argv[4]);
|
||||
if(!pDriv)
|
||||
{
|
||||
SCWrite(pCon,
|
||||
"ERROR: failed to create Controller Environment driver",
|
||||
eError);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if(strcmp(argv[3],"euro") == 0) /* dillution driver */
|
||||
{
|
||||
/* Create a driver */
|
||||
|
Reference in New Issue
Block a user