linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sicshipacaba.c

Browse Source 
SICS-418 Make sure hnotify sends messages as hdbevents when using the
JSON protocl

site_ansto/instrument/config/hmm/hmm_object.tcl
Initialise the hmm object to make sure the read type is set.

nxscripts_common_1.tcl
Set the read type when saving the hmm data.

server_config.tcl
Fix the autosave command so that you can enable/disable autosave while
the histogram memory is running.

protocol.c
Reduce noise in log files when using the JSON protocol.  Don't log
messages generated during macro execution (ie within a TCL proc).

motor.c:MotorStatus
Abort the current operation, the scan command and batch files when a
motor object returns a hardware fault status value.

motor_dmc2280.c
set driver status to HWFault when the driver is in the error state.

r3251 | ffr | 2011-09-23 08:49:00 +1000 (Fri, 23 Sep 2011) | 25 lines
This commit is contained in:
Ferdi Franceschini
2011-09-23 08:49:00 +10:00
committed by Douglas Clowes
parent c765c33f6d
commit d778dd2bfe
7 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
protocol.c
View File

@@ -703,9 +703,11 @@ int SCWriteJSON_String(SConnection *pCon, char *pBuffer, int iOut)
{
iRet = 0;
}
sprintf(pBueffel,"Next line intended for socket: %d",iRet);
SICSLogWrite(pBueffel,eInternal);
SICSLogWrite(pBuffer,iOut);
if(pCon->iMacro != 1) {
sprintf(pBueffel,"Next line intended for socket: %d",iRet);
SICSLogWrite(pBueffel,eInternal);
SICSLogWrite(pBuffer,iOut);
}
/* write to commandlog if user or manager privilege */
if(SCGetRights(pCon) <= usUser)