summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-20 08:41:08 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-20 08:41:08 (GMT)
commit9e8cb4a931891275d62a880fd4e94ed130fc0b94 (patch)
tree0d13beb3bd7fb36f543b01800cf4d26deefbd41b
parent25296476ddf684d602035d68aad427c20335ec55 (diff)
Fix few issues with guiding restart and stop
-rw-r--r--kstars/ekos/scheduler/scheduler.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/kstars/ekos/scheduler/scheduler.cpp b/kstars/ekos/scheduler/scheduler.cpp
index 1109f46..12a303a 100644
--- a/kstars/ekos/scheduler/scheduler.cpp
+++ b/kstars/ekos/scheduler/scheduler.cpp
@@ -2868,7 +2868,7 @@ void Scheduler::checkJobStage()
}
else if (guideStatus == Ekos::GUIDE_CALIBRATION_ERROR || guideStatus == Ekos::GUIDE_ABORTED)
{
- if (guideStatus == Ekos::GUIDE_ABORTED)
+ if (guideStatus == Ekos::GUIDE_ABORTED || guideStatus == Ekos::GUIDE_CALIBRATION_ERROR)
appendLogText(i18n("%1 guiding failed!", currentJob->getName()));
else
appendLogText(i18n("%1 calibration failed!", currentJob->getName()));
@@ -2880,11 +2880,11 @@ void Scheduler::checkJobStage()
return;
}
- currentJob->setState(SchedulerJob::JOB_ERROR);
+ currentJob->setState(SchedulerJob::JOB_ERROR);
- findNextJob();
- return;
- }
+ findNextJob();
+ return;
+ }
}
break;
@@ -2977,7 +2977,8 @@ void Scheduler::checkJobStage()
//if(guideReply.value() == false)
{
appendLogText(i18n("Restarting %1 guiding procedure...", currentJob->getName()));
- currentJob->setStage(SchedulerJob::STAGE_GUIDING);
+ //currentJob->setStage(SchedulerJob::STAGE_GUIDING);
+ startGuiding();
return;
}
}
@@ -3801,7 +3802,7 @@ void Scheduler::stopGuiding()
{
if ( (currentJob->getStepPipeline() & SchedulerJob::USE_GUIDE) && (currentJob->getStage() == SchedulerJob::STAGE_GUIDING_COMPLETE || currentJob->getStage() == SchedulerJob::STAGE_CAPTURING) )
{
- guideInterface->call(QDBus::AutoDetect,"stop");
+ guideInterface->call(QDBus::AutoDetect,"abort");
guideFailureCount=0;
}
}