From d1a31fc52c141174c88ffe4f26016a2bb00c526b Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Tue, 17 Feb 2026 11:41:04 +0300 Subject: [PATCH] ... --- include/mcc/mcc_generic_mount.h | 44 ++++++++------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/include/mcc/mcc_generic_mount.h b/include/mcc/mcc_generic_mount.h index 3e5c922..3351945 100644 --- a/include/mcc/mcc_generic_mount.h +++ b/include/mcc/mcc_generic_mount.h @@ -108,16 +108,11 @@ inline std::error_code make_error_code(MccGenericMountErrorCode ec) -template -class MccGenericMount : protected HARDWARE_T, - public TELEMETRY_T, - public PZONE_CONT_T, - public MOVE_CNTRL_T, - public LOGGER_T +class MccGenericMount : public TELEMETRY_T, public PZONE_CONT_T, public MOVE_CNTRL_T, public LOGGER_T { public: using LOGGER_T::logDebug; @@ -143,18 +138,15 @@ public: MOUNT_STATUS_TRACKING }; - template - MccGenericMount(std::tuple hw_ctor_args, - std::tuple telemetry_ctor_args, + MccGenericMount(std::tuple telemetry_ctor_args, std::tuple pzone_cont_ctor_ars, std::tuple move_cntrl_ctor_ars, std::tuple logger_ctor_args) - : HARDWARE_T(std::make_from_tuple(std::move(hw_ctor_args))), - TELEMETRY_T(std::make_from_tuple(std::move(telemetry_ctor_args))), + : TELEMETRY_T(std::make_from_tuple(std::move(telemetry_ctor_args))), PZONE_CONT_T(std::make_from_tuple(pzone_cont_ctor_ars)), MOVE_CNTRL_T(std::make_from_tuple(move_cntrl_ctor_ars)), LOGGER_T(std::make_from_tuple(logger_ctor_args)) @@ -163,19 +155,16 @@ public: logDebug("Create MccGenericMount class instance (thread: {})", std::this_thread::get_id()); } - template requires std::derived_from - MccGenericMount(std::tuple hw_ctor_args, - std::tuple telemetry_ctor_args, + MccGenericMount(std::tuple telemetry_ctor_args, std::tuple pzone_cont_ctor_ars, std::tuple move_cntrl_ctor_ars, LoggerCtorTs... logger_ctor_args) - : HARDWARE_T(std::make_from_tuple(std::move(hw_ctor_args))), - TELEMETRY_T(std::make_from_tuple(std::move(telemetry_ctor_args))), + : TELEMETRY_T(std::make_from_tuple(std::move(telemetry_ctor_args))), PZONE_CONT_T(std::make_from_tuple(pzone_cont_ctor_ars)), MOVE_CNTRL_T(std::make_from_tuple(move_cntrl_ctor_ars)), mcc::utils::MccSpdlogLogger(logger_ctor_args...) @@ -207,22 +196,9 @@ public: { logInfo(std::format("Start MccGenericMount class initialization (thread: {}) ...", std::this_thread::get_id())); - *_lastMountError = MccGenericMountErrorCode::ERROR_OK; + *_mountStatus = mount_status_t::MOUNT_STATUS_IDLE; - *_mountStatus = mount_status_t::MOUNT_STATUS_INITIALIZATION; - - auto hw_err = this->hardwareInit(); - if (hw_err) { - *_mountStatus = mount_status_t::MOUNT_STATUS_ERROR; - - *_lastMountError = mcc_deduce_err(hw_err, MccGenericMountErrorCode::ERROR_HW_INIT); - } else { - logInfo("Generic mount initialization was performed"); - - *_mountStatus = mount_status_t::IDLE; - } - - return *_lastMountError; + return *_lastMountError = MccGenericMountErrorCode::ERROR_OK; } mount_status_t mountStatus() const