summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2017-03-17 18:24:07 +0100
committerMarcus Meissner <marcus@jet.franken.de>2017-03-17 18:24:07 +0100
commit2446df4606e6d3071003664a5b36093927214d83 (patch)
treee8593d50020b6c3121e9f59fa0ee7d7d00e1ee07
parente85ae93f4eb2ee35eaf064b74b613f777f70b93c (diff)
downloadlibgphoto2-2446df4606e6d3071003664a5b36093927214d83.tar.gz
Added summary output of the status information
More debugging
-rw-r--r--camlibs/pentax/library.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c
index 0084638d5..cc5bbbcef 100644
--- a/camlibs/pentax/library.c
+++ b/camlibs/pentax/library.c
@@ -158,10 +158,18 @@ void close_drive(GPPort **port) {
static int
camera_summary (Camera *camera, CameraText *summary, GPContext *context)
{
+ char *statusinfo;
+ pslr_status status;
+
+ pslr_get_status (camera->pl, &status);
+
+ statusinfo = collect_status_info( camera->pl, status );
+
sprintf (summary->text, _(
"Pentax K DSLR capture driver.\n"
- "Based on pkremote by Pontus Lidman.\n"
- ));
+ "Using code from pktriggercord by Andras Salamon.\n"
+ "Collected Statatus Information:\n%s"
+ ), statusinfo);
return GP_OK;
}
@@ -277,6 +285,8 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
int bufno;
const char *mime;
+ gp_log (GP_LOG_DEBUG, "pentax", "camera_capture");
+
pslr_get_status (p, &status);
pslr_shutter (p);
@@ -381,6 +391,8 @@ camera_wait_for_event (Camera *camera, int timeout,
CameraFile *file = NULL;
CameraFileInfo info;
+ gp_log (GP_LOG_DEBUG, "pentax", "camera_wait_for_event %d ms", timeout);
+
*eventtype = GP_EVENT_TIMEOUT;
*eventdata = NULL;