Added getnmon and getnumchan to the counter and scan commands so we can retrieve the number of available monitors.

r1650 | ffr | 2007-03-14 13:56:20 +1100 (Wed, 14 Mar 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-03-14 13:56:20 +11:00
committed by Douglas Clowes
parent 3fdf28282a
commit 848448de38
2 changed files with 13 additions and 3 deletions

View File

@@ -778,8 +778,9 @@
{"mode",1,{FUPAOPT}}, {"mode",1,{FUPAOPT}},
{"preset",1,{FUPAOPT}}, {"preset",1,{FUPAOPT}},
{"send",0,{0,0}}, {"send",0,{0,0}},
{"setpar",3,{FUPATEXT,FUPAINT,FUPAFLOAT}}, {"setpar",3,{FUPATEXT,FUPAINT,FUPAFLOAT}},
{"getpar",2,{FUPATEXT,FUPAOPT}} {"getpar",2,{FUPATEXT,FUPAOPT}},
{"getnmon",0,{0,0}}
}; };
char *pMode[] = { char *pMode[] = {
"timer", "timer",
@@ -795,7 +796,7 @@
/* parse function args */ /* parse function args */
argtolower(argc,argv); argtolower(argc,argv);
argx = &argv[1]; argx = &argv[1];
iRet = EvaluateFuPa((pFuncTemplate)&ActionTemplate,22,argc-1,argx,&PaRes); iRet = EvaluateFuPa((pFuncTemplate)&ActionTemplate,23,argc-1,argx,&PaRes);
if(iRet < 0) if(iRet < 0)
{ {
sprintf(pBueffel,"%s",PaRes.pError); sprintf(pBueffel,"%s",PaRes.pError);
@@ -1134,6 +1135,10 @@
return 0; return 0;
} }
break; break;
case 22: /* getnmon */
snprintf(pBueffel,131,"%s.getnmon = %ld", argv[0], GetNMonitor(self));
SCWrite(pCon,pBueffel,eValue);
break;
default: default:
assert(0); /* internal error */ assert(0); /* internal error */
} }

5
scan.c
View File

@@ -2232,6 +2232,11 @@ static int DumpScan(pScanData self, SConnection *pCon)
} }
return iRet; return iRet;
} }
/*----------- getnumchan */
else if(strcmp(argv[1],"getnumchan") == 0) {
snprintf(pBueffel,511,"%s.getnumchan = %ld", argv[0], GetNMonitor((pCounter)self->pCounterData));
SCWrite(pCon,pBueffel,eValue);
}
/*----------- setchannel */ /*----------- setchannel */
else if(strcmp(argv[1],"setchannel") == 0) else if(strcmp(argv[1],"setchannel") == 0)
{ {