diff options
Diffstat (limited to 'kstars/kstars/indi/apogee/ApnCamera.cpp')
| -rw-r--r-- | kstars/kstars/indi/apogee/ApnCamera.cpp | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 4e8c1b00..4ed8d8c6 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_ImagingStatus() != Apn_Status_Flushing ) + while ( read_ImagingtqStatus() != Apn_tqStatus_Flushing ) { Sleep( 20 ); } @@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) PostRoiRows = 1; } - // Set up the geometry for a full frame device + // Set up the tqgeometry for a full frame device if ( m_ApnSensorInfo->m_EnableSingleRowOffset ) { PreRoiVBinning += PreRoiRows; @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_Status CApnCamera::read_ImagingStatus() +Apn_tqStatus CApnCamera::read_ImagingtqStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update the ImagingStatus + // Update the ImagingtqStatus Exposing = false; Active = false; Done = false; @@ -576,65 +576,65 @@ Apn_Status CApnCamera::read_ImagingStatus() DataHalted = false; RamError = false; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) Active = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) Exposing = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) Done = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) Flushing = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) WaitOnTrigger = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) DataHalted = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) RamError = true; if ( RamError ) { - m_pvtImagingStatus = Apn_Status_PatternError; + m_pvtImagingtqStatus = Apn_tqStatus_PatternError; } else { if ( DataHalted ) { - m_pvtImagingStatus = Apn_Status_DataError; + m_pvtImagingtqStatus = Apn_tqStatus_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingtqStatus = Apn_tqStatus_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingStatus = Apn_Status_ImageReady; + m_pvtImagingtqStatus = Apn_tqStatus_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingStatus = Apn_Status_Exposing; + m_pvtImagingtqStatus = Apn_tqStatus_Exposing; else - m_pvtImagingStatus = Apn_Status_ImagingActive; + m_pvtImagingtqStatus = Apn_tqStatus_ImagingActive; } else { if ( Flushing ) - m_pvtImagingStatus = Apn_Status_Flushing; + m_pvtImagingtqStatus = Apn_tqStatus_Flushing; else - m_pvtImagingStatus = Apn_Status_Idle; + m_pvtImagingtqStatus = Apn_tqStatus_Idle; } } } @@ -642,39 +642,39 @@ Apn_Status CApnCamera::read_ImagingStatus() } /* - switch( m_pvtImagingStatus ) + switch( m_pvtImagingtqStatus ) { - case Apn_Status_DataError: - OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); + case Apn_tqStatus_DataError: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_DataError" ); break; - case Apn_Status_PatternError: - OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); + case Apn_tqStatus_PatternError: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_PatternError" ); break; - case Apn_Status_Idle: - OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); + case Apn_tqStatus_Idle: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Idle" ); break; - case Apn_Status_Exposing: - OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); + case Apn_tqStatus_Exposing: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Exposing" ); break; - case Apn_Status_ImagingActive: - OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); + case Apn_tqStatus_ImagingActive: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImagingActive" ); break; - case Apn_Status_ImageReady: - OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); + case Apn_tqStatus_ImageReady: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImageReady" ); break; - case Apn_Status_Flushing: - OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); + case Apn_tqStatus_Flushing: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Flushing" ); break; - case Apn_Status_WaitingOnTrigger: - OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); + case Apn_tqStatus_WaitingOnTrigger: + OutputDebugString( "ImagingtqStatus: Apn_tqStatus_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingStatus; + return m_pvtImagingtqStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,51 +763,51 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolerStatus CApnCamera::read_CoolerStatus() +Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update CoolerStatus + // Update CoolertqStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) CoolerAtTemp = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) CoolerActive = true; - if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) + if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) CoolerTempRevised = true; // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Off; + m_pvtCoolertqStatus = Apn_CoolertqStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Revision; + m_pvtCoolertqStatus = Apn_CoolertqStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolertqStatus = Apn_CoolertqStatus_AtSetPoint; else - m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolertqStatus = Apn_CoolertqStatus_RampingToSetPoint; } } - return m_pvtCoolerStatus; + return m_pvtCoolertqStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); 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 UpdateGeneralStatus() as part of read_CoolerStatus() - if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() + if ( read_CoolertqStatus() == Apn_CoolertqStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,9 +1827,9 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneralStatus() +void CApnCamera::UpdateGeneraltqStatus() { - unsigned short StatusReg; + unsigned short tqStatusReg; unsigned short HeatsinkTempReg; unsigned short CcdTempReg; unsigned short CoolerDriveReg; @@ -1840,7 +1840,7 @@ void CApnCamera::UpdateGeneralStatus() // Read the general status register of the device - QueryStatusRegs( StatusReg, + QuerytqStatusRegs( tqStatusReg, HeatsinkTempReg, CcdTempReg, CoolerDriveReg, @@ -1848,7 +1848,7 @@ void CApnCamera::UpdateGeneralStatus() TdiCounterReg, SequenceCounterReg ); - m_pvtStatusReg = StatusReg; + m_pvtqStatusReg = tqStatusReg; HeatsinkTempReg &= FPGA_MASK_TEMP_PARAMS; CcdTempReg &= FPGA_MASK_TEMP_PARAMS; @@ -1869,7 +1869,7 @@ void CApnCamera::UpdateGeneralStatus() m_pvtInputVoltage = VoltageReg * APN_VOLTAGE_RESOLUTION; // Update ShutterState - m_pvtShutterState = ( (m_pvtStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); + m_pvtShutterState = ( (m_pvtqStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); } |