From e7c2826b5c676983684a8db1c6dc947ec3c2455c Mon Sep 17 00:00:00 2001
From: "Timur A. Fatkhullin" <timur@sao.ru>
Date: Thu, 17 Jul 2025 11:29:40 +0300
Subject: [PATCH] ...

---
 cxx/CMakeLists.txt           | 4 ++--
 cxx/mcc_astrom_iers.h        | 2 +-
 cxx/mcc_mount.h              | 2 --
 cxx/mcc_mount_concepts.h     | 6 +-----
 cxx/mcc_mount_coord.h        | 2 +-
 cxx/{utils.h => mcc_utils.h} | 0
 6 files changed, 5 insertions(+), 11 deletions(-)
 rename cxx/{utils.h => mcc_utils.h} (100%)

diff --git a/cxx/CMakeLists.txt b/cxx/CMakeLists.txt
index db9a25d..276899d 100644
--- a/cxx/CMakeLists.txt
+++ b/cxx/CMakeLists.txt
@@ -116,7 +116,7 @@ add_subdirectory(fitpack)
 set(CNTR_PROTO_LIB_SRC
     control_proto.h
     control_proto.cpp
-    utils.h
+    mcc_utils.h
 )
 
 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
-    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)
 add_library(${MCC_LIBRARY} INTERFACE ${MCC_LIBRARY_SRC})
 target_compile_features(${MCC_LIBRARY} INTERFACE cxx_std_23)
diff --git a/cxx/mcc_astrom_iers.h b/cxx/mcc_astrom_iers.h
index 187fa8b..9b2c30f 100644
--- a/cxx/mcc_astrom_iers.h
+++ b/cxx/mcc_astrom_iers.h
@@ -15,7 +15,7 @@
 
 #include "mcc_astrom_iers_default.h"
 #include "mcc_traits.h"
-#include "utils.h"
+#include "mcc_utils.h"
 
 namespace mcc::astrom::iers
 {
diff --git a/cxx/mcc_mount.h b/cxx/mcc_mount.h
index 702e365..4194db3 100644
--- a/cxx/mcc_mount.h
+++ b/cxx/mcc_mount.h
@@ -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>
 class MccMount : public fsm::MccFiniteStateMachine, public utils::MccSpdlogLogger
 {
 public:
     typedef MOUNT_CONFIG mount_config_t;
-    // typedef MOUNT_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;
 
diff --git a/cxx/mcc_mount_concepts.h b/cxx/mcc_mount_concepts.h
index 876fce4..f5ca3ec 100644
--- a/cxx/mcc_mount_concepts.h
+++ b/cxx/mcc_mount_concepts.h
@@ -153,7 +153,7 @@ concept mcc_astrom_engine_c = requires(T t, const T t_const) {
 /*  A VERY GENERIC MOUNT HARDWARE CONCEPT   */
 
 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>;
 
     typename T::time_point_t;
@@ -374,10 +374,6 @@ concept mcc_prohibited_zone_c =
 
 template <typename 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_mount_pec_c<decltype(t.PEC)>;
     requires mcc_mount_hardware_c<decltype(t.hardware)>;
diff --git a/cxx/mcc_mount_coord.h b/cxx/mcc_mount_coord.h
index 053da3f..ac22131 100644
--- a/cxx/mcc_mount_coord.h
+++ b/cxx/mcc_mount_coord.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "mcc_traits.h"
-#include "utils.h"
+#include "mcc_utils.h"
 
 constexpr double operator""_rads(long double val)  // angle in radians (no conversion)
 {
diff --git a/cxx/utils.h b/cxx/mcc_utils.h
similarity index 100%
rename from cxx/utils.h
rename to cxx/mcc_utils.h