diff options
Diffstat (limited to 'kstars/kstars/indi')
52 files changed, 338 insertions, 314 deletions
diff --git a/kstars/kstars/indi/LICENSE b/kstars/kstars/indi/LICENSE index ae23fcfd..fbb61ee9 100644 --- a/kstars/kstars/indi/LICENSE +++ b/kstars/kstars/indi/LICENSE @@ -135,7 +135,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -257,7 +257,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 29aa23a6..ff4982c2 100644 --- a/kstars/kstars/indi/Makefile.am +++ b/kstars/kstars/indi/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + appdatadir = $(kde_datadir)/kstars appdata_DATA = drivers.xml apogee_caminfo.xml @@ -17,45 +20,59 @@ noinst_LIBRARIES = liblilxml.a libindicom.a indiserver_SOURCES = indiserver.c fq.c indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET) +indiserver_LDFLAGS = $(LIB_QT) lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp lx200generic_LDADD = liblilxml.a libindicom.a -lm +lx200generic_LDFLAGS = $(LIB_QT) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a +lx200basic_LDFLAGS = $(LIB_QT) celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp celestrongps_LDADD = liblilxml.a libindicom.a -lm +celestrongps_LDFLAGS = $(LIB_QT) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a +apmount_LDFLAGS = $(LIB_QT) fliccd_SOURCES = eventloop.c base64.c fli_ccd.c indidrivermain.c fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET) +fliccd_LDFLAGS = $(LIB_QT) fliwheel_SOURCES = eventloop.c base64.c fli_wheel.c indidrivermain.c fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm +fliwheel_LDFLAGS = $(LIB_QT) v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4ldriver_LDFLAGS = $(LIB_QT) v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4lphilips_LDFLAGS = $(LIB_QT) meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz +meade_lpi_LDFLAGS = $(LIB_QT) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm +temma_LDFLAGS = $(LIB_QT) skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c skycommander_LDADD = liblilxml.a libindicom.a -lm +skycommander_LDFLAGS = $(LIB_QT) apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz +apogee_ppi_LDFLAGS = $(LIB_QT) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz +sbigccd_LDFLAGS = $(LIB_QT) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index d1c05b66..b400dbcb 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -40,7 +40,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -230,7 +231,7 @@ void APMount::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); fillNumber(&GeoN[0], "LAT", "Lat. D:M:S +N", "%10.6m", -90., 90., 0., 0.); fillNumber(&GeoN[1], "LONG", "Long. D:M:S +E", "%10.6m", 0., 360., 0., 0.); @@ -728,9 +729,9 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSP, err, "Setting alignment"); + handleError(&AlignmentSP, err, "Setting tqalignment"); return; } diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 4e8c1b00..f96d228a 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_Status_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; @@ -599,42 +599,42 @@ Apn_Status CApnCamera::read_ImagingStatus() if ( RamError ) { - m_pvtImagingStatus = Apn_Status_PatternError; + m_pvtImagingtqStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingStatus = Apn_Status_DataError; + m_pvtImagingtqStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingStatus = Apn_Status_ImageReady; + m_pvtImagingtqStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingStatus = Apn_Status_Exposing; + m_pvtImagingtqStatus = Apn_Status_Exposing; else - m_pvtImagingStatus = Apn_Status_ImagingActive; + m_pvtImagingtqStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingStatus = Apn_Status_Flushing; + m_pvtImagingtqStatus = Apn_Status_Flushing; else - m_pvtImagingStatus = Apn_Status_Idle; + m_pvtImagingtqStatus = Apn_Status_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" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_DataError" ); break; case Apn_Status_PatternError: - OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_PatternError" ); break; case Apn_Status_Idle: - OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Idle" ); break; case Apn_Status_Exposing: - OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Exposing" ); break; case Apn_Status_ImagingActive: - OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImagingActive" ); break; case Apn_Status_ImageReady: - OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImageReady" ); break; case Apn_Status_Flushing: - OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Flushing" ); break; case Apn_Status_WaitingOnTrigger: - OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingStatus; + return m_pvtImagingtqStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,16 +763,16 @@ 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; @@ -789,25 +789,25 @@ Apn_CoolerStatus CApnCamera::read_CoolerStatus() // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Off; + m_pvtCoolertqStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Revision; + m_pvtCoolertqStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_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; @@ -1493,7 +1493,7 @@ long CApnCamera::InitDefaults() unsigned short PreRoiRows, PostRoiRows; unsigned short PreRoiVBinning, PostRoiVBinning; - unsigned short UnbinnedRoiY; // Vertical ROI pixels + unsigned short UnbinnedRoiY; //Qt::Vertical ROI pixels // Read the Camera ID register @@ -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_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneralStatus() +void CApnCamera::UpdateGeneraltqStatus() { unsigned short StatusReg; unsigned short HeatsinkTempReg; diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index b0e6af03..90f49ff2 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_Status read_ImagingStatus(); + Apn_tqStatus read_ImagingtqStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolerStatus read_CoolerStatus(); + Apn_CoolertqStatus read_CoolertqStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneralStatus(); + void UpdateGeneraltqStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,8 +264,8 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolerStatus m_pvtCoolerStatus; - Apn_Status m_pvtImagingStatus; + Apn_CoolertqStatus m_pvtCoolertqStatus; + Apn_tqStatus m_pvtImagingtqStatus; 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 cce9ba37..095dcf0a 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 ApStatus; + USHORT AptqStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - ApStatus = 0; + AptqStatus = 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 0f739121..9113ae8f 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_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index a6bbad42..1661d028 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_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index d97740b2..70c1c359 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_Status int +#define Apn_tqStatus 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_CoolerStatus int +#define Apn_CoolertqStatus 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_Status int +#define Camera_tqStatus 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_CoolerStatus int +#define Camera_CoolertqStatus 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 67d217ec..2b97db7e 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_Status = Camera_Status_Idle; - m_CoolerStatus = Camera_CoolerStatus_Off; + m_tqStatus = Camera_Status_Idle; + m_CoolertqStatus = Camera_CoolerStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -88,7 +88,7 @@ CCameraIO::CCameraIO() m_FastShutterBits_Mode = 0; m_FastShutterBits_Test = 0; - m_IRQMask = 0; + m_IRTQMask = 0; saveIRQS = 0; } @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status + // Update internal variables in case application did not poll read_tqStatus m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); if ( ret ) { // We were successfull @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); return ret; } @@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_Status stat; + Camera_tqStatus stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_Status(); + stat = read_tqStatus(); 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_Status stat = read_Status(); + Camera_tqStatus stat = read_tqStatus(); 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_Status CCameraIO::read_Status() +Camera_tqStatus CCameraIO::read_tqStatus() { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_Status = Camera_Status_Exposing; + m_tqStatus = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_Status = Camera_Status_Waiting; + m_tqStatus = Camera_Status_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_Status = Camera_Status_ImageReady; + m_tqStatus = Camera_Status_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_Status = Camera_Status_LineReady; + m_tqStatus = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_Status = Camera_Status_Flushing; + m_tqStatus = Camera_Status_Flushing; } else - m_Status = Camera_Status_Idle; + m_tqStatus = Camera_Status_Idle; - return m_Status; + return m_tqStatus; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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_Status, regval ); + Read( Reg_tqStatus, 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_Status, regval ); + Read( Reg_tqStatus, 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_CoolerStatus CCameraIO::read_CoolerStatus() +Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolerStatus CCameraIO::read_CoolerStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_Status, val2 ); + Read( Reg_tqStatus, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolerStatus = Camera_CoolerStatus_AtAmbient; + m_CoolertqStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolerStatus = Camera_CoolerStatus_AtMax; + m_CoolertqStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolerStatus = Camera_CoolerStatus_AtMin; + m_CoolertqStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolerStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolertqStatus = Camera_CoolerStatus_Correcting; else - m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolerStatus = Camera_CoolerStatus_Off; + m_CoolertqStatus = Camera_CoolerStatus_Off; - return m_CoolerStatus; + return m_CoolertqStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, 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 d6a61e1c..62f50421 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_Status = 0x006; // Register 11 in firmware -const long Reg_Status = 10; // Register 11 +const long RegISA_tqStatus = 0x006; // Register 11 in firmware +const long Reg_tqStatus = 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_Status = 0x00C; // Register 11 in firmware +const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_Status read_Status(); // Current camera state + Camera_tqStatus read_tqStatus(); // 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_CoolerStatus read_CoolerStatus(); // Returns current cooler status + Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -238,7 +238,7 @@ public: // Exposure Settings // The following variables are latched in Expose method, until next Reset or GetImage - short m_BinX, m_BinY; // Horizontal and vertical binning. + short m_BinX, m_BinY; //Qt::Horizontal and vertical binning. short m_StartX, m_StartY; // Zero based subframe start position in unbinned pixels. short m_NumX, m_NumY; // Subframe size in binned pixels. @@ -249,7 +249,7 @@ public: short m_Columns, m_Rows; // Total columns/rows on CCD (physical). short m_ImgColumns, m_ImgRows; // Unbinned columns/rows in imaging area short m_SkipC, m_SkipR; // Deleted data columns/rows not to be displayed or saved - short m_HFlush, m_VFlush; // Horizontal/Vertical flush binning. + short m_HFlush, m_VFlush; //Qt::Horizontal/Vertical flush binning. short m_BIC, m_BIR; // Before Image Column/Row count (dark non-imaging pixels). //////////////////////////////////////////////////////////// @@ -271,8 +271,8 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ mask -// void UnmaskIrqs(); + // Restore default IRQ tqmask +// void UntqmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -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 CameraStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus // 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 CameraStatus property to + // sequence and ending with a buffer full of line data. Poll the CameratqStatus 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_Status m_Status; // Last known camera status + Camera_tqStatus m_tqStatus; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,8 +356,8 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. - unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off + Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + unsigned int m_IRTQMask; // Set of IRQs tqmasked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient @@ -367,12 +367,12 @@ public: // 7: At set point // Latched public variables used during Exposure..GetImage sequence - short m_ExposureBinX, m_ExposureBinY; // Horizontal and vertical binning. + short m_ExposureBinX, m_ExposureBinY; //Qt::Horizontal and vertical binning. short m_ExposureStartX, m_ExposureStartY; // Subframe start position in unbinned pixels. short m_ExposureNumX, m_ExposureNumY; // Subframe size in binned pixels. short m_ExposureColumns, m_ExposureRows; // Total columns/rows on CCD (physical). short m_ExposureSkipC, m_ExposureSkipR; // Deleted data columns/rows not to be displayed or saved to disk. - short m_ExposureHFlush, m_ExposureVFlush; // Horizontal/Vertical flush binning. + short m_ExposureHFlush, m_ExposureVFlush; //Qt::Horizontal/Vertical flush binning. short m_ExposureBIC, m_ExposureBIR; // Before Image Column/Row count (dark non-imaging pixels). unsigned short m_ExposureAIC; // Calculated After Image Column count (dark non-imaging pixels). unsigned short m_ExposureRemainingLines; // Number of lines to be clocked out by GetImage diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..bbff2080 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_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 a83a594e..15c139dd 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_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 7025d9ce..bb143e55 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_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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_Status, val ); + Read( Reg_tqStatus, 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 3e6cc43e..ba9ce96d 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_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; 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_Status, val ); + Read( Reg_tqStatus, 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 f1f64121..52a95f43 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -295,9 +295,9 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) } ///////////////////////////////////////////////////////////////////////////////// - // Necessary geometry settings + // Necessary tqgeometry settings - if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "rows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_Rows = val; @@ -310,7 +310,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) return CCD_OPEN_CFGDATA; // rows MUST be defined } - if (CfgGet (inifp, "geometry", "columns", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "columns", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_Columns = val; @@ -490,31 +490,31 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) ///////////////////////////////////////////////////////////////////////////////// // Geometry - if (CfgGet (inifp, "geometry", "bic", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bic", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXCOLUMNS ) cam->m_BIC = val; } - if (CfgGet (inifp, "geometry", "bir", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bir", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXROWS ) cam->m_BIR = val; } - if (CfgGet (inifp, "geometry", "skipc", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipc", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXCOLUMNS ) cam->m_SkipC = val; } - if (CfgGet (inifp, "geometry", "skipr", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipr", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXROWS ) cam->m_SkipR = val; } - if (CfgGet (inifp, "geometry", "imgcols", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgcols", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_ImgColumns = val; @@ -522,7 +522,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; - if (CfgGet (inifp, "geometry", "imgrows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgrows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_ImgRows = val; @@ -530,13 +530,13 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; - if (CfgGet (inifp, "geometry", "hflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "hflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXHBIN ) cam->m_HFlush = val; } - if (CfgGet (inifp, "geometry", "vflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "vflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXVBIN ) cam->m_VFlush = val; diff --git a/kstars/kstars/indi/apogee/Makefile.am b/kstars/kstars/indi/apogee/Makefile.am index 3d62dadc..a49927d4 100644 --- a/kstars/kstars/indi/apogee/Makefile.am +++ b/kstars/kstars/indi/apogee/Makefile.am @@ -1,4 +1,6 @@ -INCLUDES = +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + METASOURCES = AUTO if HAVE_LIBUSB diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 9898018f..6eb7063c 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value void ApogeeCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readStatus); + IDLog("Error in exposure! Read status: %d\n", readtqStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; @@ -891,7 +891,7 @@ bool ApogeeCam::initCamera() { LilXML *XMLParser = newLilXML(); XMLEle *root = NULL, *camera = NULL, *ele = NULL; - XMLEle *system = NULL, *geometry = NULL, *temp = NULL, *ccd = NULL; + XMLEle *system = NULL, *tqgeometry = NULL, *temp = NULL, *ccd = NULL; XMLAtt *ap; FILE *spFile = NULL; char errmsg[1024]; @@ -948,7 +948,7 @@ bool ApogeeCam::initCamera() // Let's get the subsections now system = findXMLEle(camera, "System"); - geometry = findXMLEle(camera, "Geometry"); + tqgeometry = findXMLEle(camera, "Geometry"); temp = findXMLEle(camera, "Temp"); ccd = findXMLEle(camera, "CCD"); @@ -960,7 +960,7 @@ bool ApogeeCam::initCamera() return false; } - if (geometry == NULL) + if (tqgeometry == NULL) { IDLog("Error: Unable to find Geometry element in camera.\n"); IDMessage(mydev, "Error: Unable to find Geometry element in camera."); @@ -1000,7 +1000,7 @@ bool ApogeeCam::initCamera() bAddr = hextoi(valuXMLAtt(findXMLAtt(system, "Base"))) & 0xFFF; // Rows - ap = findXMLAtt(geometry, "Rows"); + ap = findXMLAtt(tqgeometry, "Rows"); if (!ap) { IDLog("Error: Unable to find attribute Rows.\n"); @@ -1012,7 +1012,7 @@ bool ApogeeCam::initCamera() cam->m_Rows = hextoi(valuXMLAtt(ap)); // Columns - ap = findXMLAtt(geometry, "Columns"); + ap = findXMLAtt(tqgeometry, "Columns"); if (!ap) { IDLog("Error: Unable to find attribute Columns.\n"); @@ -1210,7 +1210,7 @@ bool ApogeeCam::initCamera() } // BIC - ele = findXMLEle(geometry, "BIC"); + ele = findXMLEle(tqgeometry, "BIC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1219,7 +1219,7 @@ bool ApogeeCam::initCamera() } // BIR - ele = findXMLEle(geometry, "BIR"); + ele = findXMLEle(tqgeometry, "BIR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1228,7 +1228,7 @@ bool ApogeeCam::initCamera() } // SKIPC - ele = findXMLEle(geometry, "SKIPC"); + ele = findXMLEle(tqgeometry, "SKIPC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1237,7 +1237,7 @@ bool ApogeeCam::initCamera() } // SKIPR - ele = findXMLEle(geometry, "SKIPR"); + ele = findXMLEle(tqgeometry, "SKIPR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1246,7 +1246,7 @@ bool ApogeeCam::initCamera() } // IMG COlS - ele = findXMLEle(geometry, "ImgCols"); + ele = findXMLEle(tqgeometry, "ImgCols"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1257,7 +1257,7 @@ bool ApogeeCam::initCamera() cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; // IMG ROWS - ele = findXMLEle(geometry, "ImgRows"); + ele = findXMLEle(tqgeometry, "ImgRows"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1268,7 +1268,7 @@ bool ApogeeCam::initCamera() cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; // Hor Flush - ele = findXMLEle(geometry, "HFlush"); + ele = findXMLEle(tqgeometry, "HFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1277,7 +1277,7 @@ bool ApogeeCam::initCamera() } // Ver Flush - ele = findXMLEle(geometry, "VFlush"); + ele = findXMLEle(tqgeometry, "VFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c index 28424512..e83db546 100644 --- a/kstars/kstars/indi/base64.c +++ b/kstars/kstars/indi/base64.c @@ -30,7 +30,7 @@ #include "base64.h" static const char base64digits[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define BAD (-1) static const char base64val[] = { diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp index a187aaf8..e25c95ac 100644 --- a/kstars/kstars/indi/celestrongps.cpp +++ b/kstars/kstars/indi/celestrongps.cpp @@ -65,7 +65,7 @@ static INumber eq[] = { }; //TODO decide appropiate TIME_OUT static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -125,7 +125,7 @@ CelestronGPS::CelestronGPS() JD = 0; - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from Celeston GPS device...\n"); } @@ -316,7 +316,7 @@ void CelestronGPS::ISNewNumber (const char *dev, const char *name, double values JD = UTtoJD(tp); IDLog("We recevined JNOW RA %f - DEC %f\n", newRA, newDEC);; - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); IDLog("Processed to RA %f - DEC %f\n", newRA, newDEC);*/ //eqNum.np[0].value = values[0]; @@ -637,7 +637,7 @@ void CelestronGPS::ISPoll() currentRA = targetRA; currentDEC = targetDEC; - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -693,7 +693,7 @@ void CelestronGPS::ISPoll() currentRA = GetRA(); currentDEC = GetDec(); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; diff --git a/kstars/kstars/indi/fitsrw.c b/kstars/kstars/indi/fitsrw.c index b21622bf..69b934b2 100644 --- a/kstars/kstars/indi/fitsrw.c +++ b/kstars/kstars/indi/fitsrw.c @@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, {double offs, scale; double datadiff, pixdiff; unsigned char pixbuffer[4096], *pix, *cdata; - unsigned char creplace; + unsigned char ctqreplace; int transcount = 0; long tdata, tmin, tmax; int maxelem; @@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255; cdata = (unsigned char *)buf; - creplace = (unsigned char)trans->replacement; + ctqreplace = (unsigned char)trans->replacement; switch (hdulist->bitpix) { @@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { bp8 = (FITS_BITPIX8)*(pix++); if (bp8 == bp8blank) /* Is it a blank pixel ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { tdata = (long)(bp8 * scale + offs); @@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX16 (pix, bp16); if (bp16 == bp16blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp16 * scale + offs); @@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX32 (pix, bp32); if (bp32 == bp32blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp32 * scale + offs); @@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_32 (pix)) /* An IEEE special value ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { FITS_GETBITPIXM32 (pix, bpm32); @@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_64 (pix)) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { FITS_GETBITPIXM64 (pix, bpm64); diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index 68df7945..f089403c 100644 --- a/kstars/kstars/indi/fli/libfli.c +++ b/kstars/kstars/indi/fli/libfli.c @@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y, @see FLIExposeFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime) { @@ -554,7 +554,7 @@ LIBFLIAPI FLISetImageArea(flidev_t dev, long ul_x, long ul_y, @param dev Camera to set horizontal bin factor of. - @param hbin Horizontal bin factor. + @param hbinQt::Horizontal bin factor. @return Zero on success. @return Non-zero on failure. @@ -577,7 +577,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin) @param dev Camera to set vertical bin factor of. - @param vbin Vertical bin factor. + @param vbinQt::Vertical bin factor. @return Zero on success. @return Non-zero on failure. @@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype) @return Non-zero on failure. @see FLIExposeFrame - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft) { CHKDEVICE(dev); @@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width) @see FLISetBitDepth @see FLIGrabFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index 351a9e8e..ca6a7200 100644 --- a/kstars/kstars/indi/fli/libfli.h +++ b/kstars/kstars/indi/fli/libfli.h @@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); LIBFLIAPI FLICancelExposure(flidev_t dev); -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft); LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature); LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width); diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c index 4fa9a95a..1cd195cd 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -76,8 +76,8 @@ extern int errno; #define MAX_CCD_TEMP 45 /* Max CCD temperature */ #define MIN_CCD_TEMP -55 /* Min CCD temperature */ -#define MAX_X_BIN 16. /* Max Horizontal binning */ -#define MAX_Y_BIN 16. /* Max Vertical binning */ +#define MAX_X_BIN 16. /* MaxQt::Horizontal binning */ +#define MAX_Y_BIN 16. /* MaxQt::Vertical binning */ #define MAX_PIXELS 4096 /* Max number of pixels in one dimension */ #define POLLMS 1000 /* Polling time (ms) */ #define TEMP_THRESHOLD .25 /* Differential temperature threshold (C)*/ @@ -610,13 +610,13 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "FLIGetExposureStatus() failed. %s.", strerror((int)-err)); - IDLog("FLIGetExposureStatus() failed. %s.\n", strerror((int)-err)); + IDSetNumber(&ExposeTimeNP, "FLIGetExposuretqStatus() failed. %s.", strerror((int)-err)); + IDLog("FLIGetExposuretqStatus() failed. %s.\n", strerror((int)-err)); break; } diff --git a/kstars/kstars/indi/indiapi.h b/kstars/kstars/indi/indiapi.h index 324b7824..d2ffd6fe 100644 --- a/kstars/kstars/indi/indiapi.h +++ b/kstars/kstars/indi/indiapi.h @@ -136,7 +136,7 @@ typedef struct { char label[MAXINDILABEL]; /** malloced text string */ char *text; - /** pointer to parent */ + /** pointer to tqparent */ struct _ITextVectorProperty *tvp; /** handy place to hang helper info */ void *aux0; @@ -182,7 +182,7 @@ typedef struct { double min, max; /** range, ignore if min == max */ double step; /** step size, ignore if step == 0 */ double value; /** current value */ - struct _INumberVectorProperty *nvp; /** pointer to parent */ + struct _INumberVectorProperty *nvp; /** pointer to tqparent */ void *aux0, *aux1; /** handy place to hang helper info */ } INumber; @@ -235,7 +235,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this switch's label */ ISState s; /** this switch's state */ - struct _ISwitchVectorProperty *svp; /** pointer to parent */ + struct _ISwitchVectorProperty *svp; /** pointer to tqparent */ void *aux; /** handy place to hang helper info */ } ISwitch; @@ -276,7 +276,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this lights's label */ IPState s; /** this lights's state */ - struct _ILightVectorProperty *lvp; /** pointer to parent */ + struct _ILightVectorProperty *lvp; /** pointer to tqparent */ void *aux; /** handy place to hang helper info */ } ILight; @@ -320,7 +320,7 @@ typedef struct { /* one BLOB descriptor */ int bloblen; /** n uncompressed bytes */ int size; - /** pointer to parent */ + /** pointer to tqparent */ struct _IBLOBVectorProperty *bvp; /** handy place to hang helper info */ void *aux0, *aux1, *aux2; diff --git a/kstars/kstars/indi/indicom.c b/kstars/kstars/indi/indicom.c index 15b02c8e..6b648f99 100644 --- a/kstars/kstars/indi/indicom.c +++ b/kstars/kstars/indi/indicom.c @@ -63,7 +63,7 @@ void updateAstroValues( double jd ); void nutate(double *RA, double *Dec); void aberrate(double *RA, double *Dec); void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); void getSexComponents(double value, int *d, int *m, int *s); double K = ( 20.49552 / 3600. ); @@ -370,7 +370,7 @@ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec) *RA = ( *RA + 360.0 ); } -void apparentCoord(double jd0, double jdf, double *RA, double *Dec) +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec) { *RA = *RA * 15.0; diff --git a/kstars/kstars/indi/indicom.h b/kstars/kstars/indi/indicom.h index 726c7dcd..6f59a63d 100644 --- a/kstars/kstars/indi/indicom.h +++ b/kstars/kstars/indi/indicom.h @@ -169,13 +169,13 @@ void aberrate(double *RA, double *Dec); */ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -/** \brief Calculate the apparent coordiantes for RA and Dec from any epoch to any epoch. +/** \brief Calculate the aptqparent coordiantes for RA and Dec from any epoch to any epoch. \param jd0 starting epoch. \param jdf final epoch. \param RA a pointer to a double containing the Right ascension in hours. The function stores the processed Right ascension back in this variable. \param Dec a pointer to a double containing the delination in degrees. The function stores the processed delination back in this variable. */ -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); /*@}*/ diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index ad4d2ffd..2f73ca5d 100644 --- a/kstars/kstars/indi/indiserver.c +++ b/kstars/kstars/indi/indiserver.c @@ -316,7 +316,7 @@ startDvr (DvrInfo *dp) /* go -- should never return */ execlp (dp->name, dp->name, NULL); fprintf (stderr, "Driver %s: %s\n", dp->name, strerror(errno)); - _exit (1); /* parent will notice EOF shortly */ + _exit (1); /* tqparent will notice EOF shortly */ } /* don't need child's side of pipes */ @@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev) pthread_mutex_unlock (&client_m); } -/* free Msg mp and everything it contains */ +/* free Msg mp and everything it tqcontains */ static void freeMsg (Msg *mp) { diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index c8344b5e..4d52aaf2 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -78,7 +78,7 @@ struct _LilXML { /* internal representation of a (possibly nested) XML element */ struct _xml_ele { char *tag; /* element tag */ - struct _xml_ele *pe; /* parent element, or NULL if root */ + struct _xml_ele *pe; /* tqparent element, or NULL if root */ XMLAtt **at; /* list of attributes */ int nat; /* number of attributes */ int ait; /* used to iterate over at[] */ @@ -130,7 +130,7 @@ delLilXML (LilXML *lp) freemem (lp); } -/* delete ep and all its children */ +/* delete ep and all its tqchildren */ void delXMLEle (XMLEle *ep) { @@ -294,16 +294,16 @@ nextXMLAtt (XMLEle *ep, int init) return (ep->at[ait]); } -/* return parent of given XMLEle */ +/* return tqparent of given XMLEle */ XMLEle * -parentXMLEle (XMLEle *ep) +tqparentXMLEle (XMLEle *ep) { return (ep->pe); } -/* return parent element of given XMLAtt */ +/* return tqparent element of given XMLAtt */ XMLEle * -parentXMLAtt (XMLAtt *ap) +tqparentXMLAtt (XMLAtt *ap) { return (ap->ce); } @@ -632,7 +632,7 @@ pushXMLEle(LilXML *lp) resetEndTag(lp); } -/* point ce to parent of current ce. +/* point ce to tqparent of current ce. * endtag no longer valid. */ static void diff --git a/kstars/kstars/indi/lilxml.h b/kstars/kstars/indi/lilxml.h index 98bfdd2b..1b638f5b 100644 --- a/kstars/kstars/indi/lilxml.h +++ b/kstars/kstars/indi/lilxml.h @@ -130,15 +130,15 @@ extern XMLEle *nextXMLEle (XMLEle *ep, int first); extern XMLAtt *nextXMLAtt (XMLEle *ep, int first); /* tree functions */ -/** \brief Return the parent of an XML element. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML element. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLEle (XMLEle *ep); +extern XMLEle *tqparentXMLEle (XMLEle *ep); -/** \brief Return the parent of an XML attribute. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML attribute. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLAtt (XMLAtt *ap); +extern XMLEle *tqparentXMLAtt (XMLAtt *ap); /* access functions */ /** \brief Return the tag of an XML element. @@ -171,13 +171,13 @@ extern char *valuXMLAtt (XMLAtt *ap); */ extern int pcdatalenXMLEle (XMLEle *ep); -/** \brief Return the number of nested XML elements in a parent XML element. +/** \brief Return the number of nested XML elements in a tqparent XML element. \param ep a pointer to an XML element. \return the number of nested XML elements. */ extern int nXMLEle (XMLEle *ep); -/** \brief Return the number of XML attributes in a parent XML element. +/** \brief Return the number of XML attributes in a tqparent XML element. \param ep a pointer to an XML element. \return the number of XML attributes within the XML element. */ diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index fe37df18..e9e95534 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -101,7 +101,7 @@ void LX200_16::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; - // process parent first + // process tqparent first LX200Autostar::ISGetProperties(dev); IDDefNumber (&horNum, NULL); @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchStatus(&searchResult)) < 0) + if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200autostar.cpp b/kstars/kstars/indi/lx200autostar.cpp index 79c3d575..4a397eff 100644 --- a/kstars/kstars/indi/lx200autostar.cpp +++ b/kstars/kstars/indi/lx200autostar.cpp @@ -148,7 +148,7 @@ void LX200Autostar::ISNewNumber (const char *dev, const char *name, double value IDSetText(&VersionInfo, NULL); - // process parent + // process tqparent LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200basic.cpp b/kstars/kstars/indi/lx200basic.cpp index a812caa6..1d41e652 100644 --- a/kstars/kstars/indi/lx200basic.cpp +++ b/kstars/kstars/indi/lx200basic.cpp @@ -165,7 +165,7 @@ void LX200Basic::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); } diff --git a/kstars/kstars/indi/lx200classic.cpp b/kstars/kstars/indi/lx200classic.cpp index 5788bd16..cd074209 100644 --- a/kstars/kstars/indi/lx200classic.cpp +++ b/kstars/kstars/indi/lx200classic.cpp @@ -327,7 +327,7 @@ void LX200Classic::ISNewNumber (const char *dev, const char *name, double values void LX200Classic::getBasicData() { - // process parent first + // process tqparent first LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index 9c521cfe..bd85ba88 100644 --- a/kstars/kstars/indi/lx200driver.c +++ b/kstars/kstars/indi/lx200driver.c @@ -78,8 +78,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ @@ -203,7 +203,7 @@ int testTelescope() int testAP() { int i=0; - char currentDate[64]; + char tqcurrentDate[64]; fprintf(stderr, "Testing telescope's connection...\n"); @@ -211,7 +211,7 @@ int testAP() / We're going to request the calander date */ for (i=0; i < 2; i++) { - if (!getCalenderDate(currentDate)) + if (!getCalenderDate(tqcurrentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchStatus(int *status) +int getHomeSearchtqStatus(int *status) { char tempString[16]; @@ -726,9 +726,9 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int setAlignmentMode(unsigned int alignMode) +int tqsetAlignmentMode(unsigned int alignMode) { - fprintf(stderr , "Set alignment mode %d\n", alignMode); + fprintf(stderr , "Set tqalignment mode %d\n", alignMode); switch (alignMode) { diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 06b8017f..529dfa02 100644 --- a/kstars/kstars/indi/lx200driver.h +++ b/kstars/kstars/indi/lx200driver.h @@ -157,8 +157,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index b4f6d792..d498ba62 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -41,7 +41,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -117,7 +118,7 @@ INumber eq[] = { //TODO decide appropiate TIME_OUT // N.B. No Static identifier as it is needed for external linkage INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -327,7 +328,7 @@ LX200Generic::LX200Generic() IDLog("Julian Day is %g\n", JD); - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from generic LX200 device...\n"); IDLog("INDI Version: 2004-02-17\n"); @@ -561,7 +562,7 @@ void LX200Generic::ISNewNumber (const char *dev, const char *name, double values IDLog("We received J2000 RA %g - DEC %g\n", newRA, newDEC); IDLog("We received J2000 RA %s - DEC %s\n", RAStr, DecStr); - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); fs_sexa(RAStr, newRA, 2, 3600); fs_sexa(DecStr, newDEC, 2, 3600); @@ -906,9 +907,9 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSw, err, "Setting alignment"); + handleError(&AlignmentSw, err, "Setting tqalignment"); return; } @@ -1405,7 +1406,7 @@ void LX200Generic::ISPoll() case IPS_BUSY: getLX200RA(¤tRA); getLX200DEC(¤tDEC); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -1789,7 +1790,7 @@ void LX200Generic::getAlignment() signed char align = ACK(); if (align < 0) { - IDSetSwitch (&AlignmentSw, "Failed to get telescope alignment."); + IDSetSwitch (&AlignmentSw, "Failed to get telescope tqalignment."); return; } diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 451a7269..158cd14a 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -42,7 +42,7 @@ static ISwitch AzRaBackSlashS[] = {{ "Activate", "", ISS_OFF, 0, 0}}; static ISwitch OTAUpdateS[] = {{ "Update", "", ISS_OFF, 0, 0}}; static ISwitchVectorProperty GPSPowerSw = { mydev, "GPS Power", "", GPSGroup, IP_RW, ISR_1OFMANY, 0 , IPS_IDLE, GPSPowerS, NARRAY(GPSPowerS), "", 0}; -static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS Status", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; +static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS tqStatus", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; static ISwitchVectorProperty GPSUpdateSw = { mydev, "GPS System", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSUpdateS, NARRAY(GPSUpdateS), "", 0}; static ISwitchVectorProperty AltDecPecSw = { mydev, "Alt/Dec PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AltDecPecS, NARRAY(AltDecPecS), "", 0}; static ISwitchVectorProperty AzRaPecSw = { mydev, "Az/Ra PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AzRaPecS, NARRAY(AzRaPecS), "", 0}; @@ -83,7 +83,7 @@ void LX200GPS::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; -// process parent first +// process tqparent first LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); @@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS Status Update */ + /* GPS tqStatus Update */ if (!strcmp(name,GPSStatusSw.name)) { if (checkPower(&GPSStatusSw)) @@ -334,7 +334,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], //getOTATemp(&OTATemp.np[0].value); //IDSetNumber(&OTATemp, NULL); - // process parent + // process tqparent LX200_16::getBasicData(); } diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index fb35cf59..9eef1a42 100644 --- a/kstars/kstars/indi/sbigccd.cpp +++ b/kstars/kstars/indi/sbigccd.cpp @@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p) void SBIGCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp (0); switch (ExposeTimeNP.s) @@ -340,8 +340,8 @@ void SBIGCam::ISPoll() // JM: Here we check the status of the camera (whether it's still capturing an image or has finished that) // ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras /* - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { IDLog("Error in exposure!\n"); ExposeTimeNP.s = IPS_IDLE; @@ -349,7 +349,7 @@ void SBIGCam::ISPoll() IDSetNumber(&ExposeTimeNP, "Error in exposure procedure."); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/skycommander.c b/kstars/kstars/indi/skycommander.c index 261b6808..6bf23437 100644 --- a/kstars/kstars/indi/skycommander.c +++ b/kstars/kstars/indi/skycommander.c @@ -54,7 +54,7 @@ INumber eq[] = { {"DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0., 0, 0, 0}, }; INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; diff --git a/kstars/kstars/indi/temmadriver.h b/kstars/kstars/indi/temmadriver.h index 79926c3f..8bd2ccc1 100644 --- a/kstars/kstars/indi/temmadriver.h +++ b/kstars/kstars/indi/temmadriver.h @@ -172,14 +172,14 @@ static ITextVectorProperty Port = { IP_RW, 0, IPS_OK, PortT, NARRAY(PortT), "", 0}; /*******************************/ -/* EQUATORIAL_COORD RW property */ +/* ETQUATORIAL_COORD RW property */ /*******************************/ static INumber eq[] = { {"RA" ,"RA H:M:S" , "%10.6m", 0, 24, 0, 0, 0, 0, 0}, {"DEC", "Dec D:M:S", "%10.6m", -90, 90, 0, 0, 0, 0, 0} }; static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", MAIN_GROUP , IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /*******************************/ diff --git a/kstars/kstars/indi/v4lphilips.cpp b/kstars/kstars/indi/v4lphilips.cpp index cc15d43d..f759e097 100644 --- a/kstars/kstars/indi/v4lphilips.cpp +++ b/kstars/kstars/indi/v4lphilips.cpp @@ -46,7 +46,7 @@ void V4L_Philips::initCamBase() void V4L_Philips::initProperties(const char *dev) { - // Call parent + // Call tqparent V4L_Driver::initProperties(dev); fillSwitch(&BackLightS[0], "ON", "", ISS_OFF); @@ -375,7 +375,7 @@ void V4L_Philips::ISNewSwitch (const char *dev, const char *name, ISState *state } #endif - // Call parent + // Call tqparent V4L_Driver::ISNewSwitch(dev, name, states, names, n); @@ -481,7 +481,7 @@ void V4L_Philips::ISNewNumber (const char *dev, const char *name, double values[ #endif - // Call parent + // Call tqparent V4L_Driver::ISNewNumber(dev, name, values, names, n); } diff --git a/kstars/kstars/indi/webcam/Makefile.am b/kstars/kstars/indi/webcam/Makefile.am index 565859da..3b73d055 100644 --- a/kstars/kstars/indi/webcam/Makefile.am +++ b/kstars/kstars/indi/webcam/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + if HAVE_V4L2 libwebcam_linux = libwebcam_v4l2_linux.la else diff --git a/kstars/kstars/indi/webcam/ccvt_c2.c b/kstars/kstars/indi/webcam/ccvt_c2.c index 52ed276d..1fb7bcbf 100644 --- a/kstars/kstars/indi/webcam/ccvt_c2.c +++ b/kstars/kstars/indi/webcam/ccvt_c2.c @@ -8,7 +8,7 @@ #include "ccvt_types.h" /* by suitable definition of PIXTYPE, can do yuv to rgb or bgr, with or -without word alignment */ +without word tqalignment */ /* This doesn't exactly earn a prize in a programming beauty contest. */ diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp index fce53a18..971cd9ad 100644 --- a/kstars/kstars/indi/webcam/port.cpp +++ b/kstars/kstars/indi/webcam/port.cpp @@ -20,9 +20,9 @@ // I/O ports wrapper code // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg <aa11ac@hik.se> +// TQNX code by: Anders Arpteg <aa11ac@hik.se> // FreeBSD code by: Patrick Reynolds <reynolds@cs.duke.edu> and Charles // Henrich <henrich@msu.edu> @@ -43,7 +43,7 @@ #else #include <sys/io.h> #endif /* arm */ -#elif defined(QNX) +#elif defined(TQNX) #include <conio.h> #elif defined(__FreeBSD__) #include <sys/types.h> diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h index c5896858..2e398019 100644 --- a/kstars/kstars/indi/webcam/port.h +++ b/kstars/kstars/indi/webcam/port.h @@ -20,9 +20,9 @@ // I/O ports wrapper definitions and prototypes // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg <aa11ac@hik.se> +// TQNX code by: Anders Arpteg <aa11ac@hik.se> // FreeBSD code by: Patrick Reynolds <reynolds@cs.duke.edu> and Charles // Henrich <henrich@msu.edu> // Inlining implemented by: Philip Blundell <philip.blundell@pobox.com> @@ -38,7 +38,7 @@ #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__) #include <sys/io.h> #endif /* !arm */ -#elif defined(QNX) +#elif defined(TQNX) #include <conio.h> #elif defined(__FreeBSD__) #include <machine/cpufunc.h> @@ -90,7 +90,7 @@ public: inline void write_control(int data) { outb(control_reg = data, port2); } inline void setbit_control(int data) { outb(control_reg |= data, port2); } inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); } -#else // Solaris, QNX, and *BSD use (port, data) instead +#else // Solaris, TQNX, and *BSD use (port, data) instead inline void write_data(int data) { outb(port, data); } inline void write_control(int data) { outb(port2, control_reg = data); } inline void setbit_control(int data) { outb(port2, control_reg |= data); } diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index 9b650298..e161acdb 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -43,7 +43,7 @@ /* The frame rate is encoded in the video_window.flags parameter using the upper 16 bits, since some flags are defined nowadays. The following - defines provide a mask and shift to filter out this value. + defines provide a tqmask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. @@ -121,9 +121,9 @@ struct pwc_leds the preferred mode is not available. */ /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */ -#define VIDIOCPWCSCQUAL _IOW('v', 195, int) +#define VIDIOCPWCSCTQUAL _IOW('v', 195, int) /* Get preferred compression quality */ -#define VIDIOCPWCGCQUAL _IOR('v', 195, int) +#define VIDIOCPWCGCTQUAL _IOR('v', 195, int) /* This is a probe function; since so many devices are supported, it diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.cpp b/kstars/kstars/indi/webcam/v4l1_pwc.cpp index 9f644885..f87d9c82 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.cpp +++ b/kstars/kstars/indi/webcam/v4l1_pwc.cpp @@ -259,13 +259,13 @@ int V4L1_PWC::setExposure(int val, char *errmsg) void V4L1_PWC::setCompression(int val) { - ioctl(fd, VIDIOCPWCSCQUAL, &val); + ioctl(fd, VIDIOCPWCSCTQUAL, &val); } int V4L1_PWC::getCompression() { int gain; - ioctl(fd, VIDIOCPWCGCQUAL , &gain); + ioctl(fd, VIDIOCPWCGCTQUAL , &gain); if (gain < 0) gain*=-1; return gain; } diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.h b/kstars/kstars/indi/webcam/v4l1_pwc.h index fd2e2032..3790daa2 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.h +++ b/kstars/kstars/indi/webcam/v4l1_pwc.h @@ -34,7 +34,7 @@ class V4L1_PWC : public V4L1_Base int connectCam(const char * devpath, char *errmsg); - /* Philips related, from QAstrocam */ + /* Philips related, from TQAstrocam */ int saveSettings(char *errmsg); void restoreSettings(); void restoreFactorySettings(); diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index 26ec3d51..a4ba8d72 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -168,7 +168,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -179,7 +179,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - return errno_exit ("VIDIOC_DQBUF", errmsg); + return errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -206,8 +206,8 @@ int V4L2_Base::read_frame(char *errmsg) break; } - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); if (dropFrame) { @@ -227,7 +227,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -238,7 +238,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - errno_exit ("VIDIOC_DQBUF", errmsg); + errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -251,8 +251,8 @@ int V4L2_Base::read_frame(char *errmsg) //process_image ((void *) buf.m.userptr); - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + errno_exit ("VIDIOC_TQBUF", errmsg); break; } @@ -309,8 +309,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -336,8 +336,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.m.userptr = (unsigned long) buffers[i].start; buf.length = buffers[i].length; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "memory mapping\n", dev_name); @@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg) "memory mapping\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_REQBUFS", errmsg); + return errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = n_buffers; - if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf)) - return errno_exit ("VIDIOC_QUERYBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf)) + return errno_exit ("VIDIOC_TQUERYBUF", errmsg); buffers[n_buffers].length = buf.length; buffers[n_buffers].start = @@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "user pointer i/o\n", dev_name); exit (EXIT_FAILURE); } else { - errno_exit ("VIDIOC_REQBUFS", errmsg); + errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height { unsigned int min; - if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) + if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap)) { if (EINVAL == errno) { fprintf (stderr, "%s is no V4L2 device\n", @@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_QUERYCAP", errmsg); + return errno_exit ("VIDIOC_TQUERYCAP", errmsg); } } @@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Control " << queryctrl.name << endl; @@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) continue; - errno_exit("VIDIOC_QUERYCTRL", errmsg); + errno_exit("VIDIOC_TQUERYCTRL", errmsg); return; } } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Private Control " << queryctrl.name << endl; @@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) break; - errno_exit ("VIDIOC_QUERYCTRL", errmsg); + errno_exit ("VIDIOC_TQUERYCTRL", errmsg); return; } @@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void) for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++) { - if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu)) + if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu)) { cerr << " " << querymenu.name << endl; } else { - errno_exit("VIDIOC_QUERYMENU", errmsg); + errno_exit("VIDIOC_TQUERYMENU", errmsg); return; } } @@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr queryctrl.id = ctrl_id; - if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); else { @@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { @@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) } } else if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index a5b0aec7..a7929058 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -302,9 +302,9 @@ struct video_code #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 +#define VID_HARDWARE_TQCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 +#define VID_HARDWARE_TQCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h index e3dab3a6..b6a05dbd 100644 --- a/kstars/kstars/indi/webcam/videodev2.h +++ b/kstars/kstars/indi/webcam/videodev2.h @@ -388,7 +388,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -448,7 +448,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -624,7 +624,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -638,7 +638,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -829,7 +829,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -838,13 +838,13 @@ struct v4l2_streamparm #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) +#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) @@ -859,8 +859,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -877,7 +877,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) |