Skip to content

Commit 84816f7

Browse files
Merge branch 'master' into modify-codeowners
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
2 parents 4686a7a + ae94d1f commit 84816f7

2 files changed

Lines changed: 37 additions & 1 deletion

File tree

etc/labs/lab20.conf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-FileCopyrightText: 2014-2025 Institute for Automation of Complex Power Systems, RWTH Aachen University
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
nodes = {
5+
tcp_node = {
6+
type = "socket"
7+
8+
layer = "tcp-client"
9+
10+
format = "villas.human"
11+
12+
in = {
13+
address = "tcpbin.com:4242"
14+
}
15+
out = {
16+
address = "tcpbin.com:4242"
17+
}
18+
}
19+
siggen = {
20+
type = "signal"
21+
signal = [ "sine", "pulse", "square" ]
22+
values = 3 # Values per sample
23+
rate = 1 # Sample rate
24+
}
25+
}
26+
paths = (
27+
{
28+
in = "siggen"
29+
out = "tcp_node"
30+
hooks = ( { type = "print" } )
31+
},
32+
{
33+
in = "tcp_node" # Receive loopback answer.
34+
hooks = ( { type = "print" } )
35+
}
36+
)

fpga/include/villas/fpga/ips/dino.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class DinoAdcFactory : DinoFactory {
131131

132132
private:
133133
virtual Vlnv getCompatibleVlnv() const {
134-
return Vlnv("xilinx.com:module_ref:dinoif_fast:");
134+
return Vlnv("xilinx.com:module_ref:dinoif_adc:");
135135
}
136136
Core *make() const { return new DinoAdc; };
137137
};

0 commit comments

Comments
 (0)