...
This commit is contained in:
@@ -110,13 +110,11 @@ struct MccGenericFsmMountCategory : public std::error_category {
|
||||
inline std::error_code make_error_code(MccGenericMountErrorCode ec)
|
||||
{
|
||||
return std::error_code(static_cast<int>(ec), MccGenericMountCategory::get());
|
||||
// return std::error_code(static_cast<int>(ec), std::generic_category());
|
||||
}
|
||||
|
||||
inline std::error_code make_error_code(MccGenericFsmMountErrorCode ec)
|
||||
{
|
||||
return std::error_code(static_cast<int>(ec), MccGenericFsmMountCategory::get());
|
||||
// return std::error_code(static_cast<int>(ec), std::generic_category());
|
||||
}
|
||||
|
||||
|
||||
@@ -126,14 +124,12 @@ template <mcc_hardware_c HardwareT,
|
||||
mcc_pzone_container_c PZoneContT,
|
||||
mcc_slewing_model_c SlewModelT,
|
||||
mcc_tracking_model_c TrackModelT,
|
||||
// mcc_guiding_model_c GuidingModelT,
|
||||
mcc_logger_c LoggerT = MccNullLogger>
|
||||
class MccGenericMount : public HardwareT,
|
||||
public TelemetryT,
|
||||
public PZoneContT,
|
||||
public SlewModelT,
|
||||
public TrackModelT,
|
||||
// public GuidingModelT,
|
||||
public LoggerT
|
||||
{
|
||||
public:
|
||||
@@ -145,7 +141,6 @@ public:
|
||||
using LoggerT::logWarn;
|
||||
|
||||
|
||||
// using typename GuidingModelT::guiding_params_t;
|
||||
using typename SlewModelT::slewing_params_t;
|
||||
using typename TrackModelT::tracking_params_t;
|
||||
|
||||
@@ -191,14 +186,14 @@ public:
|
||||
|
||||
error_t initMount()
|
||||
{
|
||||
logInfo("Start mount initialization ...");
|
||||
logInfo("Start generic mount initialization ...");
|
||||
|
||||
auto hw_err = this->hardwareInit();
|
||||
if (hw_err) {
|
||||
return mcc_deduce_error_code(hw_err, MccGenericMountErrorCode::ERROR_HW_STOP);
|
||||
}
|
||||
|
||||
logInfo("Mount initialization was performed");
|
||||
logInfo("Generic mount initialization was performed");
|
||||
|
||||
return MccGenericMountErrorCode::ERROR_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user