summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-19 09:48:41 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-19 09:48:41 (GMT)
commitf442343498f08cfde9a96507bcdb34460a6a3031 (patch)
tree0875fae31b43f8b089b4ec957f05b247b2cb53a4
parentf6022ae7d7ff3e82060ac956bf4eb856602ad265 (diff)
Only abort due to guiding errors if we are taking a light frame. Also check for focus status failure flag
-rw-r--r--kstars/ekos/capture/capture.cpp6
-rw-r--r--kstars/ekos/capture/capture.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index 39d5a9f..0b03c4b 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -1912,7 +1912,7 @@ void Capture::setGuideDeviation(double delta_ra, double delta_dec)
QString deviationText = QString("%1").arg(deviation_rms, 0, 'g', 3);
- if (activeJob->getStatus() == SequenceJob::JOB_BUSY)
+ if (activeJob->getStatus() == SequenceJob::JOB_BUSY && activeJob->getFrameType() == FRAME_LIGHT)
{
if (deviation_rms > guideDeviation->value())
{
@@ -1975,7 +1975,7 @@ void Capture::setFocusStatus(FocusState state)
HFRPixels->setValue(focusHFR+ (focusHFR * 0.025));
appendLogText(i18n("Focus complete."));
}
- else
+ else if (focusState == FOCUS_FAILED)
{
appendLogText(i18n("Autofocus failed. Aborting exposure..."));
secondsLabel->setText("");
@@ -1993,7 +1993,7 @@ void Capture::setFocusStatus(FocusState state)
appendLogText(i18n("Focus complete."));
startNextExposure();
}
- else
+ else if (focusState == FOCUS_FAILED)
{
appendLogText(i18n("Autofocus failed. Aborting exposure..."));
secondsLabel->setText("");
diff --git a/kstars/ekos/capture/capture.h b/kstars/ekos/capture/capture.h
index 6307e9a..d2d6c23 100644
--- a/kstars/ekos/capture/capture.h
+++ b/kstars/ekos/capture/capture.h
@@ -377,6 +377,8 @@ public slots:
// Auto Focus
void setFocusStatus(Ekos::FocusState state);
+ void setHFR(double newHFR) { focusHFR = newHFR; }
+
// Guide
void setGuideStatus(Ekos::GuideState state);
// Align
@@ -417,8 +419,7 @@ private slots:
//void checkAlignmentSlewComplete();
// Auto Focus
- //void updateAutofocusStatus(bool status, double HFR);
- void setHFR(double newHFR) { focusHFR = newHFR; }
+ //void updateAutofocusStatus(bool status, double HFR);
void startPostFilterAutoFocus();
// Flat field