Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Merge branch 'node-uldaq' of git.rwth-aachen.de:acs/public/villas/VILLASnode into node-uldaq

Browse source 
# Conflicts:
#	lib/nodes/uldaq.c
This commit is contained in:
Steffen Vogel 2018-09-25 10:11:28 +02:00
commit 69099a2436
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/nodes/uldaq.c
View file

@ -165,11 +165,8 @@ int uldaq_start(struct node *n)
DaqDeviceDescriptor descriptors[ULDAQ_MAX_DEV_COUNT];
Range ranges[ULDAQ_MAX_RANGE_COUNT];
unsigned int num_devs = 1, num_ranges = 0;;
int descriptor_index = 0;
UlError err = ERR_NO_ERROR;
int chanCount = 1;//change this to use more than one channel
int index = 0;
// allocate a buffer to receive the data
u->in.buffer = (double *) alloc(list_length(&n->signals) * n->in.vectorize * sizeof(double));
@ -212,7 +209,7 @@ int uldaq_start(struct node *n)
// start the acquisition
// when using the queue, the lowChan, highChan, u->in.input_mode, and range
// parameters are ignored since they are specified in u->queues
err = ulAInScan(u->device_handle, 0, 0, u->in.input_mode, 0, n->in.vectorize, &(u->in.sample_rate), u->in.scan_options, u->in.flags, u->in.buffer);
err = ulAInScan(u->device_handle, 0, 0, u->in.input_mode, 0, u->in.sample_count, &(u->in.sample_rate), u->in.scan_options, u->in.flags, u->in.buffer);
if (err == ERR_NO_ERROR) {
ScanStatus status;
TransferStatus transferStatus;