diff options
| -rw-r--r-- | src/uca.c | 2 | ||||
| -rw-r--r-- | src/uca.h | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/grab-async.c | 6 |
4 files changed, 9 insertions, 3 deletions
@@ -58,6 +58,8 @@ static struct uca_property property_map[UCA_PROP_LAST+1] = { { "Image.Offset.y", uca_pixel, uca_uint32t, uca_readwrite }, { "Image.Offset.y.Min", uca_pixel, uca_uint32t, uca_read }, { "Image.Offset.y.Max", uca_pixel, uca_uint32t, uca_read }, + { "Image.Binning.x", uca_pixel, uca_uint32t, uca_readwrite }, + { "Image.Binning.y", uca_pixel, uca_uint32t, uca_readwrite }, { "Image.Bitdepth", uca_bits, uca_uint32t, uca_read}, { "Time.Exposure", uca_us, uca_uint32t, uca_readwrite }, { "Time.Exposure.Min", uca_us, uca_uint32t, uca_read }, @@ -81,6 +81,8 @@ enum uca_property_ids { UCA_PROP_Y_OFFSET, UCA_PROP_Y_OFFSET_MIN, UCA_PROP_Y_OFFSET_MAX, + UCA_PROP_BINNING_X, + UCA_PROP_BINNING_Y, UCA_PROP_BITDEPTH, UCA_PROP_EXPOSURE, UCA_PROP_EXPOSURE_MIN, diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ad30d3c..89351d9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ if (GTK2_FOUND) target_link_libraries(control uca ${GTK2_LIBRARIES} - ${GTHREAD2_LIBRARIES} + ${GTHREAD2_LIBRARIES} ) endif() diff --git a/test/grab-async.c b/test/grab-async.c index 0a7d33f..945bf15 100644 --- a/test/grab-async.c +++ b/test/grab-async.c @@ -16,12 +16,14 @@ void grab_callback(uint64_t image_number, void *buffer, void *meta_data, void *u const int pixel_size = props->bits == 8 ? 1 : 2; char filename[256]; - sprintf(filename, "out-%04llu.raw", image_number); + sprintf(filename, "out-%04i.raw", (int) image_number); FILE *fp = fopen(filename, "wb"); fwrite(buffer, props->width * props->height, pixel_size, fp); fclose(fp); - printf("grabbed picture %llu at %p (%ix%i @ %i bits)\n", image_number, buffer, props->width, props->height, props->bits); + printf("grabbed picture %i at %p (%ix%i @ %i bits)\n", + (int) image_number, buffer, + props->width, props->height, props->bits); } int main(int argc, char *argv[]) |