Skip to content

Commit dc9bb1c

Browse files
committed
Merge remote-tracking branch 'origin/master' into node-delta-sharing
2 parents c375ea8 + eb5ebfa commit dc9bb1c

127 files changed

Lines changed: 2764 additions & 1619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@ IncludeCategories:
2222
Priority: 2
2323
- Regex: '^".*"$'
2424
Priority: 4
25+
26+
# Add libjansson foreach macros
27+
ForEachMacros:
28+
- 'json_array_foreach'
29+
- 'json_object_foreach'
30+
- 'json_object_foreach_safe'
31+
- 'json_object_keylen_foreach'
32+
- 'json_object_keylen_foreach_safe'

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ build:openapi:
141141
needs: []
142142
image: node:24-alpine
143143
script:
144-
- npx -y @redocly/cli build-docs doc/openapi/openapi.yaml --output openapi.html
144+
- npx -y @redocly/cli lint --config doc/redocly.yaml doc/openapi/openapi.yaml
145+
- npx -y @redocly/cli build-docs --config doc/redocly.yaml doc/openapi/openapi.yaml --output openapi.html
145146
artifacts:
146147
paths:
147148
- openapi.html

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ if(${NO_EVENTFD})
7272
endif()
7373

7474
# Check packages
75+
find_package(CURL 7.29 REQUIRED)
76+
find_package(fmt REQUIRED)
77+
find_package(OpenSSL 1.0.0 REQUIRED)
7578
find_package(PkgConfig REQUIRED)
79+
find_package(spdlog REQUIRED)
7680
find_package(Threads REQUIRED)
7781
find_package(OpenMP)
7882
find_package(IBVerbs)
@@ -96,7 +100,6 @@ if(NOT PASTE)
96100
message(SEND_ERROR "GNU paste is missing. Please install coreutils")
97101
endif()
98102

99-
100103
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig")
101104

102105
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.13)
@@ -180,9 +183,10 @@ else()
180183
endif()
181184

182185
# Build options
183-
cmake_dependent_option(WITHOUT_GPL "Build VILLASnode without any GPL code" OFF "" ON)
186+
option(LOG_COLOR_DISABLE "Disable any colored log output" OFF)
187+
option(WITHOUT_GPL "Build VILLASnode without any GPL code" OFF)
188+
option(WITH_DEFAULTS "Defaults for non required build options" ON)
184189
cmake_dependent_option(WITH_GHC_FS "Build using ghc::filesystem, a drop in replacement for std::filesystem" ON "STDCXX_FS_NOT_FOUND" OFF)
185-
cmake_dependent_option(WITH_DEFAULTS "Defaults for non required build options" ON "" OFF)
186190
cmake_dependent_option(WITH_API "Build with remote control API" "${WITH_DEFAULTS}" "" OFF)
187191
cmake_dependent_option(WITH_CLIENTS "Build client applications" "${WITH_DEFAULTS}" "TOPLEVEL_PROJECT" OFF)
188192
cmake_dependent_option(WITH_CONFIG "Build with support for libconfig configuration syntax" "${WITH_DEFAULTS}" "LIBCONFIG_FOUND" OFF)

CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ fpga @n-eiling
2323
/etc/fpga @n-eiling
2424
/doc/openapi/components/schemas/nodes/fpga.yaml @n-eiling
2525

26+
# IEC 61850
27+
/lib/nodes/iec61850.cpp @windrad6
28+
/include/villas/nodes/iec61850.hpp @windrad6
29+
/lib/nodes/iec61850_goose.cpp @windrad6
30+
/include/villas/nodes/iec61850_goose.hpp @windrad6
31+
/lib/nodes/iec61850_sv.cpp @windrad6
32+
/include/villas/nodes/iec61850_sv.hpp @windrad6
2633

2734
# PMU
2835
/lib/nodes/libiec61850_goose.cpp @windrad6

clients/shmem/villas-shmem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class Shmem : public Tool {
8787
outsmps[i]->sequence = insmps[i]->sequence;
8888
outsmps[i]->ts = insmps[i]->ts;
8989

90-
int len = MIN(insmps[i]->length, outsmps[i]->capacity);
90+
int len = std::min(insmps[i]->length, outsmps[i]->capacity);
9191
memcpy(outsmps[i]->data, insmps[i]->data, SAMPLE_DATA_LENGTH(len));
9292

9393
outsmps[i]->length = len;

common/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,11 @@
44
# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
55
# SPDX-License-Identifier: Apache-2.0
66

7-
include(FindPkgConfig)
8-
include(FeatureSummary)
9-
include(GNUInstallDirs)
10-
11-
# Check packages
12-
find_package(OpenSSL 1.0.0 REQUIRED)
13-
find_package(CURL 7.29 REQUIRED)
14-
find_package(spdlog 1.6.0 REQUIRED)
15-
find_package(fmt 6.0.0 REQUIRED)
16-
17-
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7)
18-
pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
19-
pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23)
20-
21-
if(fmt_VERSION VERSION_LESS "9.0.0")
22-
message("Using legacy ostream formatting")
23-
set(FMT_LEGACY_OSTREAM_FORMATTER 1)
24-
endif()
25-
267
add_subdirectory(lib)
278
if(WITH_TESTS)
289
add_subdirectory(tests)
2910
endif()
3011

31-
# Disable any colored log output
32-
option(LOG_COLOR_DISABLE "Disable any colored log output" OFF)
33-
3412
configure_file(
3513
${CMAKE_CURRENT_SOURCE_DIR}/include/villas/config.hpp.in
3614
${CMAKE_CURRENT_BINARY_DIR}/include/villas/config.hpp

0 commit comments

Comments
 (0)