TelescopeClientDirectNexStar.hpp   TelescopeClientDirectNexStar.hpp 
skipping to change at line 39 skipping to change at line 39
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelNavigator.hpp" #include "StelNavigator.hpp"
#include "Server.hpp" //from the telescope server source tree #include "Server.hpp" //from the telescope server source tree
#include "TelescopeClient.hpp" //from the plug-in's source tree #include "TelescopeClient.hpp" //from the plug-in's source tree
#include "InterpolatedPosition.hpp"
class NexStarConnection; class NexStarConnection;
//! Telescope client that connects directly to a Celestron NexStar through a serial port. //! Telescope client that connects directly to a Celestron NexStar through a serial port.
//! This class has been created by merging the code of TelescopeTCP and Ser verNexStar. //! This class has been created by merging the code of TelescopeTCP and Ser verNexStar.
class TelescopeClientDirectNexStar : public TelescopeClient, public Server class TelescopeClientDirectNexStar : public TelescopeClient, public Server
{ {
Q_OBJECT Q_OBJECT
public: public:
TelescopeClientDirectNexStar(const QString &name, const QString &par ameters); TelescopeClientDirectNexStar(const QString &name, const QString &par ameters, Equinox eq = EquinoxJ2000);
~TelescopeClientDirectNexStar(void) ~TelescopeClientDirectNexStar(void)
{ {
//hangup(); //hangup();
} }
//================================================================== ==== //================================================================== ====
// Methods inherited from TelescopeClient // Methods inherited from TelescopeClient
bool isConnected(void) const; bool isConnected(void) const;
//================================================================== ==== //================================================================== ====
skipping to change at line 82 skipping to change at line 83
bool isInitialized(void) const; bool isInitialized(void) const;
//================================================================== ==== //================================================================== ====
// Methods inherited from Server // Methods inherited from Server
void sendPosition(unsigned int ra_int, int dec_int, int status); void sendPosition(unsigned int ra_int, int dec_int, int status);
//TODO: Find out if this method is needed. It's called by Connection . //TODO: Find out if this method is needed. It's called by Connection .
void gotoReceived(unsigned int ra_int, int dec_int); void gotoReceived(unsigned int ra_int, int dec_int);
private: private:
void hangup(void); void hangup(void);
void resetPositions(void);
int time_delay; int time_delay;
Position positions[16]; InterpolatedPosition interpolatedPosition;
Position *position_pointer;
Position *const end_position;
virtual bool hasKnownPosition(void) const virtual bool hasKnownPosition(void) const
{ {
return (position_pointer->client_micros != 0x7FFFFFFFFFFFFFF FLL); return interpolatedPosition.isKnown();
} }
Equinox equinox;
//================================================================== ==== //================================================================== ====
// Members taken from ServerNexStar // Members taken from ServerNexStar
NexStarConnection *nexstar; NexStarConnection *nexstar;
unsigned int last_ra; unsigned int last_ra;
bool queue_get_position; bool queue_get_position;
long long int next_pos_time; long long int next_pos_time;
}; };
#endif //_TELESCOPE_CLIENT_DIRECT_LX200_ #endif //_TELESCOPE_CLIENT_DIRECT_LX200_
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/