- Added some hipadab array math
- Added missing cnvrt files, stolen from Markus - Debugged the new sinqhttpopt driver for SINQ HTTP HM - Debugged the driver for the new S7 Siemens SPS - Added handling of hexadecimal terminators to ascon.c - Increased the write buffer size in asynnet again - Fixed a core dump in lld.c - Added writing of second gen HM to nxscript.c - Added doubletime command to SICS - Fixed a core dump issue in sicshdbadapter.c on dimension changes - Modified sicsobj to look for lower case keys too SKIPPED: psi/cnvrt.c psi/cnvrt.h psi/el734hp.c psi/make_gen psi/sinqhttpopt.c psi/sinqhttpprot.c psi/spss7.c psi/swmotor.c
This commit is contained in:
24
nxscript.c
24
nxscript.c
@@ -547,7 +547,7 @@ static void putHdbOff(SConnection * pCon, SicsInterp * pSics, pNXScript self,
|
||||
|
||||
GetHipadabaPar(node, &v, pCon);
|
||||
if(offset < 0 || offset > v.arrayLength){
|
||||
SCPrintf(pCon,eLogError,"ERROR: invalid offset %d speicified", offset );
|
||||
SCPrintf(pCon,eLogError,"ERROR: invalid offset %d specified", offset );
|
||||
return;
|
||||
}
|
||||
switch (v.dataType) {
|
||||
@@ -924,6 +924,8 @@ static void putSlab(SConnection * pCon, SicsInterp * pSics, pNXScript self,
|
||||
pHistMem mem = NULL;
|
||||
HistInt *histData = NULL;
|
||||
pSICSData data = NULL;
|
||||
pCounter memsec = NULL;
|
||||
pHdb node = NULL;
|
||||
|
||||
if (argc < 6) {
|
||||
SCWrite(pCon, "ERROR: insufficient number of arguments to putslab",
|
||||
@@ -956,11 +958,27 @@ static void putSlab(SConnection * pCon, SicsInterp * pSics, pNXScript self,
|
||||
if (mem != NULL) {
|
||||
histData = GetHistogramPointer(mem, pCon);
|
||||
if (histData) {
|
||||
status = NXputslab(self->fileHandle, histData, start, size);
|
||||
status = NXputslab(self->fileHandle, histData, start, size);
|
||||
if (status == NX_OK) {
|
||||
written = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* try to write second gen histogram data
|
||||
*/
|
||||
memsec = (pCounter) FindCommandData(pSics, argv[5], "HistMemSec");
|
||||
if(memsec != NULL){
|
||||
node = GetHipadabaNode(memsec->pDes->parNode,"data");
|
||||
if(data != NULL){
|
||||
SCWrite(pCon,"ERROR: ?? data node to second gen HM not found", eError);
|
||||
return;
|
||||
}
|
||||
status = NXputslab(self->fileHandle, node->value.v.intArray, start, size);
|
||||
if (status == NX_OK) {
|
||||
written = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user