diff --git a/etc/example.conf b/etc/example.conf index 806a6919c..4da8649a5 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -1,16 +1,16 @@ -# Example configuration file for VILLASnode -# -# This example includes all valid configuration options for the server. -# Please note, that using all options at the same time does not really -# makes sense. The purpose of this example is to serve as a reference. -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Example configuration file for VILLASnode. + * + * This example includes all valid configuration options for the server. + * Please note, that using all options at the same time does not really + * makes sense. The purpose of this example is to serve as a reference. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ # Some global settings are used by multiple configuration files # and therefore defined in separate files diff --git a/etc/fpga-simple.conf b/etc/fpga-simple.conf index 530971f25..c27d8fbd6 100644 --- a/etc/fpga-simple.conf +++ b/etc/fpga-simple.conf @@ -1,16 +1,12 @@ -# Example configuration file for VILLASnode -# -# This example includes all valid configuration options for the server. -# Please note, that using all options at the same time does not really -# makes sense. The purpose of this example is to serve as a reference. -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Example configuration file for VILLASnode. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ # Some global settings are used by multiple configuration files # and therefore defined in separate files @@ -22,11 +18,11 @@ fpgas = { /* Card identification */ id = "10ee:7022"; slot = "01:00.0"; - + intc = 0x5000; reset = 0x2000; do_reset = true; - + ips = { switch_0 = { vlnv = "xilinx.com:ip:axis_interconnect:2.1" @@ -43,26 +39,20 @@ fpgas = { baseaddr = 0x1000; port = 2; irq = 0 - }, - hls_dft_0 = { - vlnv = "acs.eonerc.rwth-aachen.de:hls:hls_dft:1.0"; - port = 1; - switch = "switch_0"; } } - - /* Configure switch */ + + /* Configure switch_0 */ paths = ( - { in = "dma", out = "hls_dft" }, - { in = "hls_dft", out = "dma" } + { in = "dma_0", out = "rtds_0" }, + { in = "rtds_0", out = "dma_0" } ) } } nodes = { - dma = { + rtds = { datamover = "dma_0"; use_irqs = false; } - -} \ No newline at end of file +} diff --git a/etc/fpga.conf b/etc/fpga.conf index 43c95eb44..319b64f0f 100644 --- a/etc/fpga.conf +++ b/etc/fpga.conf @@ -1,12 +1,12 @@ -# Example configuration file for VILLASfpga / VILLASnode -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Example configuration file for VILLASfpga / VILLASnode. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ # Some global settings are used by multiple configuration files # and therefore defined in separate files diff --git a/etc/global.conf b/etc/global.conf index 32b6f9db4..19895c345 100644 --- a/etc/global.conf +++ b/etc/global.conf @@ -1,12 +1,12 @@ -# Global configuration file for VILLASnode -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Global configuration file for VILLASnode. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ ############ Global Options ############ diff --git a/etc/loopback.conf b/etc/loopback.conf index adb9538f5..e8db4b117 100644 --- a/etc/loopback.conf +++ b/etc/loopback.conf @@ -1,29 +1,33 @@ -# This is an example for a minimal loopback configuration. -# -# All messages will be sent back to the origin using UDP packets. -# -# You can use this configuration in conjunction with the 'send', 'receive' and 'random' -# utilities as shown below (run all three steps in parallel). -# -# 0. Overview: -# -# ./signal --PIPE--> ./pipe --UDP--> ./node --UDP--> ./pipe -# -# 1. Start server: -# -# $ ./node etc/loopback.conf -# -# 2. Send random data to server: -# -# $ ./signal random -r 10 -v 4 | ./pipe etc/loopback.conf node1 -# -# 3. Receive data from server: -# -# $ ./pipe etc/loopback.conf node2 -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** This is an example for a minimal loopback configuration. + * + * All messages will be sent back to the origin using UDP packets. + * + * You can use this configuration in conjunction with the 'send', 'receive' and 'random' + * utilities as shown below (run all three steps in parallel). + * + * 0. Overview: + * + * ./signal --PIPE--> ./pipe --UDP--> ./node --UDP--> ./pipe + * + * 1. Start server: + * + * $ ./node etc/loopback.conf + * + * 2. Send random data to server: + * + * $ ./signal random -r 10 -v 4 | ./pipe etc/loopback.conf node1 + * + * 3. Receive data from server: + * + * $ ./pipe etc/loopback.conf node2 + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ stats = 1; debug = 10; diff --git a/etc/plugins.conf b/etc/plugins.conf index 19f39af92..a2e11729d 100644 --- a/etc/plugins.conf +++ b/etc/plugins.conf @@ -1,16 +1,12 @@ -# Example plugins configuration file for VILLASnode -# -# This example includes all valid configuration options for the server. -# Please note, that using all options at the same time does not really -# makes sense. The purpose of this example is to serve as a reference. -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Example plugins configuration file for VILLASnode. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ ############ List of plugins ############ # diff --git a/etc/websocket-stats.conf b/etc/websocket-stats.conf index fdb89bac8..6d29f34e9 100644 --- a/etc/websocket-stats.conf +++ b/etc/websocket-stats.conf @@ -1,10 +1,14 @@ /** This should be included to all websocket node configurations which report * path stats by the 'stats_send' hook. * - * Have a look at etc/ws.conf for an example. + * Have a look at etc/websockets.conf for an example. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files * * @author Steffen Vogel - * @copyright 2016, Institute for Automation of Complex Power Systems, EONERC + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC *********************************************************************************/ series = ( diff --git a/etc/websocket.conf b/etc/websocket.conf index 2a012a0a3..e648b18d4 100644 --- a/etc/websocket.conf +++ b/etc/websocket.conf @@ -1,16 +1,12 @@ -# Example configuration file for VILLASnode -# -# This example includes all valid configuration options for the server. -# Please note, that using all options at the same time does not really -# makes sense. The purpose of this example is to serve as a reference. -# -# The syntax of this file is similar to JSON. -# A detailed description of the format can be found here: -# http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files -# -# Author: Steffen Vogel -# Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC -## +/** Example configuration file for VILLASnode. + * + * The syntax of this file is similar to JSON. + * A detailed description of the format can be found here: + * http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files + * + * @author Steffen Vogel + * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC + *********************************************************************************/ # Some global settings are used by multiple configuration files # and therefore defined in separate files