mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
Merge branch 'ci-fixes' into 'master'
CI fixes See merge request acs/public/villas/VILLASnode!50
This commit is contained in:
commit
2480030717
3 changed files with 18 additions and 20 deletions
|
@ -65,7 +65,7 @@ prepare:debian-arm64:docker-dev:
|
|||
# Stage: build
|
||||
##############################################################################
|
||||
|
||||
build:base:
|
||||
build:fedora:x86_64:
|
||||
stage: build
|
||||
script:
|
||||
- mkdir -p build && cd build
|
||||
|
@ -79,35 +79,33 @@ build:base:
|
|||
tags:
|
||||
- docker
|
||||
|
||||
build:fedora:x86_64:
|
||||
extends: build:base
|
||||
|
||||
build:fedora-minimal:x86_64:
|
||||
extends: build:base
|
||||
extends: build:fedora:x86_64
|
||||
variables:
|
||||
CMAKE_OPTS: -DWITH_HOOKS=OFF -DWITH_WEB=OFF -DWITH_API=OFF -DWITH_CONFIG=OFF -DWITH_SRC=OFF -DWITH_TOOLS=OFF -DWITH_TESTS=OFF -DWITH_PLUGINS=OFF -DWITH_CLIENTS=OFF -DWITH_DOC=OFF
|
||||
|
||||
build:ubuntu:x86_64:
|
||||
extends: build:base
|
||||
extends: build:fedora:x86_64
|
||||
variables:
|
||||
DOCKER_IMAGE_DEV: villas/node-dev-ubuntu
|
||||
CMAKE_OPTS: -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake -DCMAKE_PREFIX_PATH=/usr/local
|
||||
|
||||
build:raspbian:armv6l:
|
||||
extends: build:base
|
||||
extends: build:fedora:x86_64
|
||||
variables:
|
||||
DOCKER_IMAGE_DEV: villas/node-dev-raspbian
|
||||
CMAKE_OPTS: -DWITH_NODE_INFINIBAND=OFF
|
||||
when: manual
|
||||
only:
|
||||
- master
|
||||
|
||||
build:debian-multiarch:armhf:
|
||||
extends: build:base
|
||||
extends: build:fedora:x86_64
|
||||
variables:
|
||||
DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf
|
||||
CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-armhf.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/arm-linux-gnueabihf
|
||||
|
||||
build:debian-multiarch:arm64:
|
||||
extends: build:base
|
||||
extends: build:fedora:x86_64
|
||||
variables:
|
||||
DOCKER_IMAGE_DEV: villas/node-dev-debian-arm64
|
||||
CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-arm64.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/aarch64-linux-gnu
|
||||
|
|
|
@ -110,8 +110,8 @@ int msg_from_sample(struct msg *msg_in, struct sample *smp, struct vlist *signal
|
|||
{
|
||||
msg_in->type = MSG_TYPE_DATA;
|
||||
msg_in->version = MSG_VERSION;
|
||||
msg_in->rsvd1 = 0;
|
||||
msg_in->resv2 = 0;
|
||||
msg_in->reserved1 = 0;
|
||||
msg_in->reserved2 = 0;
|
||||
msg_in->length = (uint16_t) smp->length;
|
||||
msg_in->sequence = (uint32_t) smp->sequence;
|
||||
msg_in->ts.sec = smp->ts.origin.tv_sec;
|
||||
|
|
|
@ -63,7 +63,7 @@ public:
|
|||
int ret;
|
||||
json_error_t err;
|
||||
|
||||
assert(state != STATE_STARTED);
|
||||
assert(state != State::STARTED);
|
||||
|
||||
ret = json_unpack_ex(cfg, &err, 0, "{ s: i, s?: f }",
|
||||
"signal_index", &idx,
|
||||
|
@ -74,12 +74,12 @@ public:
|
|||
|
||||
info("parsed config thresh=%f signal_index=%d", thresh, idx);
|
||||
|
||||
state = STATE_PARSED;
|
||||
state = State::PARSED;
|
||||
}
|
||||
|
||||
virtual int process(sample *smp)
|
||||
virtual villas::node::Hook::Reason process(sample *smp)
|
||||
{
|
||||
assert(state == STATE_STARTED);
|
||||
assert(state == State::STARTED);
|
||||
|
||||
/* Get value of PPS signal */
|
||||
float value = smp->data[idx].f; // TODO check if it is really float
|
||||
|
@ -109,7 +109,7 @@ public:
|
|||
lastValue = value;
|
||||
|
||||
if (edgeCounter < 2)
|
||||
return HOOK_SKIP_SAMPLE;
|
||||
return Hook::Reason::SKIP_SAMPLE;
|
||||
else if (edgeCounter == 2 && isEdge)
|
||||
realTime.tv_nsec = 0;
|
||||
else
|
||||
|
@ -122,9 +122,9 @@ public:
|
|||
|
||||
/* Update timestamp */
|
||||
smp->ts.origin = realTime;
|
||||
smp->flags |= SAMPLE_HAS_TS_ORIGIN;
|
||||
smp->flags |= (int) SampleFlags::HAS_TS_ORIGIN;
|
||||
|
||||
return HOOK_OK;
|
||||
return Hook::Reason::OK;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -132,7 +132,7 @@ public:
|
|||
static HookPlugin<PpsTsHook> p(
|
||||
"pps_ts",
|
||||
"Timestamp samples based GPS PPS signal",
|
||||
HOOK_NODE_READ | HOOK_NODE_WRITE | HOOK_PATH,
|
||||
(int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH,
|
||||
99
|
||||
);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue