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

Merge branch 'master' into format-code

Browse source
This commit is contained in:
Steffen Vogel 2024-02-13 16:25:36 +01:00 • committed by GitHub
commit 419e29540e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.devcontainer/devcontainer.json
View file

@ -8,13 +8,16 @@
"image": "registry.git.rwth-aachen.de/acs/public/villas/node/dev-vscode", "image": "registry.git.rwth-aachen.de/acs/public/villas/node/dev-vscode",
// Uncomment to build the devcontainer locally // Uncomment to build the devcontainer locally
// "build": { // "build": {
// "dockerfile": "${workspaceFolder}/packaging/docker/Dockerfile.fedora", // "dockerfile": "../packaging/docker/Dockerfile.fedora",
// "target": "dev-vscode", // "target": "dev-vscode",
// "context": ".." // "context": ".."
// }, // },
"remoteUser": "villas", "remoteUser": "villas",
"runArgs": [ "--privileged", "--security-opt", "seccomp=unconfined"], "runArgs": [
"--privileged",
"--security-opt",
"seccomp=unconfined"
],
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [

2
README.md
View file

@ -12,7 +12,7 @@ VILLASnode is a client/server application to connect simulation equipment and so
- LabView, - LabView,
- and FPGA models - and FPGA models
by using protcols such as: by using protocols such as:
- IEEE 802.2 Ethernet / IP / UDP, - IEEE 802.2 Ethernet / IP / UDP,
- ZeroMQ & nanomsg, - ZeroMQ & nanomsg,

1
include/villas/nodes/modbus.hpp
View file

@ -8,7 +8,6 @@
#pragma once #pragma once
#include <algorithm> #include <algorithm>
#include <bit>
#include <numeric> #include <numeric>
#include <optional> #include <optional>
#include <stdint.h> #include <stdint.h>

2
packaging/deps.sh
View file

@ -62,7 +62,7 @@ should_build() {
## Build configuration ## Build configuration
# Use shallow git clones to speed up downloads # Use shallow git clones to speed up downloads
GIT_OPTS+=" --depth=1" GIT_OPTS+=" --depth=1 --config advice.detachedHead=false"
# Install destination # Install destination
PREFIX=${PREFIX:-/usr/local} PREFIX=${PREFIX:-/usr/local}

1
python/examples/Shmem_CIGRE_MV.py
View file

@ -3,6 +3,7 @@ Author: Steffen Vogel <post@steffenvogel.de>
SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
SPDX-License-Identifier: Apache-2.0 SPDX-License-Identifier: Apache-2.0
""" # noqa: E501 """ # noqa: E501
import time import time
from villas.node.node import Node as VILLASnode from villas.node.node import Node as VILLASnode

15
python/pyproject.toml
View file

@ -20,13 +20,16 @@ classifiers = [
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
] ]
dependencies = ['linuxfd', 'requests'] dependencies = [
'linuxfd==1.5',
'requests==2.31.0',
]
optional-dependencies.dev = [ optional-dependencies.dev = [
'black', 'black==24.2.0',
'flake8', 'flake8==7.0.0',
'mypy', 'mypy==1.8.0',
'pytest', 'pytest==8.0.0',
'types-requests', 'types-requests==2.31.0.20240125',
] ]
[project.urls] [project.urls]