fixes for build on windows

This commit is contained in:
2026-02-14 14:31:31 +01:00
parent c2918e79c3
commit b772b91e6e
5 changed files with 23 additions and 9 deletions
+2
View File
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
url.setHost(QString::fromStdString(location["href"].as<std::string>())); url.setHost(QString::fromStdString(location["href"].as<std::string>()));
#else #else
url.setHost(parser.value(host_option)); url.setHost(parser.value(host_option));
#if defined(__linux__)
if (parser.value(host_option).endsWith(".local")) if (parser.value(host_option).endsWith(".local"))
{ {
QProcess p; QProcess p;
@@ -85,6 +86,7 @@ int main(int argc, char *argv[])
ret[1].removeLast(); ret[1].removeLast();
url.setHost(ret[1]); url.setHost(ret[1]);
} }
#endif
#endif #endif
url.setPort(parser.value(port_option).toInt()); url.setPort(parser.value(port_option).toInt());
QString default_sim = parser.value(default_sim_option); QString default_sim = parser.value(default_sim_option);
+11 -5
View File
@@ -1,9 +1,6 @@
#include "gpio.hpp" #include "gpio.hpp"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include <filesystem> #include <filesystem>
#if __aarch64__
#else
#endif
GPIO::GPIO(QObject *parent) : QObject(parent), m_offset(0) GPIO::GPIO(QObject *parent) : QObject(parent), m_offset(0)
{ {
@@ -11,13 +8,16 @@ GPIO::GPIO(QObject *parent) : QObject(parent), m_offset(0)
GPIO::~GPIO() GPIO::~GPIO()
{ {
#if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
if (!m_request.get()) if (!m_request.get())
return; return;
m_request->release(); m_request->release();
#endif
} }
void GPIO::configure_pin(Direction dir, uint8_t gpio) void GPIO::configure_pin(Direction dir, uint8_t gpio)
{ {
#if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
if (m_request.get() != nullptr) if (m_request.get() != nullptr)
return; return;
std::filesystem::path chip_path("/dev/gpiochip0"); std::filesystem::path chip_path("/dev/gpiochip0");
@@ -56,19 +56,25 @@ void GPIO::configure_pin(Direction dir, uint8_t gpio)
SPDLOG_CRITICAL("Could not set gpio {} as input, run binary as root", gpio); SPDLOG_CRITICAL("Could not set gpio {} as input, run binary as root", gpio);
} }
} }
#else
Q_UNUSED(dir);
Q_UNUSED(gpio);
#endif
} }
void GPIO::set_value(bool value) void GPIO::set_value(bool value)
{ {
#if defined(__aarch64__) || defined(__x86_64__) #if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
if (!m_request.get()) if (!m_request.get())
return; return;
m_request->set_value(m_offset, (gpiod::line::value)value); m_request->set_value(m_offset, (gpiod::line::value)value);
#else
Q_UNUSED(value);
#endif #endif
} }
bool GPIO::value() bool GPIO::value()
{ {
#if defined(__aarch64__) || defined(__x86_64__) #if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
if (!m_request.get()) if (!m_request.get())
return false; return false;
return (bool)m_request->get_value(m_offset); return (bool)m_request->get_value(m_offset);
+3 -1
View File
@@ -2,7 +2,7 @@
#define GPIO_HPP #define GPIO_HPP
#include <QObject> #include <QObject>
#if defined(__aarch64__) || defined(__x86_64__) #if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
#include <gpiod.hpp> #include <gpiod.hpp>
#else #else
@@ -24,7 +24,9 @@ class GPIO : public QObject
bool value(); bool value();
private: private:
#if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__))
std::unique_ptr<gpiod::line_request> m_request; std::unique_ptr<gpiod::line_request> m_request;
#endif
unsigned int m_offset; unsigned int m_offset;
}; };
+2 -1
View File
@@ -14,8 +14,9 @@
return new sim(com, parent); \ return new sim(com, parent); \
} }
struct Communication class Communication
{ {
public:
CAN_Wrapper *c_if1 = nullptr; CAN_Wrapper *c_if1 = nullptr;
CAN_Wrapper *c_if2 = nullptr; CAN_Wrapper *c_if2 = nullptr;
QSerialPort *s_if1 = nullptr; QSerialPort *s_if1 = nullptr;
+5 -2
View File
@@ -1,5 +1,5 @@
# Third Party # Third Party
find_package(GTest REQUIRED) find_package(GTest)
find_package(Qt6 REQUIRED COMPONENTS Core) find_package(Qt6 REQUIRED COMPONENTS Core)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
@@ -7,7 +7,9 @@ set(CMAKE_AUTORCC ON)
# tests # tests
file(GLOB_RECURSE TEST_SOURCES "*.[hc]pp") file(GLOB_RECURSE TEST_SOURCES "*.[hc]pp")
add_executable(tests ${TEST_SOURCES}) file(GLOB_RECURSE CAN "../server/CAN/to_id.cpp")
if (GTest_FOUND)
add_executable(tests ${TEST_SOURCES} ${CAN})
target_compile_options(tests PRIVATE $<$<CONFIG:Debug>: target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
@@ -31,3 +33,4 @@ target_include_directories(tests
include(GoogleTest) include(GoogleTest)
gtest_discover_tests(tests) gtest_discover_tests(tests)
endif()