diff options
| author | Mihael Koep <koep@schneide.com> | 2014-03-19 14:54:53 +0100 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2014-04-09 12:19:31 +0200 |
| commit | 1b78ff35cd7a13828621bb664772227c3954902a (patch) | |
| tree | bfd1078c1bc812efe7d50c2a6befaedfd30ca050 /plugins | |
| parent | 6ea92130f1c791007b417e41b39e21f07d644a3c (diff) | |
| download | uca-1b78ff35cd7a13828621bb664772227c3954902a.tar.gz uca-1b78ff35cd7a13828621bb664772227c3954902a.tar.bz2 uca-1b78ff35cd7a13828621bb664772227c3954902a.tar.xz uca-1b78ff35cd7a13828621bb664772227c3954902a.zip | |
Update dexela plugin to libdexela 1.1.0
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugins/dexela/changelog.txt | 3 | ||||
| -rw-r--r-- | plugins/dexela/uca-dexela-camera.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index 1dbae27..101f11e 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 2.6) project(ucadexela C) -set(VERSION "1.0.2") +set(VERSION "1.0.3") find_package(DEXELA) if (DEXELA_FOUND) set(UCA_CAMERA_NAME "dexela") - set(PLUGIN_REVISION "2") + set(PLUGIN_REVISION "1") set(PLUGIN_VERSION ${VERSION}) set(PLUGIN_SUMMARY "Dexela plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") set(PLUGIN_DESCRIPTION "Plugin for the Dexela 1207 detector.") - set(PLUGIN_REQUIRES "libuca = 1.3.0, libdexela >= 1.0.0") + set(PLUGIN_REQUIRES "libuca = 1.3.0, libdexela >= 1.1.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt index 027b3ea..7ee4c54 100644 --- a/plugins/dexela/changelog.txt +++ b/plugins/dexela/changelog.txt @@ -1,3 +1,6 @@ +* Wed Mar 19 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.3-1 +- bump libdexela requirement to 1.1.0 +- use new libdexela API for FMT file * Tue Oct 15 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.2-2 - bump libuca requirement to 1.3.0 * Wed Mar 27 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.2-1 diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 0003f22..aa0a049 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -18,7 +18,7 @@ #include <string.h> #include <gmodule.h> #include "uca-dexela-camera.h" -#include "dexela_api.h" +#include "dexela/dexela_api.h" #define UCA_DEXELA_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCameraPrivate)) @@ -147,7 +147,7 @@ UcaDexelaCamera *uca_dexela_camera_new(GError **error) */ GObjectClass *camera_class = G_OBJECT_CLASS (UCA_CAMERA_GET_CLASS (camera)); // TODO implement error checking - dexela_open_detector("/usr/share/dexela/dexela-1207_32.fmt"); + dexela_open_detector(DEFAULT_FMT_FILE_PATH); dexela_init_serial_connection(); priv->bits = dexela_get_bit_depth(); priv->width = dexela_get_width(); |