diff --git a/kstars/auxiliary/ksutils.cpp b/kstars/auxiliary/ksutils.cpp --- a/kstars/auxiliary/ksutils.cpp +++ b/kstars/auxiliary/ksutils.cpp @@ -1156,7 +1156,7 @@ else if (option == "ASTAP") { #if defined(Q_OS_OSX) - return "/usr/local/bin/aspat"; + return "/Applications/ASTAP.app/Contents/MacOS/astap"; #elif defined(Q_OS_WIN) return "C:\Program Files\astap\astap.exe"; #endif diff --git a/kstars/ekos/guide/guide.h b/kstars/ekos/guide/guide.h --- a/kstars/ekos/guide/guide.h +++ b/kstars/ekos/guide/guide.h @@ -415,6 +415,7 @@ void updateDirectionsFromPHD2(QString mode); + void guideAfterMeridianFlip(); protected slots: void updateTelescopeType(int index); diff --git a/kstars/ekos/guide/guide.cpp b/kstars/ekos/guide/guide.cpp --- a/kstars/ekos/guide/guide.cpp +++ b/kstars/ekos/guide/guide.cpp @@ -154,6 +154,22 @@ driftPlot->replot(); } +void Guide::guideAfterMeridianFlip() +{ + //This makes sure if the guider is PHD2, that after a meridian flip + //It will go back to using auto-star, because the image is now inverted + //and so the star used for guiding is in a very different place + //We could try to calculate the new position, but it could be a little off + //So it is better to use auto-star and if the user wants to use a different star, they can override it. + if(guiderType == GUIDE_PHD2) + autoStarCheck->setChecked(true); + + if (Options::resetGuideCalibration()) + clearCalibration(); + guide(); + +} + void Guide::resizeEvent(QResizeEvent *event) { if (event->oldSize().width() != -1) @@ -1832,6 +1848,12 @@ captureB->setEnabled(true); loopB->setEnabled(true); autoStarCheck->setEnabled(true); + + //PHD2 likes to choose its own star when you start guiding remotely. + //If the user wants to choose a star, they can override this. + //But by default, it should be checked each time it starts up. + autoStarCheck->setChecked(true); + configurePHD2Camera(); setExternalGuiderBLOBEnabled(!Options::guideSubframeEnabled()); boxSizeCombo->setEnabled(true); diff --git a/kstars/ekos/manager.cpp b/kstars/ekos/manager.cpp --- a/kstars/ekos/manager.cpp +++ b/kstars/ekos/manager.cpp @@ -3136,12 +3136,7 @@ // Meridian Flip connect(captureProcess.get(), &Ekos::Capture::meridianFlipStarted, guideProcess.get(), &Ekos::Guide::abort, Qt::UniqueConnection); - connect(captureProcess.get(), &Ekos::Capture::meridianFlipCompleted, guideProcess.get(), [&]() - { - if (Options::resetGuideCalibration()) - guideProcess->clearCalibration(); - guideProcess->guide(); - }); + connect(captureProcess.get(), &Ekos::Capture::meridianFlipCompleted, guideProcess.get(), &Ekos::Guide::guideAfterMeridianFlip, Qt::UniqueConnection); } // Guide <---> Mount connections