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

add logging in MccSimpleSlewingModel class

Browse Source
This commit is contained in:
Timur A. Fatkhullin
2025-11-16 00:58:56 +03:00
parent 1c774d2d69
commit e18066e4a6
7 changed files with 112 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
asibfm700/asibfm700_common.h
View File

@@ -12,6 +12,7 @@
#include <mcc_spdlog.h>
#include "mcc_ccte_erfa.h"
#include "mcc_slewing_model.h"
namespace asibfm700
{
@@ -22,6 +23,6 @@ typedef mcc::ccte::erfa::MccCCTE_ERFA Asibfm700CCTE;
typedef mcc::MccDefaultPCM<asibfm700MountType> Asibfm700PCM;
typedef mcc::MccPZoneContainer<mcc::MccTimeDuration> Asibfm700PZoneContainer;
typedef mcc::utils::MccSpdlogLogger Asibfm700Logger;
typedef mcc::MccSimpleSlewingModel Asibfm700SlewingModel;
} // namespace asibfm700

4
asibfm700/asibfm700_configfile.h
View File

@@ -220,7 +220,7 @@ static auto Asibfm700MountConfigDefaults = std::make_tuple(
// encoders polling interval in millisecs
simple_config_record_t{"EncoderReqInterval",
std::chrono::milliseconds(50),
std::chrono::milliseconds(1),
{"encoders polling interval in millisecs"}},
// mount axes rate calculation interval in millisecs
@@ -746,7 +746,7 @@ public:
fst << "\n";
};
[&wrec, this]<size_t... Is>(std::index_sequence<Is...>) {
[&wrec]<size_t... Is>(std::index_sequence<Is...>) {
(wrec.operator()<Is>(), ...);
}(std::make_index_sequence<std::tuple_size_v<decltype(Asibfm700MountConfigDefaults)>>());

4
asibfm700/asibfm700_mount.cpp
View File

@@ -18,7 +18,7 @@ Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_p
gm_class_t(std::make_tuple(config.servoControllerConfig()),
std::make_tuple(this),
std::make_tuple(),
std::make_tuple(this),
std::make_tuple(this, this),
std::make_tuple(this),
std::make_tuple(logger, Asibfm700Logger::LOGGER_DEFAULT_FORMAT)),
// base_gm_class_t(Asibfm700StartState{},
@@ -31,7 +31,7 @@ Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_p
_mountConfig(config),
_mountConfigMutex(new std::mutex)
{
addMarkToPatternIdx("[ASIB-MOUNT]");
gm_class_t::addMarkToPatternIdx("[ASIB-MOUNT]");
logDebug("Create Asibfm700Mount class instance ({})", this->getThreadId());

19
asibfm700/asibfm700_mount.h
View File

@@ -21,14 +21,14 @@ class Asibfm700Mount : public Asibfm700CCTE,
public mcc::MccGenericMount<AsibFM700ServoController,
mcc::MccTelemetry,
Asibfm700PZoneContainer,
mcc::MccSimpleSlewingModel,
Asibfm700SlewingModel,
mcc::MccSimpleTrackingModel,
Asibfm700Logger>
{
typedef mcc::MccGenericMount<AsibFM700ServoController,
mcc::MccTelemetry,
Asibfm700PZoneContainer,
mcc::MccSimpleSlewingModel,
Asibfm700SlewingModel,
mcc::MccSimpleTrackingModel,
Asibfm700Logger>
gm_class_t;
@@ -41,11 +41,16 @@ public:
using Asibfm700CCTE::updateLeapSeconds;
using Asibfm700CCTE::updateMeteoERFA;
using Asibfm700Logger::logCritical;
using Asibfm700Logger::logDebug;
using Asibfm700Logger::logError;
using Asibfm700Logger::logInfo;
using Asibfm700Logger::logWarn;
using gm_class_t::logCritical;
using gm_class_t::logDebug;
using gm_class_t::logError;
using gm_class_t::logInfo;
using gm_class_t::logWarn;
// using Asibfm700Logger::logCritical;
// using Asibfm700Logger::logDebug;
// using Asibfm700Logger::logError;
// using Asibfm700Logger::logInfo;
// using Asibfm700Logger::logWarn;
// using Asibfm700PZoneContainer::addPZone;