summaryrefslogtreecommitdiffstats
path: root/kstars/kstars/indi/apogee
diff options
context:
space:
mode:
Diffstat (limited to 'kstars/kstars/indi/apogee')
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera.cpp62
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera.h10
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_Linux.cpp4
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_NET.cpp2
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_USB.cpp4
-rw-r--r--kstars/kstars/indi/apogee/Apogee.h8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_Linux.cpp80
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_Linux.h18
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_PCI.cpp6
-rw-r--r--kstars/kstars/indi/apogee/Camera_Example.cpp2
13 files changed, 110 insertions, 110 deletions
diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp
index 431fe392..457722b5 100644
--- a/kstars/kstars/indi/apogee/ApnCamera.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera.cpp
@@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
unsigned short TotalVPixels;
- while ( read_ImagingtqStatus() != Apn_Status_Flushing )
+ while ( read_ImagingStatus() != Apn_Status_Flushing )
{
Sleep( 20 );
}
@@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
PostRoiRows = 1;
}
- // Set up the tqgeometry for a full frame device
+ // Set up the geometry for a full frame device
if ( m_ApnSensorInfo->m_EnableSingleRowOffset )
{
PreRoiVBinning += PreRoiRows;
@@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV()
double CApnCamera::read_InputVoltage()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtInputVoltage;
}
@@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion()
bool CApnCamera::read_ShutterState()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtShutterState;
}
@@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution )
}
}
-Apn_tqStatus CApnCamera::read_ImagingtqStatus()
+Apn_Status CApnCamera::read_ImagingStatus()
{
bool Exposing, Active, Done, Flushing, WaitOnTrigger;
bool DataHalted, RamError;
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
- // Update the ImagingtqStatus
+ // Update the ImagingStatus
Exposing = false;
Active = false;
Done = false;
@@ -599,42 +599,42 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
if ( RamError )
{
- m_pvtImagingtqStatus = Apn_Status_PatternError;
+ m_pvtImagingStatus = Apn_Status_PatternError;
}
else
{
if ( DataHalted )
{
- m_pvtImagingtqStatus = Apn_Status_DataError;
+ m_pvtImagingStatus = Apn_Status_DataError;
}
else
{
if ( WaitOnTrigger )
{
- m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger;
+ m_pvtImagingStatus = Apn_Status_WaitingOnTrigger;
}
else
{
if ( Done && m_pvtImageInProgress )
{
m_pvtImageReady = true;
- m_pvtImagingtqStatus = Apn_Status_ImageReady;
+ m_pvtImagingStatus = Apn_Status_ImageReady;
}
else
{
if ( Active )
{
if ( Exposing )
- m_pvtImagingtqStatus = Apn_Status_Exposing;
+ m_pvtImagingStatus = Apn_Status_Exposing;
else
- m_pvtImagingtqStatus = Apn_Status_ImagingActive;
+ m_pvtImagingStatus = Apn_Status_ImagingActive;
}
else
{
if ( Flushing )
- m_pvtImagingtqStatus = Apn_Status_Flushing;
+ m_pvtImagingStatus = Apn_Status_Flushing;
else
- m_pvtImagingtqStatus = Apn_Status_Idle;
+ m_pvtImagingStatus = Apn_Status_Idle;
}
}
}
@@ -642,7 +642,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
}
/*
- switch( m_pvtImagingtqStatus )
+ switch( m_pvtImagingStatus )
{
case Apn_Status_DataError:
OutputDebugString( "ImagingStatus: Apn_Status_DataError" );
@@ -674,7 +674,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
}
*/
- return m_pvtImagingtqStatus;
+ return m_pvtImagingStatus;
}
Apn_LedMode CApnCamera::read_LedMode()
@@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable )
m_pvtCoolerEnable = CoolerEnable;
}
-Apn_CoolertqStatus CApnCamera::read_CoolertqStatus()
+Apn_CoolerStatus CApnCamera::read_CoolerStatus()
{
bool CoolerAtTemp;
bool CoolerActive;
bool CoolerTempRevised;
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
- // Update CoolertqStatus
+ // Update CoolerStatus
CoolerActive = false;
CoolerAtTemp = false;
CoolerTempRevised = false;
@@ -789,25 +789,25 @@ Apn_CoolertqStatus CApnCamera::read_CoolertqStatus()
// Now derive our cooler state
if ( !CoolerActive )
{
- m_pvtCoolertqStatus = Apn_CoolerStatus_Off;
+ m_pvtCoolerStatus = Apn_CoolerStatus_Off;
}
else
{
if ( CoolerTempRevised )
{
- m_pvtCoolertqStatus = Apn_CoolerStatus_Revision;
+ m_pvtCoolerStatus = Apn_CoolerStatus_Revision;
}
else
{
if ( CoolerAtTemp )
- m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint;
+ m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint;
else
- m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint;
+ m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint;
}
}
- return m_pvtCoolertqStatus;
+ return m_pvtCoolerStatus;
}
double CApnCamera::read_CoolerSetPoint()
@@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint )
double CApnCamera::read_CoolerDrive()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtCoolerDrive;
}
double CApnCamera::read_TempCCD()
{
- // UpdateGeneraltqStatus();
+ // UpdateGeneralStatus();
unsigned short TempReg;
unsigned short TempAvg;
@@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD()
double CApnCamera::read_TempHeatsink()
{
- // UpdateGeneraltqStatus();
+ // UpdateGeneralStatus();
unsigned short TempReg;
unsigned short TempAvg;
@@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults()
Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne );
Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo );
// the collor code not only determines the m_pvtCoolerEnable state, but
- // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus()
- if ( read_CoolertqStatus() == Apn_CoolerStatus_Off )
+ // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus()
+ if ( read_CoolerStatus() == Apn_CoolerStatus_Off )
m_pvtCoolerEnable = false;
else
m_pvtCoolerEnable = true;
@@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset()
return 0;
}
-void CApnCamera::UpdateGeneraltqStatus()
+void CApnCamera::UpdateGeneralStatus()
{
unsigned short StatusReg;
unsigned short HeatsinkTempReg;
diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h
index 90f49ff2..b0e6af03 100644
--- a/kstars/kstars/indi/apogee/ApnCamera.h
+++ b/kstars/kstars/indi/apogee/ApnCamera.h
@@ -129,7 +129,7 @@ public:
void write_DataBits( Apn_Resolution BitResolution );
- Apn_tqStatus read_ImagingtqStatus();
+ Apn_Status read_ImagingStatus();
Apn_LedMode read_LedMode();
void write_LedMode( Apn_LedMode LedMode );
@@ -138,7 +138,7 @@ public:
bool read_CoolerEnable();
void write_CoolerEnable( bool CoolerEnable );
- Apn_CoolertqStatus read_CoolertqStatus();
+ Apn_CoolerStatus read_CoolerStatus();
double read_CoolerSetPoint();
void write_CoolerSetPoint( double SetPoint );
double read_CoolerBackoffPoint();
@@ -231,7 +231,7 @@ public:
long InitTwelveBitAD();
long WriteTwelveBitOffset();
- void UpdateGeneraltqStatus();
+ void UpdateGeneralStatus();
// Internal private variables
bool m_ResetVerticalArrays;
@@ -264,8 +264,8 @@ public:
double m_pvtCoolerBackoffPoint;
- Apn_CoolertqStatus m_pvtCoolertqStatus;
- Apn_tqStatus m_pvtImagingtqStatus;
+ Apn_CoolerStatus m_pvtCoolerStatus;
+ Apn_Status m_pvtImagingStatus;
bool m_pvtShutterState;
bool m_pvtImageInProgress;
bool m_pvtImageReady;
diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
index 095dcf0a..cce9ba37 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
@@ -16,14 +16,14 @@ bool CApnCamera::read_Present()
{
// OutputDebugString( "read_Present()" );
- USHORT AptqStatus;
+ USHORT ApStatus;
USHORT DatumA;
USHORT DatumB;
char szMsg[80];
DatumA = 0x0;
DatumB = 0x0;
- AptqStatus = 0;
+ ApStatus = 0;
Write( FPGA_REG_SCRATCH, 0x8086 );
Read( FPGA_REG_SCRATCH, DatumA );
diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
index 9113ae8f..0f739121 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
@@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer,
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
Width = m_pvtWidth;
diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
index 1661d028..a6bbad42 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
@@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer,
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
Width = m_pvtWidth;
@@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData )
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
pRequestData = new USHORT[m_pvtWidth*m_pvtHeight];
diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h
index 70c1c359..d97740b2 100644
--- a/kstars/kstars/indi/apogee/Apogee.h
+++ b/kstars/kstars/indi/apogee/Apogee.h
@@ -29,7 +29,7 @@
#define Apn_CameraMode_ExternalTrigger 3
#define Apn_CameraMode_ExternalShutter 4
-#define Apn_tqStatus int
+#define Apn_Status int
#define Apn_Status_DataError -2
#define Apn_Status_PatternError -1
#define Apn_Status_Idle 0
@@ -54,7 +54,7 @@
#define Apn_LedState_ExtStartReadout 6
#define Apn_LedState_AtTemp 7
-#define Apn_CoolertqStatus int
+#define Apn_CoolerStatus int
#define Apn_CoolerStatus_Off 0
#define Apn_CoolerStatus_RampingToSetPoint 1
#define Apn_CoolerStatus_AtSetPoint 2
@@ -67,7 +67,7 @@
#define Apn_FanMode_High 3
-#define Camera_tqStatus int
+#define Camera_Status int
#define Camera_Status_Idle 0
#define Camera_Status_Waiting 1
#define Camera_Status_Exposing 2
@@ -76,7 +76,7 @@
#define Camera_Status_ImageReady 5
#define Camera_Status_Flushing 6
-#define Camera_CoolertqStatus int
+#define Camera_CoolerStatus int
#define Camera_CoolerStatus_Off 0
#define Camera_CoolerStatus_RampingToSetPoint 1
#define Camera_CoolerStatus_Correcting 2
diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
index 0481ecfc..45c16e13 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
@@ -56,8 +56,8 @@ CCameraIO::CCameraIO()
m_WaitingforLine = false;
m_WaitingforTrigger = false;
- m_tqStatus = Camera_Status_Idle;
- m_CoolertqStatus = Camera_CoolerStatus_Off;
+ m_Status = Camera_Status_Idle;
+ m_CoolerStatus = Camera_CoolerStatus_Off;
m_ExposureBinX = 0;
m_ExposureBinY = 0;
@@ -240,7 +240,7 @@ bool CCameraIO::FilterHome()
// Check for strobe
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
// Cycle all the way around if it's on the first time
@@ -268,13 +268,13 @@ bool CCameraIO::FilterHome()
Sleep ( STEP_DELAY );
val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
Sleep ( 10 );
val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
// Restore normal priority
@@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
int i;
unsigned short BIC = m_ExposureBIC + m_ExposureStartX;
- // Update internal variables in case application did not poll read_tqStatus
+ // Update internal variables in case application did not poll read_Status
m_WaitingforTrigger = false;
m_WaitingforLine = false;
if ( m_WaitingforImage )
- { // In case application did not poll read_tqStatus
+ { // In case application did not poll read_Status
m_WaitingforImage = false;
/////////////////////////////////////
@@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_FrameDone ) != 0 ) break;
if ( clock() > StopTime ) return false; // Timed out
@@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done
if ( clock() > StopTime )
@@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize )
int i;
if ( m_WaitingforLine )
- { // In case application did not poll read_tqStatus
+ { // In case application did not poll read_Status
m_WaitingforLine = false;
/////////////////////////////////////
@@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize )
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done
if ( clock() > StopTime )
@@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
if ( m_WaitingforTrigger )
{
- Camera_tqStatus stat;
+ Camera_Status stat;
while ( true )
{ // This will wait forever if no trigger happens
- stat = read_tqStatus();
+ stat = read_Status();
if ( stat == Camera_Status_Exposing ) break;
Sleep( 220 ); // dont bog down the CPU while polling
}
@@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC );
while ( true )
{
- Camera_tqStatus stat = read_tqStatus();
+ Camera_Status stat = read_Status();
if ( stat == Camera_Status_ImageReady ) break;
if ( clock() > StopTime ) return false; // Timed out, no image available
@@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
////////////////////////////////////////////////////////////
// Camera Settings
-Camera_tqStatus CCameraIO::read_tqStatus()
+Camera_Status CCameraIO::read_Status()
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_Exposing ) //11.0
{
ATLTRACE( "Exposing\r\n" );
m_WaitingforTrigger = false;
- m_tqStatus = Camera_Status_Exposing;
+ m_Status = Camera_Status_Exposing;
}
else if ( m_WaitingforTrigger )
- m_tqStatus = Camera_Status_Waiting;
+ m_Status = Camera_Status_Waiting;
else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11
{
ATLTRACE( "ImageReady\r\n" );
m_WaitingforImage = false;
- m_tqStatus = Camera_Status_ImageReady;
+ m_Status = Camera_Status_ImageReady;
}
else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1
{
ATLTRACE( "LineReady\r\n" );
m_WaitingforLine = false;
- m_tqStatus = Camera_Status_LineReady;
+ m_Status = Camera_Status_LineReady;
}
else if ( m_WaitingforImage || m_WaitingforLine )
{
ATLTRACE( "Flushing\r\n" );
- m_tqStatus = Camera_Status_Flushing;
+ m_Status = Camera_Status_Flushing;
}
else
- m_tqStatus = Camera_Status_Idle;
+ m_Status = Camera_Status_Idle;
- return m_tqStatus;
+ return m_Status;
}
bool CCameraIO::read_Present()
@@ -839,13 +839,13 @@ bool CCameraIO::read_Present()
bool FailedLoopback = false;
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true;
m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0
Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] );
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_LoopbackTest ) FailedLoopback = true;
*/
@@ -884,7 +884,7 @@ bool CCameraIO::read_Present()
bool CCameraIO::read_Shutter()
{
unsigned short regval = 0;
- Read( Reg_tqStatus, regval );
+ Read( Reg_Status, regval );
if ( !( regval & RegBit_Exposing ) )
{ // We are not exposing, but might have finnshed an exposure
// and have not called GetImage yet, so update our internal variable
@@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val )
m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0
unsigned short regval = 0;
- Read( Reg_tqStatus, regval );
+ Read( Reg_Status, regval );
if ( ( regval & RegBit_Exposing ) )
{
// Shutter will remain open if a Light frame is being taken
@@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val )
Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] );
}
-Camera_CoolertqStatus CCameraIO::read_CoolertqStatus()
+Camera_CoolerStatus CCameraIO::read_CoolerStatus()
{
unsigned short val = 0;
Read( Reg_CommandReadback, val );
@@ -1084,34 +1084,34 @@ Camera_CoolertqStatus CCameraIO::read_CoolertqStatus()
if ( val & RegBit_CoolerEnable ) //12.15
{
unsigned short val2 = 0;
- Read( Reg_tqStatus, val2 );
+ Read( Reg_Status, val2 );
if ( val & RegBit_CoolerShutdown ) //12.8
{
if ( val2 & RegBit_ShutdownComplete ) //11.6
- m_CoolertqStatus = Camera_CoolerStatus_AtAmbient;
+ m_CoolerStatus = Camera_CoolerStatus_AtAmbient;
else
- m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient;
+ m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient;
}
else
{
if ( val2 & RegBit_TempAtMax ) //11.5
- m_CoolertqStatus = Camera_CoolerStatus_AtMax;
+ m_CoolerStatus = Camera_CoolerStatus_AtMax;
else if ( val2 & RegBit_TempAtMin ) //11.4
- m_CoolertqStatus = Camera_CoolerStatus_AtMin;
+ m_CoolerStatus = Camera_CoolerStatus_AtMin;
else if ( val2 & RegBit_TempAtSetPoint ) //11.7
- m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint;
+ m_CoolerStatus = Camera_CoolerStatus_AtSetPoint;
// Check against last known cooler status
- else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint )
- m_CoolertqStatus = Camera_CoolerStatus_Correcting;
+ else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint )
+ m_CoolerStatus = Camera_CoolerStatus_Correcting;
else
- m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint;
+ m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint;
}
}
else
- m_CoolertqStatus = Camera_CoolerStatus_Off;
+ m_CoolerStatus = Camera_CoolerStatus_Off;
- return m_CoolertqStatus;
+ return m_CoolerStatus;
}
Camera_CoolerMode CCameraIO::read_CoolerMode()
@@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows )
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_FrameDone ) != 0 ) break;
if ( clock() > StopTime ) break; // Timed out
diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h
index e614aee1..e61ad838 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.h
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h
@@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10
const unsigned short RegBitShift_TempData = 0; // Bit 0
const unsigned short RegBitMask_TempData = 0xFF; // 8 bits
-const long RegISA_tqStatus = 0x006; // Register 11 in firmware
-const long Reg_tqStatus = 10; // Register 11
+const long RegISA_Status = 0x006; // Register 11 in firmware
+const long Reg_Status = 10; // Register 11
const unsigned short RegBit_Exposing = 0x1; // Bit 0
const unsigned short RegBit_LineDone = 0x2; // Bit 1
const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2
@@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir
const long RegPCI_BICCounterRead = 0x03C;
const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware
const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware
-const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware
+const long RegPCI_Status = 0x00C; // Register 11 in firmware
const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware
@@ -161,7 +161,7 @@ public:
////////////////////////////////////////////////////////////
// Camera Settings
- Camera_tqStatus read_tqStatus(); // Current camera state
+ Camera_Status read_Status(); // Current camera state
// <0: error codes
// 0: idle
// 1: flushing
@@ -223,7 +223,7 @@ public:
double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees
void write_CoolerSetPoint( double val ); // Celcius.
- Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status
+ Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status
Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode.
void write_CoolerMode( Camera_CoolerMode val );
@@ -300,7 +300,7 @@ public:
// The Duration parameter is the exposure time in seconds. The Light parameter controls
// the status of the shutter during the exposure, Light = True opens the shutter, Light
- // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus
+ // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus
// property to determine the start time of a triggered exposure and the end of an exposure.
bool Expose( double Duration, bool Light );
@@ -314,7 +314,7 @@ public:
// Drift scan methods
// Begins clocking and digitization of a single line of data begining with a vertical clock
- // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to
+ // sequence and ending with a buffer full of line data. Poll the CameraStatus property to
// determine when the data is ready for download.
bool DigitizeLine();
@@ -346,7 +346,7 @@ public:
short m_FilterStepPos; // Current filter position in our internal array
bool m_Shutter; // Last known shutter state
- Camera_tqStatus m_tqStatus; // Last known camera status
+ Camera_Status m_Status; // Last known camera status
Camera_Interface m_Interface; // String acronyms may be used in INI file.
// 0 or ISA: Industry Standard Architecture bus
@@ -356,7 +356,7 @@ public:
Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device
// 1 or CMOS: Complementary Metal-Oxide-Silicon
- Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status.
+ Camera_CoolerStatus m_CoolerStatus; // Last known cooler status.
unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off
// 1: Ramping to set point
// 2: Correcting
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
index bbff2080..16a6bb72 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
@@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
realreg = RegISA_TempData;
break;
- case Reg_tqStatus:
- realreg = RegISA_tqStatus;
+ case Reg_Status:
+ realreg = RegISA_Status;
break;
case Reg_CommandReadback:
realreg = RegISA_CommandReadback;
@@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
index 15c139dd..a83a594e 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
@@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
RegNumber = RegPCI_TempData;
break;
- case Reg_tqStatus:
- RegNumber = RegPCI_tqStatus;
+ case Reg_Status:
+ RegNumber = RegPCI_Status;
break;
case Reg_CommandReadback:
RegNumber = RegPCI_CommandReadback;
@@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
index bb143e55..7025d9ce 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
@@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
realreg = RegISA_TempData;
break;
- case Reg_tqStatus:
- realreg = RegISA_tqStatus;
+ case Reg_Status:
+ realreg = RegISA_Status;
break;
case Reg_CommandReadback:
realreg = RegISA_CommandReadback;
@@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
index ba9ce96d..3e6cc43e 100644
--- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
@@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val)
case Reg_TempData:
RegNumber = RegPCI_TempData;
break;
- case Reg_tqStatus:
- RegNumber = RegPCI_tqStatus;
+ case Reg_Status:
+ RegNumber = RegPCI_Status;
break;
case Reg_CommandReadback:
RegNumber = RegPCI_CommandReadback;
@@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
diff --git a/kstars/kstars/indi/apogee/Camera_Example.cpp b/kstars/kstars/indi/apogee/Camera_Example.cpp
index 51831ecc..f1f64121 100644
--- a/kstars/kstars/indi/apogee/Camera_Example.cpp
+++ b/kstars/kstars/indi/apogee/Camera_Example.cpp
@@ -295,7 +295,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset )
}
/////////////////////////////////////////////////////////////////////////////////
- // Necessary tqgeometry settings
+ // Necessary geometry settings
if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen))
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 20:53:01 +0000