Fix getting coordinates from mount

Stellarium · Nov 9, 2024 · 1d4daca · 1d4daca
1 parent 6fcfd37
commit 1d4daca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
@@ -38,6 +38,12 @@ INDIConnection::INDIConnection(QObject *parent) : QObject(parent)
 INDIConnection::Coordinates INDIConnection::position() const
 {
 	std::lock_guard<std::mutex> lock(mMutex);
+
+	Coordinates mCoordinates;
+	auto property = mTelescope.getNumber("EQUATORIAL_EOD_COORD");
+	mCoordinates.RA = property.getNumber()->np[0].value;
+	mCoordinates.DEC = property.getNumber()->np[1].value;
+
 	return mCoordinates;
 }
 
@@ -78,7 +84,7 @@ void INDIConnection::setPosition(INDIConnection::Coordinates coords)
 
 	property[0].setValue(coords.RA);
 	property[1].setValue(coords.DEC);
-	sendNewNumber(property);
+	sendNewNumber(property);	
 }
 
 void INDIConnection::syncPosition(INDIConnection::Coordinates coords)
@@ -328,7 +334,7 @@ void INDIConnection::newDevice(INDI::BaseDevice dp)
 
 	QString name(dp.getDeviceName());
 
-	qDebug() << "INDIConnection::newDevice| New Device... " << name;
+	qDebug().noquote() << "INDIConnection::newDevice| New Device... " << name;
 
 	mDevices.append(name);
 	mTelescope = dp;
@@ -362,13 +368,7 @@ void INDIConnection::newProperty(INDI::Property property)
 
 	QString name(property.getName());
 
-	qDebug() << "INDIConnection::newProperty| " << name;
-
-	if (name == "EQUATORIAL_EOD_COORD")
-	{
-		mCoordinates.RA = property.getNumber()->np[0].value;
-		mCoordinates.DEC = property.getNumber()->np[1].value;
-	}
+	qDebug().noquote() << "INDIConnection::newProperty| " << name;
 
 	if (!mTelescope.isConnected())
 	{

diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
@@ -66,7 +66,6 @@ class INDIConnection final : public QObject, public INDI::BaseClient
 
 	mutable std::mutex mMutex;
 	INDI::BaseDevice mTelescope;
-	Coordinates mCoordinates;
 	QStringList mDevices;
 
 public: // from INDI::BaseClient

diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
@@ -54,7 +54,7 @@ TelescopeClientINDI::~TelescopeClientINDI()
 	mConnection.disconnectServer();
 }
 
-Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore*) const
+Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore* core) const
 {
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 
@@ -63,9 +63,7 @@ Vec3d TelescopeClientINDI::getJ2000EquatorialPos(const StelCore*) const
 
 	Vec3d posJNow;
 	StelUtils::spheToRect(longitudeRad, latitudeRad, posJNow);
-	const StelCore* core = StelApp::getInstance().getCore();
-	Vec3d posJ2000 = core->equinoxEquToJ2000(posJNow, StelCore::RefractionOff);
-	return posJ2000;
+	return core->equinoxEquToJ2000(posJNow, StelCore::RefractionOff);
 }
 
 void TelescopeClientINDI::telescopeGoto(const Vec3d &positionJ2000, StelObjectP selectObject)
@@ -82,7 +80,6 @@ void TelescopeClientINDI::telescopeGoto(const Vec3d &positionJ2000, StelObjectP
 	double longitudeRad = posJ2000[0] * 12.0 / M_PI;
 	double latitudeRad = posJ2000[1] * 180.0 / M_PI;
 
-
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 	positionJNow.RA = longitudeRad;
 	positionJNow.DEC = latitudeRad;
@@ -107,7 +104,6 @@ void TelescopeClientINDI::telescopeSync(const Vec3d &positionJ2000, StelObjectP
 	double longitudeRad = posJ2000[0] * 12.0 / M_PI;
 	double latitudeRad = posJ2000[1] * 180.0 / M_PI;
 
-
 	INDIConnection::Coordinates positionJNow = mConnection.position();
 	positionJNow.RA = longitudeRad;
 	positionJNow.DEC = latitudeRad;