This commit is contained in:
Timur A. Fatkhullin 2025-08-27 17:55:57 +03:00
parent 9fb33e5bec
commit 45f655dc90
6 changed files with 229 additions and 5 deletions

View File

@ -23,6 +23,21 @@ constexpr double operator""_arcsecs(long double val) // angle in arc seconds
return val * std::numbers::pi / 180.0 / 3600.0; return val * std::numbers::pi / 180.0 / 3600.0;
} }
constexpr double operator""_hours(long double val) // angle in hours
{
return val * std::numbers::pi / 12.0;
}
constexpr double operator""_mins(long double val) // angle in hour minutes
{
return val * std::numbers::pi / 12.0 / 60.0;
}
constexpr double operator""_secs(long double val) // angle in hour seconds
{
return val * std::numbers::pi / 12.0 / 3600.0;
}
constexpr double operator""_dms(const char* s, size_t size) // as a string "DEGREES:MINUTES:SECONDS" constexpr double operator""_dms(const char* s, size_t size) // as a string "DEGREES:MINUTES:SECONDS"
{ {
auto res = mcc::utils::parsAngleString(std::span{s, size}); auto res = mcc::utils::parsAngleString(std::span{s, size});

View File

@ -739,6 +739,7 @@ public:
} else { } else {
auto tanZ = tan(pt.Y); auto tanZ = tan(pt.Y);
*dZ = rmodel.refa * tanZ + rmodel.refb * tanZ * tanZ * tanZ; *dZ = rmodel.refa * tanZ + rmodel.refb * tanZ * tanZ * tanZ;
// *dZ = rmodel.refa / tanZ + rmodel.refb / (tanZ * tanZ * tanZ);
} }
} else { } else {
MccCelestialPoint tr_pt{.pair_kind = MccCoordPairKind::COORDS_KIND_AZZD, .time_point = pt.time_point}; MccCelestialPoint tr_pt{.pair_kind = MccCoordPairKind::COORDS_KIND_AZZD, .time_point = pt.time_point};

View File

@ -585,7 +585,7 @@ concept mcc_hardware_c = requires(T t, const T t_const) {
requires mcc_angle_c<decltype(state.speedX)>; // moving speed along co-longitude coordinate requires mcc_angle_c<decltype(state.speedX)>; // moving speed along co-longitude coordinate
requires mcc_angle_c<decltype(state.speedY)>; // moving speed along co-latitude coordinate requires mcc_angle_c<decltype(state.speedY)>; // moving speed along co-latitude coordinate
std::same_as<typename T::hardware_moving_state_t, decltype(state.moving_type)>; requires std::same_as<typename T::hardware_moving_state_t, decltype(state.moving_type)>;
}; };
// set hardware state: // set hardware state:
@ -735,7 +735,7 @@ concept mcc_slewing_model_c = requires(T t) {
// a class of slewing process parameters // a class of slewing process parameters
requires requires(typename T::slewing_params_t pars) { requires requires(typename T::slewing_params_t pars) {
// slew mount to target and stop // slew mount to target and stop
std::convertible_to<decltype(pars.slewAndStop), bool>; requires std::convertible_to<decltype(pars.slewAndStop), bool>;
}; };
{ t.slewToTarget() } -> std::same_as<typename T::error_t>; { t.slewToTarget() } -> std::same_as<typename T::error_t>;
@ -770,7 +770,7 @@ concept mcc_guiding_model_c = requires(T t) {
// a class of guiding process parameters // a class of guiding process parameters
requires requires(typename T::guiding_params_t pars) { requires requires(typename T::guiding_params_t pars) {
// guide along both mount axis // guide along both mount axis
std::convertible_to<decltype(pars.dualAxisGuiding), bool>; requires std::convertible_to<decltype(pars.dualAxisGuiding), bool>;
}; };
{ t.startGuidingTarget() } -> std::same_as<typename T::error_t>; { t.startGuidingTarget() } -> std::same_as<typename T::error_t>;
@ -832,7 +832,7 @@ concept mcc_guiding_model_c = requires(T t) {
// && mcc_telemetry_c<T> && mcc_pzone_container_c<T>; // && mcc_telemetry_c<T> && mcc_pzone_container_c<T>;
template <typename T> template <typename T>
concept mcc_generic_mount_c = mcc_telemetry_c<T> && mcc_pzone_container_c<T> && requires(T t) { concept mcc_generic_mount_c = mcc_hardware_c<T> && mcc_telemetry_c<T> && mcc_pzone_container_c<T> && requires(T t) {
requires mcc_error_c<typename T::error_t>; requires mcc_error_c<typename T::error_t>;
// slew mount to target (target coordinates were defined in telemetry data) // slew mount to target (target coordinates were defined in telemetry data)

View File

@ -14,7 +14,7 @@ namespace mcc
static constexpr double mcc_sideral_to_UT1_ratio = 1.002737909350795; // sideral/UT1 static constexpr double mcc_sideral_to_UT1_ratio = 1.002737909350795; // sideral/UT1
enum MccAltLimitPZErrorCode : int { ERROR_OK, ERROR_COORD_TRANSFROM }; enum MccAltLimitPZErrorCode : int { ERROR_OK, ERROR_NULLPTR, ERROR_COORD_TRANSFROM };
} // namespace mcc } // namespace mcc
@ -54,6 +54,8 @@ struct MccAltLimitPZCategory : public std::error_category {
switch (err) { switch (err) {
case MccAltLimitPZErrorCode::ERROR_OK: case MccAltLimitPZErrorCode::ERROR_OK:
return "OK"; return "OK";
case MccAltLimitPZErrorCode::ERROR_NULLPTR:
return "input argument os nullptr";
case MccAltLimitPZErrorCode::ERROR_COORD_TRANSFROM: case MccAltLimitPZErrorCode::ERROR_COORD_TRANSFROM:
return "coordinate transformation error"; return "coordinate transformation error";
default: default:
@ -97,6 +99,10 @@ public:
_latLim(MccAltLimitPZ::pi2 - _altLimit) _latLim(MccAltLimitPZ::pi2 - _altLimit)
{ {
_transformCoordinates = [ccte_engine](MccCelestialPoint from_pt, MccCelestialPoint* to_pt) -> error_t { _transformCoordinates = [ccte_engine](MccCelestialPoint from_pt, MccCelestialPoint* to_pt) -> error_t {
if (to_pt == nullptr) {
return MccAltLimitPZErrorCode::ERROR_NULLPTR;
}
auto err = ccte_engine->transformCoordinates(from_pt, to_pt); auto err = ccte_engine->transformCoordinates(from_pt, to_pt);
if (!err) { if (!err) {
return MccAltLimitPZErrorCode::ERROR_OK; return MccAltLimitPZErrorCode::ERROR_OK;
@ -128,6 +134,10 @@ public:
{ {
double alt; double alt;
if (result == nullptr) {
return MccAltLimitPZErrorCode::ERROR_NULLPTR;
}
error_t ret = MccAltLimitPZErrorCode::ERROR_OK; error_t ret = MccAltLimitPZErrorCode::ERROR_OK;
if constexpr (mcc_eqt_hrz_coord_c<InputT>) { if constexpr (mcc_eqt_hrz_coord_c<InputT>) {
@ -157,6 +167,10 @@ public:
{ {
using res_t = std::remove_cvref_t<decltype(*res_time)>; using res_t = std::remove_cvref_t<decltype(*res_time)>;
if (res_time == nullptr) {
return MccAltLimitPZErrorCode::ERROR_NULLPTR;
}
double ha, dec; double ha, dec;
error_t ret = MccAltLimitPZErrorCode::ERROR_OK; error_t ret = MccAltLimitPZErrorCode::ERROR_OK;
@ -209,6 +223,10 @@ public:
{ {
using res_t = std::remove_cvref_t<decltype(*res_time)>; using res_t = std::remove_cvref_t<decltype(*res_time)>;
if (res_time == nullptr) {
return MccAltLimitPZErrorCode::ERROR_NULLPTR;
}
double ha, dec; double ha, dec;
error_t ret = MccAltLimitPZErrorCode::ERROR_OK; error_t ret = MccAltLimitPZErrorCode::ERROR_OK;
@ -266,6 +284,10 @@ public:
{ {
double ha, dec, az; double ha, dec, az;
if (point == nullptr) {
return MccAltLimitPZErrorCode::ERROR_NULLPTR;
}
error_t ret = MccAltLimitPZErrorCode::ERROR_OK; error_t ret = MccAltLimitPZErrorCode::ERROR_OK;
if constexpr (mcc_eqt_hrz_coord_c<InputT>) { if constexpr (mcc_eqt_hrz_coord_c<InputT>) {

163
mcc/mcc_tracking_model.h Normal file
View File

@ -0,0 +1,163 @@
#pragma once
/* MOUNT CONTROL COMPONENTS LIBRARY */
/* SIMPLE TRACKING MODEL IMPLEMENTATION */
#include "mcc_defaults.h"
#include "mcc_generics.h"
namespace mcc
{
enum class MccSimpleTrackingModelErrorCode : int {
ERROR_OK,
ERROR_HW_GETSTATE,
ERROR_HW_SETSTATE,
ERROR_TELEMETRY_TIMEOUT,
ERROR_PZONE_CONTAINER_COMP,
ERROR_IN_PZONE,
ERROR_UNEXPECTED_AXIS_RATES
};
} // namespace mcc
namespace std
{
template <>
class is_error_code_enum<mcc::MccSimpleTrackingModelErrorCode> : public true_type
{
};
} // namespace std
namespace mcc
{
template <MccMountType MOUNT_TYPE>
class MccSimpleTrackingModel
{
public:
static constexpr MccMountType mountType = MOUNT_TYPE;
typedef std::error_code error_t;
struct tracking_params_t {
static constexpr double sideralRate = 15.0410686_arcsecs; // in radians per second
double trackSpeedX{};
double trackSpeedY{};
std::chrono::seconds telemetryTimeout{3};
};
template <mcc_generic_mount_c MountT>
MccSimpleTrackingModel(MountT* mount) : _stopTracking(new std::atomic_bool())
{
*_stopTracking = false;
if constexpr (mccIsEquatorialMount(mountType)) {
_currentTrackParams.trackSpeedX = tracking_params_t::sideralRate; // move along HA-axis with sideral rate
_currentTrackParams.trackSpeedY = 0.0;
}
_trackingFunc = [mount, this]() -> error_t {
typename MountT::hardware_state_t hw_state;
if constexpr (mccIsEquatorialMount(mountType)) {
// just set sideral rate once
auto err = mount->hardwareGetState(&hw_state);
if (err) {
return mcc_deduce_error(err, MccSimpleTrackingModelErrorCode::ERROR_HW_GETSTATE);
}
// hw_state.time_point;
hw_state.speedX = _currentTrackParams.trackSpeedX;
hw_state.speedY = _currentTrackParams.trackSpeedY;
hw_state.moving_type = MountT::hardware_moving_state_t::HW_MOVE_TRACKING;
err = mount->hardwareSetState(std::move(hw_state));
if (err) {
return mcc_deduce_error(err, MccSimpleTrackingModelErrorCode::ERROR_HW_SETSTATE);
}
// control prohibited zones
MccTelemetryData tdata;
std::vector<bool> pz_flags;
bool inzone_flag;
while (!*_stopTracking) {
auto t_err = mount->waitForTelemetryData(&tdata, _currentTrackParams.telemetryTimeout);
if (t_err) {
return mcc_deduce_error(t_err, MccSimpleTrackingModelErrorCode::ERROR_TELEMETRY_TIMEOUT);
}
// check for current axis speed
if (utils::isEqual(tdata.speedX, 0.0) && utils::isEqual(tdata.speedY, 0.0)) {
// unhandled stop state?!!!
return MccSimpleTrackingModelErrorCode::ERROR_UNEXPECTED_AXIS_RATES;
}
auto pz_err = mount->inPZone(tdata, &inzone_flag, &pz_flags);
if (pz_err) {
return mcc_deduce_error(t_err, MccSimpleTrackingModelErrorCode::ERROR_PZONE_CONTAINER_COMP);
}
if (inzone_flag) {
// logging
return MccSimpleTrackingModelErrorCode::ERROR_IN_PZONE;
}
}
return MccSimpleTrackingModelErrorCode::ERROR_OK;
} else if constexpr (mccIsAltAzMount(mountType)) {
static_assert(false, "NOT IMPLEMENTED!");
} else {
static_assert(false, "UNKNOW MOUNT TYPE!");
}
};
}
MccSimpleTrackingModel(MccSimpleTrackingModel&&) = default;
MccSimpleTrackingModel& operator=(MccSimpleTrackingModel&&) = default;
error_t trackMount()
{
return _trackingFunc();
}
error_t stopTracking()
{
*_stopTracking = true;
return MccSimpleTrackingModelErrorCode::ERROR_OK;
}
error_t setTrackingParams(tracking_params_t params)
{
_currentTrackParams = std::move(params);
}
tracking_params_t getTrackingParams()
{
return _currentTrackParams;
}
protected:
std::function<error_t()> _trackingFunc{};
std::unique_ptr<std::atomic_bool> _stopTracking{};
tracking_params_t _currentTrackParams;
};
} // namespace mcc

View File

@ -104,5 +104,28 @@ int main()
std::cout << "TIME TO ZONE 1: " << vm[0] << "\n"; std::cout << "TIME TO ZONE 1: " << vm[0] << "\n";
std::cout << "TIME TO ZONE 2: " << vm[1] << "\n"; std::cout << "TIME TO ZONE 2: " << vm[1] << "\n";
std::cout << "\n\n";
MccCCTE_ERFA::meteo_t meteo{.temperature = 10.0, .humidity = 0.7, .pressure = 1010.0};
erfa.updateMeteoERFA(meteo);
MccCCTE_ERFA::refract_model_t rm;
erfa.refractionModel(&rm);
std::cout << "REFMODEL: A = " << rm.refa << ", B = " << rm.refb << "\n";
cp.pair_kind = mcc::MccCoordPairKind::COORDS_KIND_AZZD;
cp.X = 100.0_degs;
cp.Y = 45.0_degs;
double dZ;
erfa.refractionCorrection(cp, &dZ);
std::cout << "dZ(" << mcc::MccAngle(cp.Y).degrees() << ") = " << mcc::MccAngle(dZ).arcsecs() << "\n";
cp.Y = 50.0_degs;
erfa.refractionCorrection(cp, &dZ);
std::cout << "dZ(" << mcc::MccAngle(cp.Y).degrees() << ") = " << mcc::MccAngle(dZ).arcsecs() << "\n";
return 0; return 0;
} }