Skip to content

Commit

Permalink
fix for af triggering on nikon
Browse files Browse the repository at this point in the history
  • Loading branch information
elijahparker committed Jun 29, 2017
2 parents ee86f99 + 695b558 commit 5a205c8
Show file tree
Hide file tree
Showing 22 changed files with 11,111 additions and 4,029 deletions.
29 changes: 24 additions & 5 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
libgphoto2 2.5.13.1 development release
libgphoto2 2.5.14.1 development version
------------------------------------------------------------------------------
libgphoto2 2.5.14 release

ptp2:
* Canon EOS M capture support (M3, M5, M10 ... not the original EOS M currently)
* Canon EOS 77D added, bug fixed.
* Canon EOS M remote control / capture support (M3, M5, M10 ... but not the original EOS M currently)
* fix for Canon EOS camera crash bug introduced in 2.5.13.
* Fuji XT-2 capture support (firmware update needed, might work for other Fuji XT too)
* Canon EOS 77D added.
* various bugfixes
* added USB IDs:
* Sony DSC-RX10M3, DSC-HX90V
* Sony UMC-R10C
* Nikon D5600,
* Canon EOS 77D
* Fuji XT-20
* synced MTP device ids from libmtp
* more issues fixed that were found by the AFL fuzzer

pentax:
* Added Pentax K5-II
* Added Pentax K5-II, Pentax K3-II

libgphoto2_port:
* fixed gp_log_remove_func

libgphoto2_port/vusb:
* support f-number, shutterspeed, and exposurebias in the virtual PTP camera

all:
* several issues found by gcc 7 fixed

translations:
* updated ukrainian, polish, vietnamese
* updated ukrainian, polish, vietnamese, french, swedish
------------------------------------------------------------------------------
libgphoto2 2.5.13 release

Expand Down
2 changes: 1 addition & 1 deletion camlibs/panasonic/l859/l859.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ static int file_list_func (CameraFilesystem *fs, const char *folder,
if (size == 0)
return GP_OK;

if (!(filename = (char*)malloc(30))) {
if (!(filename = (char*)malloc(31))) {
GP_DEBUG ("Unable to allocate memory for filename.");
return GP_ERROR_NO_MEMORY;
}
Expand Down
1 change: 1 addition & 0 deletions camlibs/pentax/library.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ camera_summary (Camera *camera, CameraText *summary, GPContext *context)
"Using code from pktriggercord by Andras Salamon.\n"
"Collected Status Information:\n%s"
), statusinfo);
free (statusinfo);
return GP_OK;
}

Expand Down
2 changes: 2 additions & 0 deletions camlibs/pentax/pslr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,7 @@ static int _ipslr_write_args(uint8_t cmd_2, ipslr_handle_t *p, int n, ...) {

res = scsi_write(fd, cmd, sizeof (cmd), buf, 4 * n);
if (res != PSLR_OK) {
va_end(ap);
return res;
}
} else {
Expand All @@ -1537,6 +1538,7 @@ static int _ipslr_write_args(uint8_t cmd_2, ipslr_handle_t *p, int n, ...) {
cmd[2] = i * 4;
res = scsi_write(fd, cmd, sizeof (cmd), buf, 4);
if (res != PSLR_OK) {
va_end(ap);
return res;
}
}
Expand Down
3 changes: 2 additions & 1 deletion camlibs/pentax/pslr_model.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,8 @@ void ipslr_status_parse_k1(ipslr_handle_t *p, pslr_status *status) {
status->lens_max_aperture.denom = get_uint32_le(&buf[0x154]);
status->manual_mode_ev = get_uint32_le(&buf[0x160]); // ?
status->focused_af_point = get_uint32_le(&buf[0x16c]); // ?
// battery fields?
status->battery_1 = get_uint32_le(&buf[0x174]);
status->battery_2 = get_uint32_le(&buf[0x178]);

// selected_af_point is invalid
status->selected_af_point = 0;
Expand Down
49 changes: 49 additions & 0 deletions camlibs/ptp2/cameras/fuji-xt20.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Device info:
Manufacturer: FUJIFILM
Model: X-T20
device version: 1.01
serial number: 'nnnnnnnnnnnnnnnnnnnnnnnnnnxxxx'
Vendor extension ID: 0x00000006
Vendor extension version: 100
Vendor extension description: fujifilm.co.jp: 1.0;
Functional Mode: 0x0000
PTP Standard Version: 100
Supported operations:
0x1001
0x1002
0x1003
0x1004
0x1005
0x1006
0x1007
0x1008
0x1009
0x100a
0x100b
0x100c
0x100d
0x100f
0x1014
0x1015
0x1016
0x101b
0x900c
0x900d
0x901d
0x9801
0x9802
0x9803
0x9805
Events Supported:
0x4002
0x4003
0x4004
0x4005
0x4006
0x4008
0x4009
Device Properties Supported:
0x5001
0xd303
0xd406
0xd407
3,865 changes: 3,865 additions & 0 deletions camlibs/ptp2/cameras/nikon-d500.txt

Large diffs are not rendered by default.

Loading

0 comments on commit 5a205c8

Please sign in to comment.