summaryrefslogtreecommitdiffstats
path: root/plugins/pylon
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2015-05-19 08:02:31 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2015-05-19 08:02:31 +0200
commit106745eed96ac97b9cc5c4250746842a19eaef65 (patch)
tree94266aff8a79a0fdf9150dab2297f70f85299be4 /plugins/pylon
parenta26120e69e26186454becc7658859224a4a3de2c (diff)
parent2f3f57cf90e31b9459de3f36824668ec3a51a177 (diff)
downloadlibuca-106745eed96ac97b9cc5c4250746842a19eaef65.tar.gz
libuca-106745eed96ac97b9cc5c4250746842a19eaef65.tar.bz2
libuca-106745eed96ac97b9cc5c4250746842a19eaef65.tar.xz
libuca-106745eed96ac97b9cc5c4250746842a19eaef65.zip
Merge pull request #68 from miq/anka-plugins-for-2.0
Anka plugins for 2.0
Diffstat (limited to 'plugins/pylon')
-rw-r--r--plugins/pylon/CMakeLists.txt4
-rw-r--r--plugins/pylon/changelog.txt4
-rw-r--r--plugins/pylon/uca-pylon-camera.c9
3 files changed, 11 insertions, 6 deletions
diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt
index 69f668d..e2ace6b 100644
--- a/plugins/pylon/CMakeLists.txt
+++ b/plugins/pylon/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(ucapylon C)
-set(VERSION "1.3.0")
+set(VERSION "1.4.0")
find_package(Pylon)
@@ -11,7 +11,7 @@ if (PYLON_FOUND)
set(PLUGIN_SUMMARY "Pylon plugin for libuca")
set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt")
set(PLUGIN_DESCRIPTION "Plugin for the Basler GigE CCD Camera.")
- set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.5.0")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0, libpyloncam >= 0.5.0")
set(PLUGIN_VENDOR "ANKA Computing Group")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
diff --git a/plugins/pylon/changelog.txt b/plugins/pylon/changelog.txt
index 7ce5fa8..ea5e9be 100644
--- a/plugins/pylon/changelog.txt
+++ b/plugins/pylon/changelog.txt
@@ -1,3 +1,7 @@
+* Mon May 18 2015 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.4.0-1
+- Update to libuca 2.0.0
+* Wed Oct 8 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.0-2
+- new revision for libuca 1.6.0
* Tue Oct 7 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.0-1
- require libpyloncam 0.5.0 because of new auto exposure feature
* Thu Sep 11 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.2.1-1
diff --git a/plugins/pylon/uca-pylon-camera.c b/plugins/pylon/uca-pylon-camera.c
index af6b8cf..0265ade 100644
--- a/plugins/pylon/uca-pylon-camera.c
+++ b/plugins/pylon/uca-pylon-camera.c
@@ -68,7 +68,7 @@ static gint base_overrideables[] = {
PROP_SENSOR_HORIZONTAL_BINNINGS,
PROP_SENSOR_VERTICAL_BINNING,
PROP_SENSOR_VERTICAL_BINNINGS,
- PROP_TRIGGER_MODE,
+ PROP_TRIGGER_SOURCE,
PROP_EXPOSURE_TIME,
PROP_ROI_X,
PROP_ROI_Y,
@@ -149,7 +149,8 @@ static void uca_pylon_camera_set_property(GObject *object, guint property_id, co
/* intentional fall-through*/
case PROP_SENSOR_VERTICAL_BINNING:
/* intentional fall-through*/
- case PROP_TRIGGER_MODE:
+ case PROP_TRIGGER_SOURCE:
+ /* this plugin supports AUTO triggering only ATM */
break;
case PROP_BALANCE_WHITE_AUTO:
{
@@ -262,8 +263,8 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV
g_value_set_boxed(value, priv->binnings);
break;
- case PROP_TRIGGER_MODE:
- g_value_set_enum(value, UCA_CAMERA_TRIGGER_AUTO);
+ case PROP_TRIGGER_SOURCE:
+ g_value_set_enum(value, UCA_CAMERA_TRIGGER_SOURCE_AUTO);
break;
case PROP_HAS_STREAMING: