From aaa96784ee9ae4e87e6a0eb635dd35c056119e24 Mon Sep 17 00:00:00 2001 From: Niklas Eiling Date: Thu, 14 Nov 2024 10:58:44 +0100 Subject: [PATCH] dpsim-villas: fix hardcoded paths Signed-off-by: Niklas Eiling --- dpsim-models/src/CMakeLists.txt | 1 - dpsim-villas/examples/cxx/FpgaExample.cpp | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dpsim-models/src/CMakeLists.txt b/dpsim-models/src/CMakeLists.txt index e438db7aa..400cefc4d 100644 --- a/dpsim-models/src/CMakeLists.txt +++ b/dpsim-models/src/CMakeLists.txt @@ -153,7 +153,6 @@ list(APPEND MODELS_SOURCES Signal/CosineFMGenerator.cpp Signal/DCGenerator.cpp ) -list(APPEND MODELS_INCLUDE_DIRS "/home/eiling/projects/villas-node/build/lib/formats") if(WITH_CIM) list(APPEND MODELS_SOURCES CIM/Reader.cpp) diff --git a/dpsim-villas/examples/cxx/FpgaExample.cpp b/dpsim-villas/examples/cxx/FpgaExample.cpp index d6e9d9267..b1064b381 100644 --- a/dpsim-villas/examples/cxx/FpgaExample.cpp +++ b/dpsim-villas/examples/cxx/FpgaExample.cpp @@ -22,11 +22,8 @@ using namespace CPS::DP; using namespace CPS::DP::Ph1; const std::string buildFpgaConfig(CommandLineArgs &args) { - // std::filesystem::path fpgaIpPath = - // "/usr/local/etc/villas/node/etc/fpga/vc707-xbar-pcie-dino/" - // "vc707-xbar-pcie-dino-v2.json"; - std::filesystem::path fpgaIpPath = "/home/eiling/projects/villas-node/etc/fpga/vc707-xbar-pcie-dino/" - "vc707-xbar-pcie.json"; + std::filesystem::path fpgaIpPath = "/usr/local/etc/villas/node/etc/fpga/vc707-xbar-pcie-dino/" + "vc707-xbar-pcie-dino.json"; if (args.options.find("ips") != args.options.end()) { fpgaIpPath = std::filesystem::path(args.getOptionString("ips"));