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

fix: Formatting

Browse source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel 2024-11-03 10:52:12 +01:00
parent 124e59ecc7
commit 66f44c8ba4
21 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fpga/include/villas/fpga/ips/i2c.hpp
View file

@ -19,8 +19,7 @@ namespace fpga {
namespace ip { namespace ip {
#define I2C_SWTICH_ADDR 0x70 #define I2C_SWTICH_ADDR 0x70
#define I2C_SWITCH_CHANNEL_MAP \ #define I2C_SWITCH_CHANNEL_MAP {0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04}
{ 0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04 }
#define I2C_IOEXT_ADDR 0x20 #define I2C_IOEXT_ADDR 0x20
#define I2C_IOEXT_REG_DIR 0x03 #define I2C_IOEXT_REG_DIR 0x03
#define I2C_IOEXT_REG_OUT 0x01 #define I2C_IOEXT_REG_OUT 0x01

5
fpga/lib/pcie_card.cpp
View file

@ -48,8 +48,9 @@ PCIeCardFactory::make(json_t *json_card, std::string card_name,
json_error_t err; json_error_t err;
int ret = json_unpack_ex( int ret = json_unpack_ex(
json_card, &err, 0, "{ s: o, s?: i, s?: b, s?: s, s?: s, s?: b, s?: o, s?: o}", json_card, &err, 0,
"ips", &json_ips, "affinity", &affinity, "do_reset", &do_reset, "slot", "{ s: o, s?: i, s?: b, s?: s, s?: s, s?: b, s?: o, s?: o}", "ips",
&json_ips, "affinity", &affinity, "do_reset", &do_reset, "slot",
&pci_slot, "id", &pci_id, "polling", &polling, "paths", &json_paths, &pci_slot, "id", &pci_id, "polling", &polling, "paths", &json_paths,
"ignore_ips", &ignored_ips_array); "ignore_ips", &ignored_ips_array);

3
include/villas/nodes/iec61850.hpp
View file

@ -20,8 +20,7 @@
#include <villas/signal_list.hpp> #include <villas/signal_list.hpp>
#ifndef CONFIG_GOOSE_DEFAULT_DST_ADDRESS #ifndef CONFIG_GOOSE_DEFAULT_DST_ADDRESS
#define CONFIG_GOOSE_DEFAULT_DST_ADDRESS \ #define CONFIG_GOOSE_DEFAULT_DST_ADDRESS {0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01}
{ 0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01 }
#endif #endif
namespace villas { namespace villas {

4
lib/nodes/signal.cpp
View file

@ -175,8 +175,8 @@ Signal::Ptr SignalNodeSignal::toSignal(Signal::Ptr tpl) const {
} }
SignalNode::SignalNode(const uuid_t &id, const std::string &name) SignalNode::SignalNode(const uuid_t &id, const std::string &name)
: Node(id, name), task(), rt(1), rate(10), : Node(id, name), task(), rt(1), rate(10), monitor_missed(true), limit(-1),
monitor_missed(true), limit(-1), missed_steps(0) {} missed_steps(0) {}
int SignalNode::prepare() { int SignalNode::prepare() {
assert(state == State::CHECKED); assert(state == State::CHECKED);