...

2025-10-29 18:47:24 +03:00
parent 6a72ead855
commit 50e79aa0ae
18 changed files with 273 additions and 62 deletions
--- a/asibfm700/CMakeLists.txt
+++ b/asibfm700/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

 find_package(ASIO QUIET)
 if (ASIO_FOUND)
-    # message(STATUS "ASIO library was found")
+    message(STATUS "ASIO library was found in the host system")
 else()
    message(STATUS "ASIO library was not found! Try to download it!")

@@ -33,6 +33,26 @@ else()
    find_package(ASIO)
 endif()

+find_package(cxxopts QUIET CONFIG)
+if (cxxopts_FOUND)
+    message(STATUS "CXXOPTS library was found in the host system")
+else()
+    message(STATUS "CXXOPTS library was not found! Try to download it!")
+
+    include(FetchContent)
+    include(ExternalProject)
+
+    FetchContent_Declare(cxxopts_lib
+         SOURCE_DIR ${CMAKE_BINARY_DIR}/cxxopts_lib
+         BINARY_DIR ${CMAKE_BINARY_DIR}
+         GIT_REPOSITORY "https://github.com/jarro2783/cxxopts.git"
+         GIT_TAG "v3.3.1"
+         GIT_SHALLOW TRUE
+         GIT_SUBMODULES ""
+         GIT_PROGRESS TRUE
+    )
+    FetchContent_MakeAvailable(cxxopts_lib)
+endif()

 set(ASIBFM700_LIB_SRC asibfm700_common.h asibfm700_servocontroller.h asibfm700_servocontroller.cpp)

@@ -44,8 +64,14 @@ add_library(${ASIBFM700_LIB} STATIC ${ASIBFM700_LIB_SRC}
    asibfm700_netserver.h
 )

-target_include_directories(${ASIBFM700_LIB} PRIVATE mcc spdlog ${ERFA_INCLUDE_DIR})
-target_link_libraries(${ASIBFM700_LIB} PRIVATE mcc spdlog)
+target_include_directories(${ASIBFM700_LIB} PUBLIC mcc spdlog ${ERFA_INCLUDE_DIR})
+target_link_libraries(${ASIBFM700_LIB}  mcc spdlog ${ERFA_LIBFILE})
+
+
+set(ASIBFM700_NETSERVER_APP asibfm700_netserver)
+add_executable(${ASIBFM700_NETSERVER_APP} asibfm700_netserver_main.cpp)
+# target_include_directories(${ASIBFM700_NETSERVER_APP} PRIVATE mcc spdlog)
+target_link_libraries(${ASIBFM700_NETSERVER_APP} PRIVATE mcc spdlog ${ASIBFM700_LIB})

 option(WITH_TESTS "Build tests" ON)

--- a/asibfm700/asibfm700_mount.cpp
+++ b/asibfm700/asibfm700_mount.cpp
@@ -8,22 +8,23 @@ namespace asibfm700

 /*    CONSTRUCTOR AND DESTRUCTOR    */

-Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config,
-                               std::shared_ptr<spdlog::logger> logger,
-                               const auto& pattern_range)
+Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_ptr<spdlog::logger> logger)
    : mcc::ccte::erfa::MccCCTE_ERFA({.meteo{.temperature = 10.0, .humidity = 0.5, .pressure = 1010.0},
                                     .wavelength = config.refractWavelength(),
                                     .lat = config.siteLatitude(),
                                     .lon = config.siteLongitude(),
                                     .elev = config.siteElevation()}),
      Asibfm700PCM(config.pcmData()),
-      base_gm_class_t(gm_class_t{AsibFM700ServoController{config.servoControllerConfig()}, mcc::MccTelemetry{this},
-                                 Asibfm700PZoneContainer{}, mcc::MccSimpleSlewingModel{this},
-                                 mcc::MccSimpleTrackingModel{this}, Asibfm700Logger{std::move(logger), pattern_range}},
-                      Asibfm700StartState{}),
+      base_gm_class_t(
+          gm_class_t{AsibFM700ServoController{config.servoControllerConfig()}, mcc::MccTelemetry{this},
+                     Asibfm700PZoneContainer{}, mcc::MccSimpleSlewingModel{this}, mcc::MccSimpleTrackingModel{this},
+                     Asibfm700Logger{std::move(logger), Asibfm700Logger::LOGGER_DEFAULT_FORMAT}},
+          Asibfm700StartState{}),
      _mountConfig(config),
      _mountConfigMutex(new std::mutex)
 {
+    addMarkToPatternIdx("ASIB-MOUNT");
+
    logDebug("Create Asibfm700Mount class instance ({})", this->getThreadId());

    initMount();
--- a/asibfm700/asibfm700_mount.h
+++ b/asibfm700/asibfm700_mount.h
@@ -93,9 +93,7 @@ public:

    // using Asibfm700PZoneContainer::addPZone;

-    Asibfm700Mount(Asibfm700MountConfig const& config,
-                   std::shared_ptr<spdlog::logger> logger,
-                   const auto& pattern_range = mcc::utils::MccSpdlogLogger::LOGGER_DEFAULT_FORMAT);
+    Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_ptr<spdlog::logger> logger);

    ~Asibfm700Mount();

--- a/asibfm700/asibfm700_netserver.cpp
+++ b/asibfm700/asibfm700_netserver.cpp
@@ -7,10 +7,11 @@ namespace asibfm700
 template <mcc::traits::mcc_range_of_input_char_range R>
 Asibfm700MountNetServer::Asibfm700MountNetServer(asio::io_context& ctx,
                                                 Asibfm700Mount& mount,
-                                                 std::shared_ptr<spdlog::logger> logger,
-                                                 const R& pattern_range)
-    : base_t(ctx, mount, std::move(logger), pattern_range)
+                                                 std::shared_ptr<spdlog::logger> logger)
+    : base_t(ctx, mount, std::move(logger), Asibfm700Logger::LOGGER_DEFAULT_FORMAT)
 {
+    addMarkToPatternIdx("ASIB-NETSERVER");
+
    // to avoid possible compiler optimization (one needs to catch 'mount' strictly by reference)
    auto* mount_ptr = &mount;

--- a/asibfm700/asibfm700_netserver.h
+++ b/asibfm700/asibfm700_netserver.h
@@ -139,10 +139,7 @@ class Asibfm700MountNetServer : public mcc::network::MccGenericMountNetworkServe

 public:
    template <mcc::traits::mcc_range_of_input_char_range R = decltype(Asibfm700Logger::LOGGER_DEFAULT_FORMAT)>
-    Asibfm700MountNetServer(asio::io_context& ctx,
-                            Asibfm700Mount& mount,
-                            std::shared_ptr<spdlog::logger> logger,
-                            const R& pattern_range = Asibfm700Logger::LOGGER_DEFAULT_FORMAT);
+    Asibfm700MountNetServer(asio::io_context& ctx, Asibfm700Mount& mount, std::shared_ptr<spdlog::logger> logger);

    ~Asibfm700MountNetServer();

--- a/asibfm700/asibfm700_netserver_main.cpp
+++ b/asibfm700/asibfm700_netserver_main.cpp
@@ -0,0 +1,135 @@
+#include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+
+#include <cxxopts.hpp>
+#include <iostream>
+
+#include <asio/thread_pool.hpp>
+
+#include <mcc_netserver_endpoint.h>
+#include "asibfm700_netserver.h"
+
+
+int main(int argc, char* argv[])
+{
+    /*  COMMANDLINE OPTS  */
+    cxxopts::Options options(argv[0], "Astrosib (c) BM700 mount server\n");
+
+    options.allow_unrecognised_options();
+
+    options.add_options()("h,help", "Print usage");
+
+    options.add_options()("D,daemon", "Demonize server");
+
+    options.add_options()("l,log", "Log filename (use stdout and stderr for standard output and error stream)",
+                          cxxopts::value<std::string>()->default_value(""));
+
+    options.add_options()("level", "Log level (see SPDLOG package description for valid values)",
+                          cxxopts::value<std::string>()->default_value("info"));
+
+    options.add_options()(
+        "endpoints",
+        "endpoints server will be listening for. For 'local' endpoint the '@' symbol at the beginning of the path "
+        "means "
+        "abstract namespace socket.",
+        cxxopts::value<std::vector<std::string>>()->default_value("local://stream/@BM700_SERVER"));
+
+
+    options.positional_help("[endpoint0] [enpoint1] ... [endpointN]");
+    options.parse_positional({"endpoints"});
+
+    asio::io_context ctx(2);
+
+
+    try {
+        auto opt_result = options.parse(argc, argv);
+
+        if (opt_result["help"].count()) {
+            std::cout << options.help();
+            std::cout << "\n";
+            std::cout << "[endpoint0] [enpoint1] ... [endpointN] - endpoints server will be listening for. For 'local' "
+                         "endpoint the '@' symbol at the beginning of the path "
+                         "means abstract namespace socket (e.g. local://stream/@BM700_SERVER)."
+                      << "\n";
+            return 0;
+        }
+
+
+        auto logname = opt_result["log"].as<std::string>();
+
+        auto logger = [&logname]() {
+            if (logname == "stdout") {
+                return spdlog::stdout_color_mt("console");
+            } else if (logname == "stderr") {
+                return spdlog::stderr_color_mt("stderr");
+            } else if (logname == "") {
+                return spdlog::null_logger_mt("BM700_SERVER_NULL_LOGGER");
+            } else {
+                return spdlog::basic_logger_mt(logname, logname);
+            }
+        }();
+
+        std::string level_str = opt_result["level"].as<std::string>();
+        std::ranges::transform(level_str, level_str.begin(), [](const char& c) { return std::tolower(c); });
+
+        auto log_level = spdlog::level::from_str(level_str);
+        logger->set_level(log_level);
+        logger->flush_on(spdlog::level::trace);
+
+
+        logger->set_pattern("%v");
+        int w = 90;
+        // const std::string fmt = std::format("{{:*^{}}}", w);
+        constexpr std::string_view fmt = "{{:*^90}}";
+        logger->info("\n\n\n");
+        logger->info(fmt, "");
+        logger->info(fmt, " ASTROSIB BM700 MOUNT SERVER ");
+        auto zt = std::chrono::zoned_time(std::chrono::current_zone(),
+                                          std::chrono::floor<std::chrono::seconds>(std::chrono::system_clock::now()));
+        logger->info(fmt, std::format(" {} ", zt));
+        logger->info(fmt, "");
+        logger->info("\n");
+
+
+        asibfm700::Asibfm700MountConfig mount_cfg;
+        asibfm700::Asibfm700Mount mount(mount_cfg, logger);
+        asibfm700::Asibfm700MountNetServer server(ctx, mount, logger);
+
+        server.setupSignals();
+
+        if (opt_result["daemon"].count()) {
+            server.daemonize();
+        }
+
+        // mcc::MccServerEndpoint epn(std::string_view("local://seqpacket/tmp/BM700_SERVER_SOCK"));
+        // mcc::MccServerEndpoint epn(std::string_view("local://stream/tmp/BM700_SERVER_SOCK"));
+        // mcc::MccServerEndpoint epn(std::string_view("local://stream/@tmp/BM700_SERVER_SOCK"));
+        // mcc::MccServerEndpoint epn(std::string_view("tcp://localhost:12345"));
+
+        // asio::co_spawn(ctx, server.listen(epn), asio::detached);
+
+        auto epnts = opt_result["endpoints"].as<std::vector<std::string>>();
+
+        for (auto& epnt : epnts) {
+            mcc::network::MccNetServerEndpoint ep(epnt);
+
+            if (ep.isValid()) {
+                ep.makeAbstract('@');
+
+                asio::co_spawn(ctx, server.listen(ep), asio::detached);
+            } else {
+                std::cerr << "Unrecognized endpoint: '" << epnt << "'! Ignore!\n";
+            }
+        }
+
+
+        asio::thread_pool pool(3);
+
+        asio::post(pool, [&ctx]() { ctx.run(); });
+
+        pool.join();
+        // ctx.run();
+
+    } catch (...) {
+    }
+}
--- a/asibfm700/asibfm700_servocontroller.cpp
+++ b/asibfm700/asibfm700_servocontroller.cpp
@@ -3,6 +3,47 @@
 namespace asibfm700
 {

+const char* AsibFM700ServoControllerErrorCategory::name() const noexcept
+{
+    return "ASIBFM700-ERROR-CATEGORY";
+}
+
+std::string AsibFM700ServoControllerErrorCategory::message(int ec) const
+{
+    AsibFM700ServoControllerErrorCode err = static_cast<AsibFM700ServoControllerErrorCode>(ec);
+
+    switch (err) {
+        case AsibFM700ServoControllerErrorCode::ERROR_OK:
+            return "OK";
+        case AsibFM700ServoControllerErrorCode::ERROR_FATAL:
+            return "LibServo fatal error";
+        case AsibFM700ServoControllerErrorCode::ERROR_BADFORMAT:
+            return "LibServo wrong arguments of function";
+        case AsibFM700ServoControllerErrorCode::ERROR_ENCODERDEV:
+            return "LibServo encoder device error or can't open";
+        case AsibFM700ServoControllerErrorCode::ERROR_MOUNTDEV:
+            return "LibServo mount device error or can't open";
+        case AsibFM700ServoControllerErrorCode::ERROR_FAILED:
+            return "LibServo failed to run command";
+        case AsibFM700ServoControllerErrorCode::ERROR_NULLPTR:
+            return "nullptr argument";
+        case AsibFM700ServoControllerErrorCode::ERROR_POLLING_TIMEOUT:
+            return "polling timeout";
+
+        default:
+            return "UNKNOWN";
+    }
+}
+
+
+const AsibFM700ServoControllerErrorCategory& AsibFM700ServoControllerErrorCategory::get()
+{
+    static const AsibFM700ServoControllerErrorCategory constInst;
+    return constInst;
+}
+
+
+
 AsibFM700ServoController::AsibFM700ServoController() : _hardwareConfig(), _setStateMutex(new std::mutex) {}

 AsibFM700ServoController::AsibFM700ServoController(hardware_config_t config) : AsibFM700ServoController()
@@ -16,6 +57,9 @@ AsibFM700ServoController::AsibFM700ServoController(hardware_config_t config) : A
 }


+AsibFM700ServoController::~AsibFM700ServoController() {}
+
+
 constexpr std::string_view AsibFM700ServoController::hardwareName() const
 {
    return "Sidereal-ServoControllerII";
--- a/asibfm700/asibfm700_servocontroller.h
+++ b/asibfm700/asibfm700_servocontroller.h
@@ -25,17 +25,17 @@ enum class AsibFM700ServoControllerErrorCode : int {
 };

 // error category
-struct AsibFM700HardwareErrorCategory : public std::error_category {
+struct AsibFM700ServoControllerErrorCategory : public std::error_category {
    const char* name() const noexcept;
    std::string message(int ec) const;

-    static const AsibFM700HardwareErrorCategory& get();
+    static const AsibFM700ServoControllerErrorCategory& get();
 };


 static inline std::error_code make_error_code(AsibFM700ServoControllerErrorCode ec)
 {
-    return std::error_code(static_cast<int>(ec), AsibFM700HardwareErrorCategory::get());
+    return std::error_code(static_cast<int>(ec), AsibFM700ServoControllerErrorCategory::get());
 }

 }  // namespace asibfm700