Skip to content

Commit 2ff3c38

Browse files
committed
SX-AO-LF support via INDI
1 parent d23b7cb commit 2ff3c38

File tree

8 files changed

+575
-5
lines changed

8 files changed

+575
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ set(scopes_SRC
303303
${phd_src_dir}/stepguider_simulator.h
304304
${phd_src_dir}/stepguider_sxao.cpp
305305
${phd_src_dir}/stepguider_sxao.h
306+
${phd_src_dir}/stepguider_sxao_INDI.cpp
307+
${phd_src_dir}/stepguider_sxao_INDI.h
306308
${phd_src_dir}/stepguider.cpp
307309
${phd_src_dir}/stepguider.h
308310
${phd_src_dir}/stepguiders.h

config_INDI.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ INDIConfig::INDIConfig(wxWindow *parent, int devtype) :
106106
else if (devtype == TYPE_MOUNT) {
107107
devlabel->SetLabel(_("Mount"));
108108
}
109+
else if (devtype == TYPE_AO) {
110+
devlabel->SetLabel(_("AO"));
111+
}
109112
gbs->Add(devlabel,POS(pos, 1), SPAN(1, 1), wxALIGN_LEFT | wxALL, border);
110113

111114
pos ++;

config_INDI.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
enum {
5353
TYPE_CAMERA,
5454
TYPE_MOUNT,
55+
TYPE_AO,
5556
};
5657

5758
class INDIConfig : public wxDialog , public INDI::BaseClient {

scope_INDI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Mount::MOVE_RESULT ScopeINDI::Guide(GUIDE_DIRECTION direction, int duration)
346346
{
347347
// guide using timed pulse guide
348348
if (pulseGuideNS_prop && pulseGuideEW_prop) {
349-
// despite what is sayed in INDI standard properties description, every telescope driver expect the guided time in msec.
349+
// despite what is said in INDI standard properties description, every telescope driver expect the guided time in msec.
350350
switch (direction) {
351351
case EAST:
352352
pulseE_prop->value = duration;

stepguider.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ wxArrayString StepGuider::List(void)
9393
#ifdef STEPGUIDER_SXAO
9494
AoList.Add(_T("sxAO"));
9595
#endif
96+
#ifdef STEPGUIDER_SXAO_INDI
97+
AoList.Add(_T("INDI sxAO"));
98+
#endif
9699
#ifdef STEPGUIDER_SIMULATOR
97100
AoList.Add(_T("Simulator"));
98101
#endif
@@ -113,15 +116,20 @@ StepGuider *StepGuider::Factory(const wxString& choice)
113116

114117
Debug.AddLine(wxString::Format("StepGuiderFactory(%s)", choice));
115118

116-
if (choice.Find(_("None")) + 1) {
119+
if (choice.CmpNoCase(_("None")) == 0) {
117120
}
118121
#ifdef STEPGUIDER_SXAO
119-
else if (choice.Find(_T("sxAO")) + 1) {
122+
else if (choice.CmpNoCase(_T("sxAO")) == 0) {
120123
pReturn = new StepGuiderSxAO();
121124
}
122125
#endif
126+
#ifdef STEPGUIDER_SXAO_INDI
127+
else if (choice.CmpNoCase(_T("INDI sxAO")) == 0) {
128+
pReturn = new StepGuiderSxAoINDI();
129+
}
130+
#endif
123131
#ifdef STEPGUIDER_SIMULATOR
124-
else if (choice.Find(_T("Simulator")) + 1) {
132+
else if (choice.CmpNoCase(_T("Simulator")) == 0) {
125133
pReturn = new StepGuiderSimulator();
126134
}
127135
#endif

0 commit comments

Comments
 (0)