...

cxx/mount.h

@@ -126,36 +126,6 @@ public:
 
     enum IersDatabaseType { IERS_DB_LEAPSECS, IERS_DB_EARTH_ORIENT };
 
-    /*  mount main-cycle variable quantities (mount orientation)  */
-    struct mount_orient_t {
-        // time-related
-        std::chrono::system_clock::time_point utc;
-        time_point_t mjd;        // modified Julian date
-        time_point_t siderTime;  // sideral time (in radians)
-
-        // apparent target (user-input) current coordinates (in radians)
-        mnt_coord_t tagRA, tagDEC;
-        mnt_coord_t tagHA;
-        mnt_coord_t tagAZ, tagZD;
-
-        // encoder-measured current mount coordinates (in radians)
-        mnt_coord_t mntRA, mntDEC;
-        mnt_coord_t mntHA;
-        mnt_coord_t mntAZ, mntZD;
-
-        // encoder-measured current mount moving speed (in radians/s)
-        mnt_speed_t mntSpeedX,
-            mntSpeedY;  // X - HA, Y - DEC for equatorial-type mount; X - AZ, Y - ZD for horizontal-type one
-
-        // current refraction coefficient
-        mnt_coord_t currRefr;
-
-        // PCS (pointing correction system) corrections
-        mnt_coord_t pcsX, pcsY;  // X - HA, Y - DEC for equatorial-type mount; X - AZ, Y - ZD for horizontal-type one
-
-        // mount current state
-    };
-
 
     struct mount_config_t {
         std::string leap_seconds_filename{};  // empty to use hardcoded default value!
@@ -200,7 +170,7 @@ public:
     }
 
 
-    mount_orient_t getMountData() const noexcept
+    MccMountPosition getMountData() const noexcept
     {
         return _currentMountOrient.load();
     }
@@ -309,7 +279,7 @@ protected:
     astrom::MccLeapSeconds _leapSecondsDB;
     astrom::MccIersBulletinA _earthOrientDB;
 
-    std::atomic<mount_orient_t> _currentMountOrient;
+    std::atomic<MccMountPosition> _currentMountOrient;
 
     std::atomic<MccMountSiteInfo> _geoLocation;
     std::atomic<MccMountMeteo> _currentMeteo;