From ae227b097f042477ff440f339a45a7bbe58e4acc Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Tue, 3 Mar 2026 14:38:39 +0300 Subject: [PATCH] ... --- asibfm700_configfile.h | 53 +++++++++++------------------------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/asibfm700_configfile.h b/asibfm700_configfile.h index 10ff142..56cfe8f 100644 --- a/asibfm700_configfile.h +++ b/asibfm700_configfile.h @@ -309,9 +309,9 @@ static auto Asibfm700MountConfigDefaults = std::make_tuple( mcc::impl::MccAngle(0.5_arcsecs), {"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(getValue("siteLatitude").value_or(mcc::impl::MccAngle{})); }; - mcc::impl::MccAngle siteLatitude() const - { - return siteLatitude(); - }; + mcc::impl::MccAngle siteLatitude() const { return siteLatitude(); }; template T siteLongitude() const @@ -397,10 +394,7 @@ public: return static_cast(getValue("siteLongitude").value_or(mcc::impl::MccAngle{})); }; - mcc::impl::MccAngle siteLongitude() const - { - return siteLongitude(); - }; + mcc::impl::MccAngle siteLongitude() const { return siteLongitude(); }; template T siteElevation() const @@ -409,10 +403,7 @@ public: return getValue("siteElevation").value_or(0.0); } - double siteElevation() const - { - return getValue("siteElevation").value_or(0.0); - }; + double siteElevation() const { return getValue("siteElevation").value_or(0.0); }; template T refractWavelength() const @@ -421,10 +412,7 @@ public: return getValue("refractWavelength").value_or(0.0); } - double refractWavelength() const - { - return getValue("refractWavelength").value_or(0.0); - }; + double refractWavelength() const { return getValue("refractWavelength").value_or(0.0); }; template R leapSecondFilename() const @@ -437,10 +425,7 @@ public: return r; } - std::string leapSecondFilename() const - { - return leapSecondFilename(); - }; + std::string leapSecondFilename() const { return leapSecondFilename(); }; template R bulletinAFilename() const @@ -452,10 +437,7 @@ public: return r; } - std::string bulletinAFilename() const - { - return bulletinAFilename(); - }; + std::string bulletinAFilename() const { return bulletinAFilename(); }; template @@ -464,10 +446,7 @@ public: return static_cast(getValue("pzMinAltitude").value_or(mcc::impl::MccAngle{})); }; - mcc::impl::MccAngle pzMinAltitude() const - { - return pzMinAltitude(); - }; + mcc::impl::MccAngle pzMinAltitude() const { return pzMinAltitude(); }; template T pzLimitSwitchHAMin() const @@ -475,10 +454,7 @@ public: return static_cast(getValue("pzLimitSwitchHAMin").value_or(mcc::impl::MccAngle{})); }; - mcc::impl::MccAngle pzLimitSwitchHAMin() const - { - return pzLimitSwitchHAMin(); - }; + mcc::impl::MccAngle pzLimitSwitchHAMin() const { return pzLimitSwitchHAMin(); }; template T pzLimitSwitchHAMax() const @@ -486,10 +462,7 @@ public: return static_cast(getValue("pzLimitSwitchHAMax").value_or(mcc::impl::MccAngle{})); }; - mcc::impl::MccAngle pzLimitSwitchHAMax() const - { - return pzLimitSwitchHAMax(); - }; + mcc::impl::MccAngle pzLimitSwitchHAMax() const { return pzLimitSwitchHAMax(); }; AsibFM700ServoController::hardware_config_t servoControllerConfig() const @@ -571,11 +544,11 @@ public: ang = getValue("MaxGuidingErr").value_or(mcc::impl::MccAngle(0.5_arcsecs)); hw_cfg.devConfig.MaxGuidingErr = ang; - ang = getValue("XEncZero").value_or(mcc::impl::MccAngle(0.0_degs)); + ang = getValue("XEncZero").value_or(0); hw_cfg.devConfig.XEncZero = ang; - ang = getValue("YEncZero").value_or(mcc::impl::MccAngle(0.0_degs)); + ang = getValue("YEncZero").value_or(0); hw_cfg.devConfig.YEncZero = ang;