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

added uldaq config to enable external clock source

Browse source 
Signed-off-by: Matthias Marcus Nowak <marcus.nowak@rwth-aachen.de>
This commit is contained in:
matthiasnowak 2024-11-25 11:34:13 +01:00 • committed by Matthias Marcus Nowak
parent 6f82ce39b6
commit ff691b27a6
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/nodes/uldaq.cpp
View file

@ -85,6 +85,12 @@ static const struct {
{"unipolar-0.01", UNIPT01VOLTS, 0.0, +0.01},
{"unipolar-0.005", UNIPT005VOLTS, 0.0, +0.005}};
static const struct {
const char *name;
ScanOption clock_source;
} clock_sources[] = {{"internal", (ScanOption)( 0 << 4)},
{"external", SO_EXTCLOCK}};
static AiInputMode uldaq_parse_input_mode(const char *str) {
for (unsigned i = 0; i < ARRAY_LEN(input_modes); i++) {
if (!strcmp(input_modes[i].name, str))
@ -121,6 +127,15 @@ static Range uldaq_parse_range(const char *str) {
return (Range)-1;
}
static ScanOption uldaq_parse_clock_source(const char *str) {
for (unsigned i = 0; i < ARRAY_LEN(clock_sources); i++) {
if (!strcmp(clock_sources[i].name, str))
return clock_sources[i].clock_source;
}
return (ScanOption)( 0 << 4);
}
static DaqDeviceDescriptor *uldaq_find_device(struct uldaq *u) {
DaqDeviceDescriptor *d = nullptr;
@ -254,6 +269,7 @@ int villas::node::uldaq_parse(NodeCompat *n, json_t *json) {
const char *default_range_str = nullptr;
const char *default_input_mode_str = nullptr;
const char *interface_type = nullptr;
const char *sample_clock_source = nullptr;
size_t i;
json_t *json_signals;
@ -261,10 +277,12 @@ int villas::node::uldaq_parse(NodeCompat *n, json_t *json) {
json_error_t err;
ret = json_unpack_ex(
json, &err, 0, "{ s?: s, s?: s, s: { s: o, s: F, s?: s, s?: s } }",
json, &err, 0,
"{ s?: s, s?: s, s: { s: o, s: F, s?: s, s?: s, s?: s } }",
"interface_type", &interface_type, "device_id", &u->device_id, "in",
"signals", &json_signals, "sample_rate", &u->in.sample_rate, "range",
&default_range_str, "input_mode", &default_input_mode_str);
&default_range_str, "input_mode", &default_input_mode_str,
"sample_clock_source", &sample_clock_source);
if (ret)
throw ConfigError(json, err, "node-config-node-uldaq");
@ -277,6 +295,15 @@ int villas::node::uldaq_parse(NodeCompat *n, json_t *json) {
u->device_interface_type = (DaqDeviceInterface)iftype;
}
if (sample_clock_source) {
int clksrc = uldaq_parse_clock_source(sample_clock_source);
if(clksrc < 0) {
throw ConfigError(json, "node-config-node-uldaq-clock_source",
"Invalid clock source type: {}", sample_clock_source);
}
u->in.scan_options = (ScanOption) (u->in.scan_options | clksrc);
}
if (u->in.queues)
delete[] u->in.queues;