summaryrefslogtreecommitdiffstats
path: root/src/cameras
diff options
context:
space:
mode:
Diffstat (limited to 'src/cameras')
-rw-r--r--src/cameras/uca-pf-camera.c33
-rw-r--r--src/cameras/uca-pylon-camera.c17
-rw-r--r--src/cameras/uca-ufo-camera.c64
3 files changed, 70 insertions, 44 deletions
diff --git a/src/cameras/uca-pf-camera.c b/src/cameras/uca-pf-camera.c
index 90f887b..5bc8c6b 100644
--- a/src/cameras/uca-pf-camera.c
+++ b/src/cameras/uca-pf-camera.c
@@ -76,6 +76,8 @@ static gint base_overrideables[] = {
PROP_ROI_Y,
PROP_ROI_WIDTH,
PROP_ROI_HEIGHT,
+ PROP_ROI_WIDTH_MULTIPLIER,
+ PROP_ROI_HEIGHT_MULTIPLIER,
PROP_HAS_STREAMING,
PROP_HAS_CAMRAM_RECORDING,
0
@@ -253,62 +255,52 @@ static void uca_pf_camera_get_property(GObject *object, guint property_id, GValu
case PROP_SENSOR_WIDTH:
g_value_set_uint(value, 1280);
break;
-
case PROP_SENSOR_HEIGHT:
g_value_set_uint(value, 1024);
break;
-
case PROP_SENSOR_BITDEPTH:
g_value_set_uint(value, 8);
break;
-
case PROP_SENSOR_HORIZONTAL_BINNING:
break;
-
case PROP_SENSOR_HORIZONTAL_BINNINGS:
break;
-
case PROP_SENSOR_VERTICAL_BINNING:
break;
-
case PROP_SENSOR_VERTICAL_BINNINGS:
break;
-
case PROP_SENSOR_MAX_FRAME_RATE:
g_value_set_float(value, 488.0);
break;
-
case PROP_HAS_STREAMING:
g_value_set_boolean(value, TRUE);
break;
-
case PROP_HAS_CAMRAM_RECORDING:
g_value_set_boolean(value, FALSE);
break;
-
case PROP_EXPOSURE_TIME:
break;
-
case PROP_ROI_X:
g_value_set_uint(value, 0);
break;
-
case PROP_ROI_Y:
g_value_set_uint(value, 0);
break;
-
case PROP_ROI_WIDTH:
g_value_set_uint(value, 1280);
break;
-
case PROP_ROI_HEIGHT:
g_value_set_uint(value, 1024);
break;
-
+ case PROP_ROI_WIDTH_MULTIPLIER:
+ g_value_set_uint(value, 1);
+ break;
+ case PROP_ROI_HEIGHT_MULTIPLIER:
+ g_value_set_uint(value, 1);
+ break;
case PROP_NAME:
g_value_set_string(value, "Photon Focus MV2-D1280-640-CL");
break;
-
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
@@ -317,6 +309,15 @@ static void uca_pf_camera_get_property(GObject *object, guint property_id, GValu
static void uca_pf_camera_finalize(GObject *object)
{
+ UcaPfCameraPrivate *priv = UCA_PF_CAMERA_GET_PRIVATE(object);
+
+ if (priv->fg) {
+ if (priv->fg_mem)
+ Fg_FreeMemEx(priv->fg, priv->fg_mem);
+
+ Fg_FreeGrabber(priv->fg);
+ }
+
G_OBJECT_CLASS(uca_pf_camera_parent_class)->finalize(object);
}
diff --git a/src/cameras/uca-pylon-camera.c b/src/cameras/uca-pylon-camera.c
index 6fef112..373f713 100644
--- a/src/cameras/uca-pylon-camera.c
+++ b/src/cameras/uca-pylon-camera.c
@@ -30,7 +30,7 @@
"libpylon error %i", err); \
return; \
}*/
-
+
#define UCA_PYLON_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_PYLON_CAMERA, UcaPylonCameraPrivate))
G_DEFINE_TYPE(UcaPylonCamera, uca_pylon_camera, UCA_TYPE_CAMERA)
@@ -53,7 +53,7 @@ enum {
PROP_ROI_WIDTH_DEFAULT = N_BASE_PROPERTIES,
PROP_ROI_HEIGHT_DEFAULT,
PROP_GAIN,
- N_PROPERTIES
+ N_PROPERTIES
};
static gint base_overrideables[] = {
@@ -148,7 +148,7 @@ static void uca_pylon_camera_grab(UcaCamera *camera, gpointer *data, GError **er
UcaPylonCameraPrivate *priv = UCA_PYLON_CAMERA_GET_PRIVATE(camera);
if (*data == NULL) {
- *data = g_malloc0(priv->width * priv->height * priv->num_bytes);
+ *data = g_malloc0(priv->width * priv->height * priv->num_bytes);
}
pylon_camera_grab(data, error);
}
@@ -216,14 +216,14 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV
GError* error = NULL;
switch (property_id) {
-
- case PROP_SENSOR_WIDTH:
+
+ case PROP_SENSOR_WIDTH:
pylon_camera_get_sensor_size(&priv->width, &priv->height, &error);
g_value_set_uint(value, priv->width);
g_print("pylon_get_property sensor width %d\n", priv->width);
break;
- case PROP_SENSOR_HEIGHT:
+ case PROP_SENSOR_HEIGHT:
pylon_camera_get_sensor_size(&priv->width, &priv->height, &error);
g_value_set_uint(value, priv->height);
g_print("pylon_get_property sensor height %d\n", priv->height);
@@ -329,7 +329,7 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV
}
break;
- case PROP_NAME:
+ case PROP_NAME:
{
//char *name = NULL;
//pylon_get_name(priv->pylon, &name);
@@ -385,7 +385,7 @@ static void uca_pylon_camera_class_init(UcaPylonCameraClass *klass)
for (guint i = 0; base_overrideables[i] != 0; i++)
g_object_class_override_property(gobject_class, base_overrideables[i], uca_camera_props[base_overrideables[i]]);
- pylon_properties[PROP_NAME] =
+ pylon_properties[PROP_NAME] =
g_param_spec_string("name",
"Name of the camera",
"Name of the camera",
@@ -458,4 +458,3 @@ static void uca_pylon_camera_init(UcaPylonCamera *self)
self->priv->binnings = g_value_array_new(1);
g_value_array_append(self->priv->binnings, &val);
}
-
diff --git a/src/cameras/uca-ufo-camera.c b/src/cameras/uca-ufo-camera.c
index 66a42c4..51b984a 100644
--- a/src/cameras/uca-ufo-camera.c
+++ b/src/cameras/uca-ufo-camera.c
@@ -93,13 +93,25 @@ static guint N_PROPERTIES;
static GHashTable *ufo_property_table; /* maps from prop_id to RegisterInfo* */
struct _UcaUfoCameraPrivate {
- pcilib_t *handle;
- guint n_bits;
- guint bit_mode;
+ pcilib_t *handle;
+ pcilib_timeout_t timeout;
+ guint n_bits;
+ enum {
+ FPGA_48MHZ = 0,
+ FPGA_40MHZ
+ } frequency;
};
-static void ignore_messages(const char *format, ...)
+static void
+error_handler (const char *format, ...)
{
+ va_list args;
+ gchar *message;
+
+ va_start (args, format);
+ message = g_strdup_vprintf (format, args);
+ g_warning ("%s", message);
+ va_end (args);
}
static guint
@@ -145,7 +157,7 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error)
return NULL;
}
- pcilib_set_error_handler(&ignore_messages, &ignore_messages);
+ pcilib_set_error_handler(&error_handler, &error_handler);
/* Generate properties from model description */
model_description = pcilib_get_model_description(handle);
@@ -194,7 +206,7 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error)
UcaUfoCamera *camera = g_object_new(UCA_TYPE_UFO_CAMERA, NULL);
UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera);
- priv->bit_mode = read_register_value (handle, "bit_mode");
+ priv->frequency = read_register_value (handle, "bit_mode");
adc_resolution = read_register_value (handle, "adc_resolution");
switch (adc_resolution) {
@@ -216,16 +228,24 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error)
static void uca_ufo_camera_start_recording(UcaCamera *camera, GError **error)
{
+ UcaUfoCameraPrivate *priv;
+ gdouble exposure_time;
+ int err;
+
g_return_if_fail(UCA_IS_UFO_CAMERA(camera));
- UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera);
- int err = pcilib_start(priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT);
+
+ priv = UCA_UFO_CAMERA_GET_PRIVATE(camera);
+ err = pcilib_start(priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT);
PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_START_RECORDING);
gboolean transfer_async = FALSE;
g_object_get(G_OBJECT(camera),
"transfer-asynchronously", &transfer_async,
+ "exposure-time", &exposure_time,
NULL);
+ priv->timeout = ((pcilib_timeout_t) (exposure_time * 1000 + 50.0) * 1000);
+
if (transfer_async) {
pcilib_trigger(priv->handle, PCILIB_EVENT0, 0, NULL);
pcilib_stream(priv->handle, &event_callback, camera);
@@ -251,15 +271,16 @@ static void uca_ufo_camera_grab(UcaCamera *camera, gpointer *data, GError **erro
{
g_return_if_fail(UCA_IS_UFO_CAMERA(camera));
UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera);
- const gsize size = SENSOR_WIDTH * SENSOR_HEIGHT * sizeof(guint16);
- pcilib_event_id_t event_id;
+ pcilib_event_id_t event_id;
pcilib_event_info_t event_info;
- size_t err = 0;
+ size_t err;
+
+ const gsize size = SENSOR_WIDTH * SENSOR_HEIGHT * sizeof(guint16);
err = pcilib_trigger(priv->handle, PCILIB_EVENT0, 0, NULL);
PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_TRIGGER);
- err = pcilib_get_next_event(priv->handle, PCILIB_TIMEOUT_INFINITE, &event_id, sizeof(pcilib_event_info_t), &event_info);
+ err = pcilib_get_next_event(priv->handle, priv->timeout, &event_id, sizeof(pcilib_event_info_t), &event_info);
PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_NEXT_EVENT);
if (*data == NULL)
@@ -289,15 +310,17 @@ static void uca_ufo_camera_grab(UcaCamera *camera, gpointer *data, GError **erro
PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_MAYBE_CORRUPTED);
}
-static void uca_ufo_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+static void
+uca_ufo_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
{
UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(object);
switch (property_id) {
case PROP_EXPOSURE_TIME:
{
- pcilib_register_value_t reg_value = (pcilib_register_value_t) EXPOSURE_TIME_SCALE * g_value_get_double(value);
- pcilib_write_register(priv->handle, NULL, "exp_time", reg_value);
+ const guint frequency = priv->frequency == FPGA_40MHZ ? 40 : 48;
+ pcilib_register_value_t reg_value = (pcilib_register_value_t) 129 / frequency * 1000 * 1000 * g_value_get_double(value);
+ pcilib_write_register(priv->handle, NULL, "cmosis_exp_time", reg_value);
}
break;
case PROP_ROI_X:
@@ -353,12 +376,12 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G
break;
case PROP_SENSOR_TEMPERATURE:
{
- const double a = priv->bit_mode == 0 ? 0.3 : 0.25;
- const double b = priv->bit_mode == 0 ? 1000 : 1200;
+ const double a = priv->frequency == FPGA_48MHZ ? 0.3 : 0.25;
+ const double b = priv->frequency == FPGA_48MHZ ? 1000 : 1200;
guint32 temperature;
temperature = read_register_value (priv->handle, "sensor_temperature");
- g_value_set_double (value, a * temperature - b);
+ g_value_set_double (value, a * (temperature - b));
}
break;
case PROP_FPGA_TEMPERATURE:
@@ -372,7 +395,10 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G
}
break;
case PROP_EXPOSURE_TIME:
- g_value_set_double (value, read_register_value (priv->handle, "exp_time") / EXPOSURE_TIME_SCALE);
+ {
+ const gdouble frequency = priv->frequency == FPGA_40MHZ ? 40.0 : 48.0;
+ g_value_set_double (value, read_register_value (priv->handle, "cmosis_exp_time") * 129 / frequency / 1000 / 1000 );
+ }
break;
case PROP_HAS_STREAMING:
g_value_set_boolean(value, TRUE);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:16:54 +0000