Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues to build successfully #927

Merged
merged 3 commits into from
May 20, 2024
Merged

Fix issues to build successfully #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de1f8df
Fix issues to build successfully
naheedsa May 20, 2024
d3e4c96
use std and size_t for counts
naheedsa May 20, 2024
b2234ad
use size_t in Nex Dome
naheedsa May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions indi-armadillo-platypus/beaver_dome.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,12 @@ IPState Beaver::MoveAbs(double az)
//////////////////////////////////////////////////////////////////////////////
IPState Beaver::MoveRel(double azDiff)
{
m_TargetRotatorAz = DomeAbsPosN[0].value + azDiff;
m_TargetRotatorAz = DomeAbsPosNP[0].getValue() + azDiff;

if (m_TargetRotatorAz < DomeAbsPosN[0].min)
m_TargetRotatorAz += DomeAbsPosN[0].max;
if (m_TargetRotatorAz > DomeAbsPosN[0].max)
m_TargetRotatorAz -= DomeAbsPosN[0].max;
if (m_TargetRotatorAz < DomeAbsPosNP[0].getMin())
m_TargetRotatorAz += DomeAbsPosNP[0].getMax();
if (m_TargetRotatorAz > DomeAbsPosNP[0].getMax())
m_TargetRotatorAz -= DomeAbsPosNP[0].getMax();

// It will take a few cycles to reach final position
return MoveAbs(m_TargetRotatorAz);
Expand Down Expand Up @@ -378,7 +378,7 @@ bool Beaver::rotatorGetAz()
double res = 0;
if (sendCommand("!dome getaz#", res))
{
DomeAbsPosN[0].value = res;
DomeAbsPosNP[0].setValue(res);
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions indi-armadillo-platypus/dragonfly_dome.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void DragonFlyDome::TimerHit()
if (getDomeState() == DOME_MOVING || getDomeState() == DOME_PARKING || getDomeState() == DOME_UNPARKING)
{
// Roll off is opening
if (DomeMotionS[DOME_CW].s == ISS_ON)
if (DomeMotionSP[DOME_CW].getState() == ISS_ON)
{
if (isSensorOn(DomeControlSensorNP[SENSOR_UNPARKED].getValue()))
{
Expand All @@ -418,7 +418,7 @@ void DragonFlyDome::TimerHit()
}
}
// Roll Off is closing
else if (DomeMotionS[DOME_CCW].s == ISS_ON)
else if (DomeMotionSP[DOME_CCW].getState() == ISS_ON)
{
if (isSensorOn(DomeControlSensorNP[SENSOR_PARKED].getValue()))
{
Expand Down
Loading
Loading