Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
@@ -287,9 +287,9 @@ static hdbCallbackReturn CommandSetCallback(pHdb node, void *userData,
|
||||
}
|
||||
current = current->next;
|
||||
}
|
||||
// SendHdbStatusMessage(node,"start");
|
||||
SendHdbStatusMessage(node, "start");
|
||||
status = HDBInvoke(pCon, pServ->pSics, GetCharArray(cmd));
|
||||
// SendHdbStatusMessage(node,"stop");
|
||||
SendHdbStatusMessage(node, "stop");
|
||||
DeleteDynString(cmd);
|
||||
if (status == 1) {
|
||||
return hdbContinue;
|
||||
@@ -339,6 +339,7 @@ static int MakeCommandNode(pHdb parent, char *name, SConnection * pCon,
|
||||
node->value.v.text = strdup(argv[3]);
|
||||
node->value.arrayLength = strlen(argv[3]);
|
||||
SetHdbProperty(node, "sicscommand", argv[3]);
|
||||
SetHdbProperty(node, "scriptcommand", "yes");
|
||||
|
||||
kalle = MakeHipadabaCallback(CommandSetCallback, NULL, NULL);
|
||||
if (kalle == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user