Commit fffba02f authored by Éric Thiébaut's avatar Éric Thiébaut
Browse files

Rename TAO-Andor library sources

parent 8ee185b3
......@@ -53,10 +53,10 @@ AM_CPPFLAGS = $(COMMON_DEFS)
lib_LTLIBRARIES = libtao-andor.la
include_HEADERS = tao-andor.h tao-andor-features.h tao-andor-private.h
libtao_andor_la_SOURCES = \
andor-errors.c \
andor-core.c \
andor-features.c \
andor-convert.c
errors.c \
core.c \
features.c \
convert.c
libtao_andor_la_LIBADD = $(ANDOR_LIBS) $(TAO_LIBS)
libtao_andor_la_LDFLAGS = -version-info @version_info@
......
// andor-convert.c -
// convert.c -
//
// Routines for pixel encoding conversions with Andor cameras library.
//
......
// andor-core.c -
// core.c -
//
// Core functions for Andor cameras.
//
......@@ -562,10 +562,8 @@ static tao_status on_set_config(
static tao_status on_start(
tao_camera* cam)
{
const char* func = "tao_camera_start_acquisition"; // name of the caller
AT_64 ival;
AT_BOOL bval;
int idx, status;
// Name of the caller for reporting errors.
const char* func = "tao_camera_start_acquisition";
// Get Andor device and number of buffers (the high level interface
// guarantees that `nbufs` is at least 2).
......@@ -575,13 +573,14 @@ static tao_status on_start(
andor_device* dev = (andor_device*)cam;
// Make sure the camera does not use any old acquisition buffers.
status = AT_Flush(dev->handle);
int status = AT_Flush(dev->handle);
if (status != AT_SUCCESS) {
andor_store_error("AT_Flush", status);
return TAO_ERROR;
}
// Get the current pixel encoding.
int idx;
status = AT_GetEnumIndex(dev->handle, L"PixelEncoding", &idx);
if (status != AT_SUCCESS) {
andor_store_error("AT_GetInt(PixelEncoding)", status);
......@@ -595,6 +594,7 @@ static tao_status on_start(
tao_encoding bufferencoding = dev->encs[idx];
// Get size of acquisition buffers in bytes.
AT_64 ival;
status = AT_GetInt(dev->handle, L"ImageSizeBytes", &ival);
if (status != AT_SUCCESS) {
andor_store_error("AT_GetInt(ImageSizeBytes)", status);
......@@ -651,6 +651,7 @@ static tao_status on_start(
}
// Set the camera to continuously acquires frames.
AT_BOOL bval;
status = AT_IsImplemented(dev->handle, L"CycleMode", &bval);
if (status != AT_SUCCESS) {
andor_store_error("AT_IsImplemented(CycleMode)", status);
......
// andor-errors.c -
// errors.c -
//
// Management of errors for Andor cameras.
//
......
// andor-features.c -
// features.c -
//
// Management of features for Andor cameras in TAO framework.
//
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment