Permalink
Browse files

SX-AO-LF support via INDI

  • Loading branch information...
d33psky committed Apr 3, 2016
1 parent d23b7cb commit 2ff3c38b415b833e65b6333c7f95647cbba37814
Showing with 575 additions and 5 deletions.
  1. +2 −0 CMakeLists.txt
  2. +3 −0 config_INDI.cpp
  3. +1 −0 config_INDI.h
  4. +1 −1 scope_INDI.cpp
  5. +11 −3 stepguider.cpp
  6. +425 −0 stepguider_sxao_INDI.cpp
  7. +130 −0 stepguider_sxao_INDI.h
  8. +2 −1 stepguiders.h
View
@@ -303,6 +303,8 @@ set(scopes_SRC
${phd_src_dir}/stepguider_simulator.h
${phd_src_dir}/stepguider_sxao.cpp
${phd_src_dir}/stepguider_sxao.h
+ ${phd_src_dir}/stepguider_sxao_INDI.cpp
+ ${phd_src_dir}/stepguider_sxao_INDI.h
${phd_src_dir}/stepguider.cpp
${phd_src_dir}/stepguider.h
${phd_src_dir}/stepguiders.h
View
@@ -106,6 +106,9 @@ INDIConfig::INDIConfig(wxWindow *parent, int devtype) :
else if (devtype == TYPE_MOUNT) {
devlabel->SetLabel(_("Mount"));
}
+ else if (devtype == TYPE_AO) {
+ devlabel->SetLabel(_("AO"));
+ }
gbs->Add(devlabel,POS(pos, 1), SPAN(1, 1), wxALIGN_LEFT | wxALL, border);
pos ++;
View
@@ -52,6 +52,7 @@
enum {
TYPE_CAMERA,
TYPE_MOUNT,
+ TYPE_AO,
};
class INDIConfig : public wxDialog , public INDI::BaseClient {
View
@@ -346,7 +346,7 @@ Mount::MOVE_RESULT ScopeINDI::Guide(GUIDE_DIRECTION direction, int duration)
{
// guide using timed pulse guide
if (pulseGuideNS_prop && pulseGuideEW_prop) {
- // despite what is sayed in INDI standard properties description, every telescope driver expect the guided time in msec.
+ // despite what is said in INDI standard properties description, every telescope driver expect the guided time in msec.
switch (direction) {
case EAST:
pulseE_prop->value = duration;
View
@@ -93,6 +93,9 @@ wxArrayString StepGuider::List(void)
#ifdef STEPGUIDER_SXAO
AoList.Add(_T("sxAO"));
#endif
+#ifdef STEPGUIDER_SXAO_INDI
+ AoList.Add(_T("INDI sxAO"));
+#endif
#ifdef STEPGUIDER_SIMULATOR
AoList.Add(_T("Simulator"));
#endif
@@ -113,15 +116,20 @@ StepGuider *StepGuider::Factory(const wxString& choice)
Debug.AddLine(wxString::Format("StepGuiderFactory(%s)", choice));
- if (choice.Find(_("None")) + 1) {
+ if (choice.CmpNoCase(_("None")) == 0) {
}
#ifdef STEPGUIDER_SXAO
- else if (choice.Find(_T("sxAO")) + 1) {
+ else if (choice.CmpNoCase(_T("sxAO")) == 0) {
pReturn = new StepGuiderSxAO();
}
#endif
+#ifdef STEPGUIDER_SXAO_INDI
+ else if (choice.CmpNoCase(_T("INDI sxAO")) == 0) {
+ pReturn = new StepGuiderSxAoINDI();
+ }
+#endif
#ifdef STEPGUIDER_SIMULATOR
- else if (choice.Find(_T("Simulator")) + 1) {
+ else if (choice.CmpNoCase(_T("Simulator")) == 0) {
pReturn = new StepGuiderSimulator();
}
#endif
Oops, something went wrong.

0 comments on commit 2ff3c38

Please sign in to comment.