eddy/CCD_Capture
1
0
Fork 0
mirror of https://github.com/eddyem/CCD_Capture.git synced 2026-03-20 00:31:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bugs & add some features

Browse Source
This commit is contained in:
Edward Emelianov
2022-01-14 16:27:32 +03:00
parent a9ddbc39b8
commit d113aee650
14 changed files with 569 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FLI_cameras/CMakeLists.txt
View File

@@ -5,17 +5,6 @@ set(FLILIB ${CCDLIB} PARENT_SCOPE)
find_package(PkgConfig REQUIRED)
pkg_check_modules(${CCDLIB} REQUIRED fli>=1.71 usefull_macros)
set(CFLAGS -O3 -Wextra -Wall -W -std=gnu99)
set(CMAKE_COLOR_MAKEFILE ON)
if(DEFINED DEBUG AND DEBUG STREQUAL "yes")
set(CFLAGS ${CFLAGS} -Werror)
add_definitions(-DEBUG)
set(CMAKE_VERBOSE_MAKEFILE "ON")
endif()
add_definitions(${CFLAGS})
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SRC)
add_library(${CCDLIB} ${SRC})
target_link_libraries(${CCDLIB} ${${CCDLIB}_LIBRARIES})

33
FLI_cameras/flifunc.c
View File

@@ -634,36 +634,37 @@ static int fli_fpfalse(_U_ float *f){ return FALSE; }
*/
Camera FLIcam = {
.check = fli_findCCD,
.setDevNo = fli_setActiceCam,
.close = fli_closecam,
.pollcapture = fli_pollcapt,
.capture = fli_capt,
.cancel = fli_cancel,
.setbin = fli_setbin,
.setgeometry = fli_setgeometry,
.setnflushes = fli_setnflushes,
.setT = fli_settemp,
.setio = fli_setio,
// setters:
.setDevNo = fli_setActiceCam,
.setbrightness = fli_ffalse,
.setexp = fli_setexp,
.setgain = fli_ffalse,
.setT = fli_settemp,
.setbin = fli_setbin,
.setnflushes = fli_setnflushes,
.shuttercmd = fli_shutter,
.confio = fli_confio,
.setio = fli_setio,
.setframetype = fli_setframetype,
.setbitdepth = fli_setbitdepth,
.setfastspeed = fli_setfastspeed,
.setgeometry = fli_setgeometry,
.setfanspeed = fli_setfanspd,
.shuttercmd = fli_shutter,
.confio = fli_confio,
// getters:
.getbrightness = fli_fpfalse,
.getModelName = fli_modelname,
.getbin = fli_getbin,
.getgain = fli_fpfalse,
.getmaxgain = fli_fpfalse,
.getgeomlimits = fli_geomlimits,
.getTcold = fli_getTcold,
.getThot = fli_getThot,
.getTbody = fli_getTbody,
.getbin = fli_getbin,
.getio = fli_getio,
.getgeomlimits = fli_geomlimits,
.setbrightness = fli_ffalse,
.setgain = fli_ffalse,
.getmaxgain = fli_fpfalse,
.geometry = {0},
};