This commit is contained in:
2026-03-03 14:38:39 +03:00
parent b5b528fc99
commit ae227b097f

View File

@@ -309,9 +309,9 @@ static auto Asibfm700MountConfigDefaults = std::make_tuple(
mcc::impl::MccAngle(0.5_arcsecs), mcc::impl::MccAngle(0.5_arcsecs),
{"guiding 'good'-flag error cirle radius (mount-to-target distance) in degrees"}}, {"guiding 'good'-flag error cirle radius (mount-to-target distance) in degrees"}},
simple_config_record_t{"XEncZero", mcc::impl::MccAngle(0.0_degs), {"X-axis encoder zero-point in degrees"}}, simple_config_record_t{"XEncZero", (int64_t)0, {"X-axis encoder zero-point in ticks"}},
simple_config_record_t{"YEncZero", mcc::impl::MccAngle(0.0_degs), {"Y-axis encoder zero-point in degrees"}} simple_config_record_t{"YEncZero", (int64_t)0, {"Y-axis encoder zero-point in ticks"}}
); );
@@ -386,10 +386,7 @@ public:
return static_cast<double>(getValue<mcc::impl::MccAngle>("siteLatitude").value_or(mcc::impl::MccAngle{})); return static_cast<double>(getValue<mcc::impl::MccAngle>("siteLatitude").value_or(mcc::impl::MccAngle{}));
}; };
mcc::impl::MccAngle siteLatitude() const mcc::impl::MccAngle siteLatitude() const { return siteLatitude<mcc::impl::MccAngle>(); };
{
return siteLatitude<mcc::impl::MccAngle>();
};
template <mcc::mcc_angle_c T> template <mcc::mcc_angle_c T>
T siteLongitude() const T siteLongitude() const
@@ -397,10 +394,7 @@ public:
return static_cast<double>(getValue<mcc::impl::MccAngle>("siteLongitude").value_or(mcc::impl::MccAngle{})); return static_cast<double>(getValue<mcc::impl::MccAngle>("siteLongitude").value_or(mcc::impl::MccAngle{}));
}; };
mcc::impl::MccAngle siteLongitude() const mcc::impl::MccAngle siteLongitude() const { return siteLongitude<mcc::impl::MccAngle>(); };
{
return siteLongitude<mcc::impl::MccAngle>();
};
template <typename T> template <typename T>
T siteElevation() const T siteElevation() const
@@ -409,10 +403,7 @@ public:
return getValue<double>("siteElevation").value_or(0.0); return getValue<double>("siteElevation").value_or(0.0);
} }
double siteElevation() const double siteElevation() const { return getValue<double>("siteElevation").value_or(0.0); };
{
return getValue<double>("siteElevation").value_or(0.0);
};
template <typename T> template <typename T>
T refractWavelength() const T refractWavelength() const
@@ -421,10 +412,7 @@ public:
return getValue<double>("refractWavelength").value_or(0.0); return getValue<double>("refractWavelength").value_or(0.0);
} }
double refractWavelength() const double refractWavelength() const { return getValue<double>("refractWavelength").value_or(0.0); };
{
return getValue<double>("refractWavelength").value_or(0.0);
};
template <mcc::traits::mcc_output_char_range R> template <mcc::traits::mcc_output_char_range R>
R leapSecondFilename() const R leapSecondFilename() const
@@ -437,10 +425,7 @@ public:
return r; return r;
} }
std::string leapSecondFilename() const std::string leapSecondFilename() const { return leapSecondFilename<std::string>(); };
{
return leapSecondFilename<std::string>();
};
template <mcc::traits::mcc_output_char_range R> template <mcc::traits::mcc_output_char_range R>
R bulletinAFilename() const R bulletinAFilename() const
@@ -452,10 +437,7 @@ public:
return r; return r;
} }
std::string bulletinAFilename() const std::string bulletinAFilename() const { return bulletinAFilename<std::string>(); };
{
return bulletinAFilename<std::string>();
};
template <mcc::mcc_angle_c T> template <mcc::mcc_angle_c T>
@@ -464,10 +446,7 @@ public:
return static_cast<double>(getValue<mcc::impl::MccAngle>("pzMinAltitude").value_or(mcc::impl::MccAngle{})); return static_cast<double>(getValue<mcc::impl::MccAngle>("pzMinAltitude").value_or(mcc::impl::MccAngle{}));
}; };
mcc::impl::MccAngle pzMinAltitude() const mcc::impl::MccAngle pzMinAltitude() const { return pzMinAltitude<mcc::impl::MccAngle>(); };
{
return pzMinAltitude<mcc::impl::MccAngle>();
};
template <mcc::mcc_angle_c T> template <mcc::mcc_angle_c T>
T pzLimitSwitchHAMin() const T pzLimitSwitchHAMin() const
@@ -475,10 +454,7 @@ public:
return static_cast<double>(getValue<mcc::impl::MccAngle>("pzLimitSwitchHAMin").value_or(mcc::impl::MccAngle{})); return static_cast<double>(getValue<mcc::impl::MccAngle>("pzLimitSwitchHAMin").value_or(mcc::impl::MccAngle{}));
}; };
mcc::impl::MccAngle pzLimitSwitchHAMin() const mcc::impl::MccAngle pzLimitSwitchHAMin() const { return pzLimitSwitchHAMin<mcc::impl::MccAngle>(); };
{
return pzLimitSwitchHAMin<mcc::impl::MccAngle>();
};
template <mcc::mcc_angle_c T> template <mcc::mcc_angle_c T>
T pzLimitSwitchHAMax() const T pzLimitSwitchHAMax() const
@@ -486,10 +462,7 @@ public:
return static_cast<double>(getValue<mcc::impl::MccAngle>("pzLimitSwitchHAMax").value_or(mcc::impl::MccAngle{})); return static_cast<double>(getValue<mcc::impl::MccAngle>("pzLimitSwitchHAMax").value_or(mcc::impl::MccAngle{}));
}; };
mcc::impl::MccAngle pzLimitSwitchHAMax() const mcc::impl::MccAngle pzLimitSwitchHAMax() const { return pzLimitSwitchHAMax<mcc::impl::MccAngle>(); };
{
return pzLimitSwitchHAMax<mcc::impl::MccAngle>();
};
AsibFM700ServoController::hardware_config_t servoControllerConfig() const AsibFM700ServoController::hardware_config_t servoControllerConfig() const
@@ -571,11 +544,11 @@ public:
ang = getValue<mcc::impl::MccAngle>("MaxGuidingErr").value_or(mcc::impl::MccAngle(0.5_arcsecs)); ang = getValue<mcc::impl::MccAngle>("MaxGuidingErr").value_or(mcc::impl::MccAngle(0.5_arcsecs));
hw_cfg.devConfig.MaxGuidingErr = ang; hw_cfg.devConfig.MaxGuidingErr = ang;
ang = getValue<mcc::impl::MccAngle>("XEncZero").value_or(mcc::impl::MccAngle(0.0_degs)); ang = getValue<int64_t>("XEncZero").value_or(0);
hw_cfg.devConfig.XEncZero = ang; hw_cfg.devConfig.XEncZero = ang;
ang = getValue<mcc::impl::MccAngle>("YEncZero").value_or(mcc::impl::MccAngle(0.0_degs)); ang = getValue<int64_t>("YEncZero").value_or(0);
hw_cfg.devConfig.YEncZero = ang; hw_cfg.devConfig.YEncZero = ang;