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

Change obsoleted eStatus logging to eLog or eValue

Browse Source
This commit is contained in:
Douglas Clowes
2014-05-16 11:18:20 +10:00
parent 81ed966092
commit abafa6a2e6
7 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
site_ansto/lssmonitor.c
View File

@@ -167,7 +167,7 @@ static void LSS_Notify(void* context, int event)
char line[132];
sprintf(line, "LSS_Notify: (AQU_RECONNECT)%d [%d]", AQU_RECONNECT, event);
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
pLSSController self = (pLSSController) context;
@@ -233,7 +233,7 @@ static mxml_type_t xmlLoadStringCallback(mxml_node_t *node) {
}
*/
sprintf(line, "xmlLoadStringCallback: [%s] [%s] [%s] [%s] [%s] [%s]", node->value.element.name, type, mxmlElementGetAttr(node, "description"), mxmlElementGetAttr(node, "time"), mxmlElementGetAttr(node, "tag"), value);
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
return myType;
}
@@ -257,12 +257,12 @@ static int GetCallback(pAsyncTxn txn)
pLSSController self = (pLSSController) txn->cntx;
if (resp_len <= 0) {
snprintf(line, 132, "lss1 = NO INPUT!!");
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
return 1;
}
else {
snprintf(line, 132, "lss1 = [%d] [%s]", strlen(resp), resp);
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
/* free memory from previous tree */
@@ -300,7 +300,7 @@ static int MyOneShotCallback(void* context, int mode)
self->oneshot = 0;
AsyncUnitSendTxn(self->unit, "WRITE 0", 7, NULL, NULL, 132);
sprintf(line, "lssmonitor.c: MyOneShotCallback() -> AsyncUnitSendTxn( WRITE ) ");
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
return 0;
}
@@ -320,7 +320,7 @@ static int MyTimerCallback(void* context, int mode)
AsyncUnitSendTxn(self->unit, "READ", 4, GetCallback, self, 1024*1024);
sprintf(line, "lssmonitor.c: MyTimerCallback() -> AsyncUnitSendTxn(READ 1MB)");
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
return 1;
}
@@ -339,7 +339,7 @@ static int PutCallback(pAsyncTxn txn)
sprintf(line, "lssmonitor.c: PutCallback() -> RegisterTimer ");
SICSLogWrite(line, eStatus);
SICSLogWrite(line, eLog);
return 0;
}
@@ -375,7 +375,7 @@ static int LSS_Print(SConnection *pCon, SicsInterp *pSics,
return 0;
} else {
snprintf(line, 132, "%s.%s = %s", name, param, lss_states[state]);
SCWrite(pCon, line, eStatus);
SCWrite(pCon, line, eLog);
return OKOK;
}
}
@@ -392,13 +392,13 @@ static int findElement(SConnection *pCon, const char *string) {
if (mxmlElementGetAttr(n, "version") == NULL) {
if (strcasestr(mxmlElementGetAttr(n, "description"), string) != NULL) {
snprintf(line, 132, "%s.%s %s = %s (%s)", string, mxmlElementGetAttr(n, "description"), mxmlElementGetAttr(n, "tag"), n->child->value.text.string, mxmlElementGetAttr(n, "time"));
SCWrite(pCon, line, eStatus);
SCWrite(pCon, line, eLog);
found = 1;
}
if (strcasestr(mxmlElementGetAttr(n, "tag"), string) != NULL) {
snprintf(line, 132, "%s.%s %s = %s (%s)", string, mxmlElementGetAttr(n, "description"), mxmlElementGetAttr(n, "tag"), n->child->value.text.string, mxmlElementGetAttr(n, "time"));
SCWrite(pCon, line, eStatus);
SCWrite(pCon, line, eLog);
found = 1;
}
} else {
@@ -421,7 +421,7 @@ static int LSS_Action(SConnection *pCon, SicsInterp *pSics,
pLSSController self = (pLSSController) pData;
if (argc == 1) {
snprintf(line, 132, "%s.iValue = %06X", argv[0], self->iValue & 0xffffff);
SCWrite(pCon, line, eStatus);
SCWrite(pCon, line, eLog);
return OKOK;
}
else if (argc == 2) {
@@ -434,7 +434,7 @@ static int LSS_Action(SConnection *pCon, SicsInterp *pSics,
if (mxmlElementGetAttr(node, "version") == NULL) {
snprintf(line, 132, "%s.%s %s = %s (%s)", argv[0], mxmlElementGetAttr(node, "description"), mxmlElementGetAttr(node, "tag"), node->child->value.text.string, mxmlElementGetAttr(node, "time"));
SCWrite(pCon, line, eStatus);
SCWrite(pCon, line, eLog);
}
}
}