summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2018-11-03 19:31:57 +0100
committerMarcus Meissner <marcus@jet.franken.de>2018-11-03 19:31:57 +0100
commit145481c3d8b9f2806a8cf4cd3564953d07cfe365 (patch)
treee2dd5cfe8509fc6f862c5ad47a1b1ce5d38f0861
parent1ecb6c3132f6d87e4c7848f99c0522abaa01bd37 (diff)
downloadlibgphoto2-145481c3d8b9f2806a8cf4cd3564953d07cfe365.tar.gz
on eos m, set remote mode only to 0x15 and not to 0x1
for https://github.com/gphoto/libgphoto2/issues/316
-rw-r--r--camlibs/ptp2/config.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 41bcccc8d..d4407349d 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -394,7 +394,11 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) {
GP_LOG_D ("preparing EOS capture...");
- C_PTP (ptp_canon_eos_setremotemode(params, 1));
+ if (is_canon_eos_m(params)) {
+ C_PTP (ptp_canon_eos_setremotemode(params, 0x15));
+ } else {
+ C_PTP (ptp_canon_eos_setremotemode(params, 1));
+ }
C_PTP (ptp_canon_eos_seteventmode(params, 1));
params->eos_camerastatus = -1; /* aka unknown */