Skip to content

Commit

Permalink
Update telescope properties
Browse files Browse the repository at this point in the history 
- mountModelNP
- mountAxisNP
- GuideRateNP
  • Loading branch information
@naheedsa
naheedsa committed Feb 11, 2024
1 parent 48c728a commit 3ddc969
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 60 deletions.
104 changes: 52 additions & 52 deletions drivers/telescope/telescope_simulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,29 @@ bool ScopeSim::initProperties()
simPierSideSP.fill(getDeviceName(), "SIM_PIER_SIDE", "Sim Pier Side",
"Simulation", IP_WO, ISR_1OFMANY, 60, IPS_IDLE);

IUFillNumber(&mountModelN[0], "MM_IH", "Ha Zero (IH)", "%g", -5, 5, 0.01, 0);
IUFillNumber(&mountModelN[1], "MM_ID", "Dec Zero (ID)", "%g", -5, 5, 0.01, 0);
IUFillNumber(&mountModelN[2], "MM_CH", "Cone (CH)", "%g", -5, 5, 0.01, 0);
IUFillNumber(&mountModelN[3], "MM_NP", "Ha/Dec (NP)", "%g", -5, 5, 0.01, 0);
IUFillNumber(&mountModelN[4], "MM_MA", "Pole Azm (MA)", "%g", -5, 5, 0.01, 0);
IUFillNumber(&mountModelN[5], "MM_ME", "Pole elev (ME)", "%g", -5, 5, 0.01, 0);
IUFillNumberVector(&mountModelNP, mountModelN, 6, getDeviceName(), "MOUNT_MODEL", "Mount Model",
mountModelNP[MM_IH].fill("MM_IH", "Ha Zero (IH)", "%g", -5, 5, 0.01, 0);
mountModelNP[MM_ID].fill("MM_ID", "Dec Zero (ID)", "%g", -5, 5, 0.01, 0);
mountModelNP[MM_CH].fill("MM_CH", "Cone (CH)", "%g", -5, 5, 0.01, 0);
mountModelNP[MM_NP].fill("MM_NP", "Ha/Dec (NP)", "%g", -5, 5, 0.01, 0);
mountModelNP[MM_MA].fill("MM_MA", "Pole Azm (MA)", "%g", -5, 5, 0.01, 0);
mountModelNP[MM_ME].fill("MM_ME", "Pole elev (ME)", "%g", -5, 5, 0.01, 0);
mountModelNP.fill(getDeviceName(), "MOUNT_MODEL", "Mount Model",
"Simulation", IP_WO, 0, IPS_IDLE);

IUFillNumber(&flipHourAngleN[0], "FLIP_HA", "Hour Angle (deg)", "%g", -20, 20, 0.1, 0);
IUFillNumberVector(&flipHourAngleNP, flipHourAngleN, 1, getDeviceName(), "FLIP_HA", "Flip Posn.",
flipHourAngleNP[FLIP_HA].fill("FLIP_HA", "Hour Angle (deg)", "%g", -20, 20, 0.1, 0);
flipHourAngleNP.fill(getDeviceName(), "FLIP_HA", "Flip Posn.",
"Simulation", IP_WO, 0, IPS_IDLE);

IUFillNumber(&mountAxisN[0], "PRIMARY", "Primary (Ha)", "%g", -180, 180, 0.01, 0);
IUFillNumber(&mountAxisN[1], "SECONDARY", "Secondary (Dec)", "%g", -180, 180, 0.01, 0);
IUFillNumberVector(&mountAxisNP, mountAxisN, 2, getDeviceName(), "MOUNT_AXES", "Mount Axes",
mountAxisNP[PRIMARY].fill("PRIMARY", "Primary (Ha)", "%g", -180, 180, 0.01, 0);
mountAxisNP[SECONDARY].fill("SECONDARY", "Secondary (Dec)", "%g", -180, 180, 0.01, 0);
mountAxisNP.fill(getDeviceName(), "MOUNT_AXES", "Mount Axes",
"Simulation", IP_RO, 0, IPS_IDLE);
#endif

/* How fast do we guide compared to sidereal rate */
IUFillNumber(&GuideRateN[RA_AXIS], "GUIDE_RATE_WE", "W/E Rate", "%g", 0, 1, 0.1, 0.5);
IUFillNumber(&GuideRateN[DEC_AXIS], "GUIDE_RATE_NS", "N/S Rate", "%g", 0, 1, 0.1, 0.5);
IUFillNumberVector(&GuideRateNP, GuideRateN, 2, getDeviceName(), "GUIDE_RATE", "Guiding Rate", MOTION_TAB, IP_RW, 0,
GuideRateNP[RA_AXIS].fill("GUIDE_RATE_WE", "W/E Rate", "%g", 0, 1, 0.1, 0.5);
GuideRateNP[DEC_AXIS].fill("GUIDE_RATE_NS", "N/S Rate", "%g", 0, 1, 0.1, 0.5);
GuideRateNP.fill(getDeviceName(), "GUIDE_RATE", "Guiding Rate", MOTION_TAB, IP_RW, 0,
IPS_IDLE);

IUFillSwitch(&SlewRateS[SLEW_GUIDE], "SLEW_GUIDE", "Guide", ISS_OFF);
Expand Down Expand Up @@ -138,11 +138,11 @@ void ScopeSim::ISGetProperties(const char *dev)
mountTypeSP.load();
defineProperty(simPierSideSP);
simPierSideSP.load();
defineProperty(&mountModelNP);
loadConfig(true, mountModelNP.name);
defineProperty(&mountAxisNP);
defineProperty(&flipHourAngleNP);
loadConfig(true, flipHourAngleNP.name);
defineProperty(mountModelNP);
mountModelNP.load();
defineProperty(mountAxisNP);
defineProperty(flipHourAngleNP);
flipHourAngleNP.load();
#endif
/*
if (isConnected())
Expand All @@ -167,8 +167,8 @@ bool ScopeSim::updateProperties()
{
defineProperty(&GuideNSNP);
defineProperty(&GuideWENP);
defineProperty(&GuideRateNP);
loadConfig(true, GuideRateNP.name);
defineProperty(GuideRateNP);
GuideRateNP.load();

if (InitPark())
{
Expand Down Expand Up @@ -203,7 +203,7 @@ bool ScopeSim::updateProperties()
{
deleteProperty(GuideNSNP.name);
deleteProperty(GuideWENP.name);
deleteProperty(GuideRateNP.name);
deleteProperty(GuideRateNP.getName());
}

return true;
Expand Down Expand Up @@ -293,16 +293,16 @@ bool ScopeSim::ReadScopeStatus()
double axisRA = axisPrimary.position.Degrees();
double axisDE = axisSecondary.position.Degrees();
// No need to spam log until we have some actual changes.
if (std::fabs(mountAxisN[AXIS_RA].value - axisRA) > 0.0001 ||
std::fabs(mountAxisN[AXIS_DE].value - axisDE) > 0.0001)
if (std::fabs(mountAxisNP[AXIS_RA].value - axisRA) > 0.0001 ||
std::fabs(mountAxisNP[AXIS_DE].value - axisDE) > 0.0001)
{
mountAxisN[AXIS_RA].value = axisRA;
mountAxisN[AXIS_DE].value = axisDE;
mountAxisNP[AXIS_RA].value = axisRA;
mountAxisNP[AXIS_DE].value = axisDE;

LOGF_EXTRA1("%s: %f, ra %f", axisPrimary.axisName, axisPrimary.position.Degrees(), ra.Hours());
LOGF_EXTRA1("%s: %f, dec %f", axisSecondary.axisName, axisSecondary.position.Degrees(), dec.Degrees());

IDSetNumber(&mountAxisNP, nullptr);
mountAxisNP.apply();
}
#endif

Expand Down Expand Up @@ -399,9 +399,9 @@ bool ScopeSim::ISNewNumber(const char *dev, const char *name, double values[], c
{
if (strcmp(name, "GUIDE_RATE") == 0)
{
IUUpdateNumber(&GuideRateNP, values, names, n);
GuideRateNP.s = IPS_OK;
IDSetNumber(&GuideRateNP, nullptr);
GuideRateNP.update(values, names, n);
GuideRateNP.setState(IPS_OK);
GuideRateNP.apply();
return true;
}

Expand All @@ -412,25 +412,24 @@ bool ScopeSim::ISNewNumber(const char *dev, const char *name, double values[], c
}

#ifdef USE_SIM_TAB
if (strcmp(name, mountModelNP.name) == 0)
if (mountModelNP.isNameMatch(name))
{
IUUpdateNumber(&mountModelNP, values, names, n);
mountModelNP.s = IPS_OK;
IDSetNumber(&mountModelNP, nullptr);
alignment.setCorrections(mountModelN[0].value, mountModelN[1].value,
mountModelN[2].value, mountModelN[3].value,
mountModelN[4].value, mountModelN[5].value);

saveConfig(true, mountModelNP.name);
mountModelNP.update(values, names, n);
mountModelNP.setState(IPS_OK);
mountModelNP.apply();
alignment.setCorrections(mountModelNP[MM_IH].value, mountModelNP[MM_ID].value,
mountModelNP[MM_CH].value, mountModelNP[MM_NP].value,
mountModelNP[MM_MA].value, mountModelNP[MM_ME].value);
saveConfig(true, mountModelNP.getName());
return true;
}

if (strcmp(name, flipHourAngleNP.name) == 0)
if (flipHourAngleNP.isNameMatch(name))
{
IUUpdateNumber(&flipHourAngleNP, values, names, n);
flipHourAngleNP.s = IPS_OK;
IDSetNumber(&flipHourAngleNP, nullptr);
alignment.setFlipHourAngle(flipHourAngleN[0].value);
flipHourAngleNP.update(values, names, n);
flipHourAngleNP.setState(IPS_OK);
flipHourAngleNP.apply();
alignment.setFlipHourAngle(flipHourAngleNP[FLIP_HA].value);
return true;
}
#endif
Expand Down Expand Up @@ -525,31 +524,31 @@ bool ScopeSim::MoveWE(INDI_DIR_WE dir, TelescopeMotionCommand command)

IPState ScopeSim::GuideNorth(uint32_t ms)
{
double rate = GuideRateN[DEC_AXIS].value;
double rate = GuideRateNP[DEC_AXIS].value;
axisSecondary.StartGuide(rate, ms);
guidingNS = true;
return IPS_BUSY;
}

IPState ScopeSim::GuideSouth(uint32_t ms)
{
double rate = GuideRateN[DEC_AXIS].value;
double rate = GuideRateNP[DEC_AXIS].value;
axisSecondary.StartGuide(-rate, ms);
guidingNS = true;
return IPS_BUSY;
}

IPState ScopeSim::GuideEast(uint32_t ms)
{
double rate = GuideRateN[RA_AXIS].value;
double rate = GuideRateNP[RA_AXIS].value;
axisPrimary.StartGuide(-rate, ms);
guidingEW = true;
return IPS_BUSY;
}

IPState ScopeSim::GuideWest(uint32_t ms)
{
double rate = GuideRateN[RA_AXIS].value;
double rate = GuideRateNP[RA_AXIS].value;
axisPrimary.StartGuide(rate, ms);
guidingEW = true;
return IPS_BUSY;
Expand Down Expand Up @@ -617,11 +616,12 @@ bool ScopeSim::saveConfigItems(FILE *fp)
INDI::Telescope::saveConfigItems(fp);

#ifdef USE_SIM_TAB
IUSaveConfigNumber(fp, &GuideRateNP);
GuideRateNP.save(fp);
mountTypeSP.save(fp);
simPierSideSP.save(fp);
IUSaveConfigNumber(fp, &mountModelNP);
IUSaveConfigNumber(fp, &flipHourAngleNP);
mountModelNP.save(fp);
flipHourAngleNP.save(fp);

#endif
return true;
}
Expand Down
37 changes: 29 additions & 8 deletions drivers/telescope/telescope_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ class ScopeSim : public INDI::Telescope, public INDI::GuiderInterface
bool guidingNS = false;
bool guidingEW = false;

INumber GuideRateN[2];
INumberVectorProperty GuideRateNP;
INDI::PropertyNumber GuideRateNP {2};
enum
{
GUIDE_RATE_WE,
GUIDE_RATE_NS
};

Axis axisPrimary { "HaAxis" }; // hour angle mount axis
Axis axisSecondary { "DecAxis" }; // declination mount axis
Expand Down Expand Up @@ -133,13 +137,30 @@ class ScopeSim : public INDI::Telescope, public INDI::GuiderInterface
PS_ON
};

INumber mountModelN[6];
INumberVectorProperty mountModelNP;
INumber mountAxisN[2];
INumberVectorProperty mountAxisNP;
INDI::PropertyNumber mountModelNP {6};
enum
{
MM_IH,
MM_ID,
MM_CH,
MM_NP,
MM_MA,
MM_ME
};

INDI::PropertyNumber mountAxisNP {2};
enum
{
PRIMARY,
SECONDARY
};

INDI::PropertyNumber flipHourAngleNP {1};
enum
{
FLIP_HA
};

INumber flipHourAngleN[1];
INumberVectorProperty flipHourAngleNP;
#endif

};
Expand Down

0 comments on commit 3ddc969

Please sign in to comment.