eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2025-10-21 22:35:45 +03:00
parent 49a2e2f9c1
commit e50fbfc57e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asibfm700/CMakeLists.txt
View File

@ -40,7 +40,9 @@ set(ASIBFM700_LIB asibfm700mount)
add_library(${ASIBFM700_LIB} STATIC ${ASIBFM700_LIB_SRC}
asibfm700_mount.h asibfm700_mount.cpp
asibfm700_configfile.h
asibfm700_netserver.cpp)
asibfm700_netserver.cpp
asibfm700_netserver.h)
target_include_directories(${ASIBFM700_LIB} PRIVATE mcc spdlog ${ERFA_INCLUDE_DIR})
target_link_libraries(${ASIBFM700_LIB} PRIVATE mcc spdlog)

6
mcc/mcc_netserver.h
View File

@ -99,10 +99,10 @@ public:
logInfo(std::format("Create mount server instance (thread ID = {})", st.str()));
}
template <typename... LoggerArgsTs>
MccNetworkServer(asio::io_context& ctx, const handle_message_func_t& func, LoggerArgsTs&&... log_args)
template <typename... LoggerCtorArgsTs>
MccNetworkServer(asio::io_context& ctx, const handle_message_func_t& func, LoggerCtorArgsTs&&... log_args)
requires(not std::same_as<LoggerT, MccNullLogger>)
: LoggerT(std::forward<LoggerArgsTs>(log_args)...),
: LoggerT(std::forward<LoggerCtorArgsTs>(log_args)...),
_asioContext(ctx),
_handleMessageFunc(func),
_stopSignal(ctx),

12
mcc/mcc_netserver_proto.h
View File

@ -403,16 +403,16 @@ bool mcc_netmsg_get_cpoint(mcc_netmsg_parse_result_c auto const& parse_res,
case mcc::MccCoordPairKind::COORDS_KIND_RADEC_ICRS:
case mcc::MccCoordPairKind::COORDS_KIND_RADEC_APP:
case mcc::MccCoordPairKind::COORDS_KIND_HADEC_APP:
ang1 = utils::parsAngleString(parse_res.params[from_idx], true);
ang1 = mcc::utils::parsAngleString(parse_res.params[from_idx], true);
break;
default:
ang1 = utils::parsAngleString(parse_res.params[from_idx]);
ang1 = mcc::utils::parsAngleString(parse_res.params[from_idx]);
}
if (!ang1) {
return false;
}
ang2 = utils::parsAngleString(parse_res.params[from_idx + 1]);
ang2 = mcc::utils::parsAngleString(parse_res.params[from_idx + 1]);
if (!ang2) {
return false;
}
@ -575,17 +575,17 @@ protected:
case mcc::MccCoordPairKind::COORDS_KIND_RADEC_ICRS:
case mcc::MccCoordPairKind::COORDS_KIND_RADEC_APP:
case mcc::MccCoordPairKind::COORDS_KIND_HADEC_APP:
ang1 = utils::parsAngleString(vs[0], true);
ang1 = mcc::utils::parsAngleString(vs[0], true);
break;
default:
// if sexagesimal then degrees:arcminutes:arcseconds form
ang1 = utils::parsAngleString(vs[0]);
ang1 = mcc::utils::parsAngleString(vs[0]);
}
if (!ang1) {
return std::make_error_code(std::errc::invalid_argument);
}
ang2 = utils::parsAngleString(vs[1]);
ang2 = mcc::utils::parsAngleString(vs[1]);
if (!ang2) {
return std::make_error_code(std::errc::invalid_argument);
}