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-07-17 11:29:40 +03:00
parent 49db4aef08
commit e7c2826b5c
6 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cxx/CMakeLists.txt
View File

@ -116,7 +116,7 @@ add_subdirectory(fitpack)
set(CNTR_PROTO_LIB_SRC set(CNTR_PROTO_LIB_SRC
control_proto.h control_proto.h
control_proto.cpp control_proto.cpp
utils.h mcc_utils.h
) )
set(CNTR_PROTO_LIB comm_proto) set(CNTR_PROTO_LIB comm_proto)
@ -124,7 +124,7 @@ add_library(${CNTR_PROTO_LIB} STATIC ${CNTR_PROTO_LIB_SRC})
set(MCC_LIBRARY_SRC mcc_mount_concepts.h mcc_mount.h mcc_mount_coord.h mcc_mount_events_states.h mcc_finite_state_machine.h set(MCC_LIBRARY_SRC mcc_mount_concepts.h mcc_mount.h mcc_mount_coord.h mcc_mount_events_states.h mcc_finite_state_machine.h
mcc_mount_pec.h mcc_mount_pz.h mcc_traits.h mcc_mount_telemetry.h mcc_mount_config.h mcc_mount_astro_erfa.h mcc_astrom_iers.h mcc_astrom_iers_default.h) mcc_mount_pec.h mcc_mount_pz.h mcc_traits.h mcc_mount_telemetry.h mcc_mount_config.h mcc_mount_astro_erfa.h mcc_astrom_iers.h mcc_astrom_iers_default.h mcc_utils.h)
set(MCC_LIBRARY mcc) set(MCC_LIBRARY mcc)
add_library(${MCC_LIBRARY} INTERFACE ${MCC_LIBRARY_SRC}) add_library(${MCC_LIBRARY} INTERFACE ${MCC_LIBRARY_SRC})
target_compile_features(${MCC_LIBRARY} INTERFACE cxx_std_23) target_compile_features(${MCC_LIBRARY} INTERFACE cxx_std_23)

2
cxx/mcc_astrom_iers.h
View File

@ -15,7 +15,7 @@
#include "mcc_astrom_iers_default.h" #include "mcc_astrom_iers_default.h"
#include "mcc_traits.h" #include "mcc_traits.h"
#include "utils.h" #include "mcc_utils.h"
namespace mcc::astrom::iers namespace mcc::astrom::iers
{ {

2
cxx/mcc_mount.h
View File

@ -24,13 +24,11 @@ namespace mcc
{ {
// template <traits::mcc_mount_config_c MOUNT_CONFIG, traits::mcc_mount_telemetry_c MOUNT_TELEMETRY>
template <traits::mcc_mount_config_c MOUNT_CONFIG> template <traits::mcc_mount_config_c MOUNT_CONFIG>
class MccMount : public fsm::MccFiniteStateMachine, public utils::MccSpdlogLogger class MccMount : public fsm::MccFiniteStateMachine, public utils::MccSpdlogLogger
{ {
public: public:
typedef MOUNT_CONFIG mount_config_t; typedef MOUNT_CONFIG mount_config_t;
// typedef MOUNT_TELEMETRY mount_telemetry_t;
typedef decltype(mount_config_t::telemetry) mount_telemetry_t; typedef decltype(mount_config_t::telemetry) mount_telemetry_t;
typedef typename mount_telemetry_t::mount_telemetry_data_t mount_telemetry_data_t; typedef typename mount_telemetry_t::mount_telemetry_data_t mount_telemetry_data_t;

6
cxx/mcc_mount_concepts.h
View File

@ -153,7 +153,7 @@ concept mcc_astrom_engine_c = requires(T t, const T t_const) {
/* A VERY GENERIC MOUNT HARDWARE CONCEPT */ /* A VERY GENERIC MOUNT HARDWARE CONCEPT */
template <typename T> template <typename T>
concept mcc_mount_hardware_c = requires(T t, const T t_const) { concept mcc_mount_hardware_c = !std::copyable<T> && std::movable<T> && requires(T t, const T t_const) {
requires mcc_error_c<typename T::error_t>; requires mcc_error_c<typename T::error_t>;
typename T::time_point_t; typename T::time_point_t;
@ -374,10 +374,6 @@ concept mcc_prohibited_zone_c =
template <typename T> template <typename T>
concept mcc_mount_config_c = std::movable<T> && requires(T t) { concept mcc_mount_config_c = std::movable<T> && requires(T t) {
// { t.astromEngine() } -> mcc_astrom_engine_c;
// { t.pec() } -> mcc_mount_pec_c;
// { t.hardware() } -> mcc_mount_hardware_c;
requires mcc_astrom_engine_c<decltype(t.astrometryEngine)>; requires mcc_astrom_engine_c<decltype(t.astrometryEngine)>;
requires mcc_mount_pec_c<decltype(t.PEC)>; requires mcc_mount_pec_c<decltype(t.PEC)>;
requires mcc_mount_hardware_c<decltype(t.hardware)>; requires mcc_mount_hardware_c<decltype(t.hardware)>;

2
cxx/mcc_mount_coord.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "mcc_traits.h" #include "mcc_traits.h"
#include "utils.h" #include "mcc_utils.h"
constexpr double operator""_rads(long double val) // angle in radians (no conversion) constexpr double operator""_rads(long double val) // angle in radians (no conversion)
{ {

0
cxx/utils.h → cxx/mcc_utils.h
View File