rewrite MccGenericMount and MccGenericFsmMount class creation
Asibfm700MountNetServer is now started
This commit is contained in:
@@ -15,20 +15,43 @@ Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_p
|
||||
.lon = config.siteLongitude(),
|
||||
.elev = config.siteElevation()}),
|
||||
Asibfm700PCM(config.pcmData()),
|
||||
base_gm_class_t(
|
||||
gm_class_t{AsibFM700ServoController{config.servoControllerConfig()}, mcc::MccTelemetry{this},
|
||||
Asibfm700PZoneContainer{}, mcc::MccSimpleSlewingModel{this}, mcc::MccSimpleTrackingModel{this},
|
||||
Asibfm700Logger{std::move(logger), Asibfm700Logger::LOGGER_DEFAULT_FORMAT}},
|
||||
Asibfm700StartState{}),
|
||||
base_gm_class_t(Asibfm700StartState{},
|
||||
std::make_tuple(config.servoControllerConfig()),
|
||||
std::make_tuple(this),
|
||||
std::make_tuple(),
|
||||
std::make_tuple(this),
|
||||
std::make_tuple(this),
|
||||
std::make_tuple(logger, Asibfm700Logger::LOGGER_DEFAULT_FORMAT)),
|
||||
_mountConfig(config),
|
||||
_mountConfigMutex(new std::mutex)
|
||||
{
|
||||
addMarkToPatternIdx("ASIB-MOUNT");
|
||||
addMarkToPatternIdx("[ASIB-MOUNT]");
|
||||
|
||||
logDebug("Create Asibfm700Mount class instance ({})", this->getThreadId());
|
||||
|
||||
initMount();
|
||||
}
|
||||
// Asibfm700Mount::Asibfm700Mount(Asibfm700MountConfig const& config, std::shared_ptr<spdlog::logger> logger)
|
||||
// : mcc::ccte::erfa::MccCCTE_ERFA({.meteo{.temperature = 10.0, .humidity = 0.5, .pressure = 1010.0},
|
||||
// .wavelength = config.refractWavelength(),
|
||||
// .lat = config.siteLatitude(),
|
||||
// .lon = config.siteLongitude(),
|
||||
// .elev = config.siteElevation()}),
|
||||
// Asibfm700PCM(config.pcmData()),
|
||||
// base_gm_class_t(
|
||||
// gm_class_t{AsibFM700ServoController{config.servoControllerConfig()}, mcc::MccTelemetry{this},
|
||||
// Asibfm700PZoneContainer{}, mcc::MccSimpleSlewingModel{this}, mcc::MccSimpleTrackingModel{this},
|
||||
// Asibfm700Logger{std::move(logger), Asibfm700Logger::LOGGER_DEFAULT_FORMAT}},
|
||||
// Asibfm700StartState{}),
|
||||
// _mountConfig(config),
|
||||
// _mountConfigMutex(new std::mutex)
|
||||
// {
|
||||
// addMarkToPatternIdx("ASIB-MOUNT");
|
||||
|
||||
// logDebug("Create Asibfm700Mount class instance ({})", this->getThreadId());
|
||||
|
||||
// initMount();
|
||||
// }
|
||||
|
||||
|
||||
Asibfm700Mount::~Asibfm700Mount()
|
||||
@@ -140,7 +163,7 @@ Asibfm700Mount::error_t Asibfm700Mount::initMount()
|
||||
ccte_state._leapSeconds.expireDate());
|
||||
}
|
||||
} else {
|
||||
logError("Using hardcoded leap seconds defauls (expire date: {})", ccte_state._leapSeconds.expireDate());
|
||||
logInfo("Using hardcoded leap seconds defauls (expire date: {})", ccte_state._leapSeconds.expireDate());
|
||||
}
|
||||
|
||||
if (!_mountConfig.bulletinAFilename().empty()) { // load IERS Bulletin A file
|
||||
@@ -154,8 +177,8 @@ Asibfm700Mount::error_t Asibfm700Mount::initMount()
|
||||
ccte_state._bulletinA.dateRange().begin, ccte_state._bulletinA.dateRange().end);
|
||||
}
|
||||
} else {
|
||||
logError("Using hardcoded IERS Bulletin A defauls (date range: {} - {})",
|
||||
ccte_state._bulletinA.dateRange().begin, ccte_state._bulletinA.dateRange().end);
|
||||
logInfo("Using hardcoded IERS Bulletin A defauls (date range: {} - {})",
|
||||
ccte_state._bulletinA.dateRange().begin, ccte_state._bulletinA.dateRange().end);
|
||||
}
|
||||
|
||||
setStateERFA(std::move(ccte_state));
|
||||
|
||||
Reference in New Issue
Block a user