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

Switched to new SICS logging system

Browse Source
This commit is contained in:
koennecke
2016-02-17 16:44:53 +01:00
parent 3ec4658208
commit 972e191795
17 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
amilevel.c
View File

@ -22,7 +22,6 @@ Markus Zolliker, May 2007
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
el755driv.c
View File

@ -17,7 +17,6 @@
#include <strlutil.h> #include <strlutil.h>
#include <conman.h> #include <conman.h>
#include <servlog.h>
#include <fortify.h> #include <fortify.h>
#include "evdriver.h" #include "evdriver.h"
#include "hardsup/el755_def.h" #include "hardsup/el755_def.h"

1
euro2kdriv.c
View File

@ -22,7 +22,6 @@ Markus Zolliker, August 2005
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
eurodriv.c
View File

@ -19,7 +19,6 @@
#include <assert.h> #include <assert.h>
#include <fortify.h> #include <fortify.h>
#include <conman.h> #include <conman.h>
#include <servlog.h>
#include <fortify.h> #include <fortify.h>
#include <strlutil.h> #include <strlutil.h>

1
haakedriv.c
View File

@ -22,7 +22,6 @@ Markus Zolliker, Nov 2006
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
ighdriv.c
View File

@ -23,7 +23,6 @@ Markus Zolliker, May 2005
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
ilmdriv.c
View File

@ -20,7 +20,6 @@ Markus Zolliker, April 2005
#include <nserver.h> #include <nserver.h>
#include <interrupt.h> #include <interrupt.h>
#include <emon.h> #include <emon.h>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <rs232controller.h> #include <rs232controller.h>
#include "oxinst.h" #include "oxinst.h"

1
ipsdriv.c
View File

@ -23,7 +23,6 @@ Markus Zolliker, May 2005
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
itc4driv.c
View File

@ -44,7 +44,6 @@
#include <assert.h> #include <assert.h>
#include <fortify.h> #include <fortify.h>
#include <conman.h> #include <conman.h>
#include <servlog.h>
#include <fortify.h> #include <fortify.h>
#include <strlutil.h> #include <strlutil.h>
#include "evdriver.h" #include "evdriver.h"

1
itcdriv.c
View File

@ -23,7 +23,6 @@ Markus Zolliker, May 2005
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

1
linadriv.c
View File

@ -22,7 +22,6 @@ Markus Zolliker, Oct 2006
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

3
lmd200.c
View File

@ -21,7 +21,6 @@
#include <sicsobj.h> #include <sicsobj.h>
#include <sicshipadaba.h> #include <sicshipadaba.h>
#include <asynnet.h> #include <asynnet.h>
#include <commandlog.h>
#include <stptok.h> #include <stptok.h>
/* /*
* possible states * possible states
@ -66,7 +65,7 @@ static void doAlarm(pSICSOBJ self, char *lineBuffer)
{ {
setAlarm(self, lineBuffer); setAlarm(self, lineBuffer);
WriteToCommandLog("CERCA>> ", lineBuffer); Log(ERROR,"dev","CERCA:%s ", lineBuffer);
ServerWriteGlobal(lineBuffer, eError); ServerWriteGlobal(lineBuffer, eError);
} }

1
lsc370driv.c
View File

@ -22,7 +22,6 @@ Markus Zolliker, July 2006
#include <emon.h> #include <emon.h>
#include <evcontroller.h> #include <evcontroller.h>
#include <evcontroller.i> #include <evcontroller.i>
#include <servlog.h>
#include <sicsvar.h> #include <sicsvar.h>
#include <evdriver.i> #include <evdriver.i>
#include <rs232controller.h> #include <rs232controller.h>

3
pardef.c
View File

@ -17,7 +17,6 @@ Markus Zolliker, March 2005
#include "logger.h" #include "logger.h"
#include "pardef.h" #include "pardef.h"
#include "sugar.h" #include "sugar.h"
#include "commandlog.h"
#include "dynstring.h" #include "dynstring.h"
#define ILLNUM -2 #define ILLNUM -2
@ -174,7 +173,7 @@ int ParPrintf(void *object, int iOut, const char *fmt, ...)
if (con) { if (con) {
SCWrite(con, buf, iOut); /* writes to command log when user or manager */ SCWrite(con, buf, iOut); /* writes to command log when user or manager */
} else if (iOut >= 0) { } else if (iOut >= 0) {
WriteToCommandLog(">", buf); /* no connection, write to commandlog only */ Log(INFO,"par", "%s", buf); /* no connection, write to commandlog only */
} }
if (dyn) if (dyn)

1
slsvme.c
View File

@ -20,7 +20,6 @@
#include <unistd.h> #include <unistd.h>
#include <fortify.h> #include <fortify.h>
#include <conman.h> #include <conman.h>
#include <servlog.h>
#include <fortify.h> #include <fortify.h>
#include <sics.h> #include <sics.h>
#include "evdriver.h" #include "evdriver.h"

5
sps.c
View File

@ -30,7 +30,6 @@
#include "bit.h" #include "bit.h"
#include "sps.i" #include "sps.i"
#include "sps.h" #include "sps.h"
#include "commandlog.h"
/*--------------------- some internal defines ----------------------------*/ /*--------------------- some internal defines ----------------------------*/
#define SPSOFFLINE -10 #define SPSOFFLINE -10
@ -108,7 +107,7 @@ static int SPSCommand(pSPS self, char *pCommand, char *pReply,
default: default:
self->iLastError = iRet; self->iLastError = iRet;
getRS232Error(iRet,pError,131); getRS232Error(iRet,pError,131);
WriteToCommandLog("SYS: SPS-TROUBLE:", pError); Log(ERROR,"dev", "SPS-TROUBLE: %s", pError);
closeRS232(rs232); closeRS232(rs232);
iRet = initRS232(rs232); iRet = initRS232(rs232);
if (iRet == 0) { if (iRet == 0) {
@ -444,7 +443,7 @@ int SPSGetADC(pSPS self, int iWhich, int *iValue)
/* decode the result */ /* decode the result */
pPtr = strchr(pBueffel, 'A'); pPtr = strchr(pBueffel, 'A');
if (pPtr == NULL) { /* a silly answer was returned */ if (pPtr == NULL) { /* a silly answer was returned */
SICSLogWrite("SPS: Silly answer in SPSGetADC", eError); Log(ERROR,"dev","%s:%s", "SPS: Silly answer in SPSGetADC",pBueffel);
return 0; return 0;
} }
pPtr++; pPtr++;

2
tricssupport.c
View File

@ -78,7 +78,7 @@ static int FrameSupInterest(int iEvent, void *pEvent, void *pUser)
iFrame = (int *) pEvent; iFrame = (int *) pEvent;
assert(pCon); assert(pCon);
sprintf(pBueffel, "framenumber = %d", *iFrame); sprintf(pBueffel, "framenumber = %d", *iFrame);
SCWrite(pCon, pBueffel, eWarning); SCWrite(pCon, pBueffel, eEvent);
return 1; return 1;
} }